diff options
author | Karl Berry <karl@freefriends.org> | 2017-06-05 23:11:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-06-05 23:11:21 +0000 |
commit | b24122a971cddb2ecf9c75a917ffbf9cef30c492 (patch) | |
tree | 6916b0da28e369f8e6d34d00468dc5bd83e54a38 /Master/texmf-dist/tex | |
parent | 2e05ff6e2fdfe8be763245181437e76214502d41 (diff) |
fithesis (5jun17)
git-svn-id: svn://tug.org/texlive/trunk@44472 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
41 files changed, 587 insertions, 157 deletions
diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index bab6089754b..b501edaa330 100644 --- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls +++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls @@ -54,7 +54,7 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.44}{2017/05/18}} +\thesis@versiondef{v0.3.46}{2017/06/02}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -327,18 +327,124 @@ \else \thesis@autofalse \fi} +\ifx\thesis@pages@preamble\undefined + \def\thesis@pages@preamble{??}\fi +\ifx\thesis@pages@postamble\undefined + \def\thesis@pages@postamble{??}\fi \def\thesis@preamble{% {\thesis@selectLocale{\thesis@locale}% - \thesis@blocks@preamble\clearpage} + \thesis@blocks@preamble + \gdef\thesis@pages@preamble{\thepage} + \write\@auxout{\noexpand\gdef\noexpand + \thesis@pages@preamble{\thepage}} + \clearpage} \thesis@blocks@mainMatter} -\def\thesis@postamble{{% - \thesis@selectLocale{\thesis@locale}% +\let\thesis@blocks@preamble\relax +\let\thesis@blocks@mainMatter\relax +\def\thesis@postamble{% + \gdef\thesis@pages@postamble{\thepage} + \write\@auxout{\noexpand\gdef\noexpand + \thesis@pages@postamble{\thepage}} + {\thesis@selectLocale{\thesis@locale}% \thesis@blocks@postamble}} -\let\thesis@blocks@preamble\relax \let\thesis@blocks@postamble\relax -\let\thesis@blocks@mainMatter\relax +\def\thesis@extra@KV@prefix{KV@thesis@extra@} +\def\thesis@extra@XKV@fams{thesis@extra} +\long\def\KV@thesis@extra#1{% + \long\def\XKV@s@tk@ys##1=##2=##3\@nil{% + \XKV@g@tkeyname##1=\@nil\XKV@tkey + \expandafter\KV@@sp@def\expandafter\XKV@tkey\expandafter{\XKV@tkey}% + \ifx\XKV@tkey\@empty + \XKV@toks{##2}% + \ifcat$\the\XKV@toks$\else + \XKV@err{no key specified for value `\the\XKV@toks'}% + \fi + \else + \@expandtwoargs\in@{,\XKV@tkey,}{,\XKV@na,}% + \ifin@\else + \XKV@knftrue + \KV@@sp@def\XKV@tempa{##2}% + \ifXKV@preset\XKV@s@tk@ys@{##3}\else + \ifXKV@pl + \XKV@for@eo\XKV@fams\XKV@tfam{% + \XKV@makehd\XKV@tfam + \XKV@s@tk@ys@{##3}% + }% + \else + \XKV@whilist\XKV@fams\XKV@tfam\ifXKV@knf\fi{% + \XKV@makehd\XKV@tfam + \XKV@s@tk@ys@{##3}% + }% + \fi + \fi + \ifXKV@knf + \ifXKV@inpox + \ifx\XKV@doxs\relax + \ifx\@currext\@clsextension\else + \let\CurrentOption\XKV@tkey\@unknownoptionerror + \fi + \else\XKV@doxs\fi + \else + \ifXKV@st + \XKV@addtolist@o\XKV@rm\CurrentOption + \else + \ifx\XKV@fams\thesis@extra@XKV@fams + \expandafter\long\expandafter\def\csname% + thesis@extra@\XKV@tkey\endcsname{##2}% + \else + \XKV@err{`\XKV@tkey' undefined in families + `\XKV@fams'}% + \fi + \fi + \fi + \else + \ifXKV@inpox\ifx\XKV@testclass\XKV@documentclass + \expandafter\XKV@useoption\expandafter{\CurrentOption}% + \fi\fi + \fi + \fi + \fi + }% + \setkeys{thesis@extra}{#1}% + \def\KV@prefix{KV@thesis@}} +\long\def\KV@split#1=#2=#3\relax{% + \KV@@sp@def\@tempa{#1}% + \ifx\@tempa\@empty\else + \expandafter\let\expandafter\@tempc + \csname\KV@prefix\@tempa\endcsname + \ifx\@tempc\relax + \ifx\KV@prefix\thesis@extra@KV@prefix + \KV@@sp@def\@tempb{#2}% + \expandafter\let\csname thesis@extra@\@tempa\endcsname + \@tempb% + \else + \KV@errx + {\@tempa\space undefined}% + \fi + \else + \ifx\@empty#3\@empty + \KV@default + \else + \KV@@sp@def\@tempb{#2}% + \expandafter\@tempc\expandafter{\@tempb}\relax + \fi + \fi + \fi} +\newcommand{\thesis@def@extra}[2][]{% + \expandafter\ifx\csname thesis@extra@#2\endcsname\relax + \def\thesis@placeholder@extra{<<extra@#2>>}% + \expandafter\let\csname thesis@placeholder@extra@#2\endcsname + \thesis@placeholder@extra + \def\thesis@arg{#1}% + \ifx\empty\thesis@arg + \expandafter\let\csname thesis@extra@#2\endcsname + \thesis@placeholder@extra + \else + \expandafter\def\csname thesis@extra@#2\endcsname{#1}% + \fi + \fi} \long\def\thesislong#1#2{% \csname KV@thesis@#1\endcsname{#2}} \newif\ifthesis@loaded\thesis@loadedfalse @@ -357,6 +463,13 @@ % See <article.gmane.org/gmane.comp.tex.luatex.user/5680> \RequirePackage[base]{babel}} \fi +\ifthesis@english + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@english\endcsname\csname iftrue\endcsname +\else + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@english\endcsname\csname iffalse\endcsname +\fi \ifx\thesis@style\empty\else \thesis@requireStyle{\thesis@style} \fi diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def index bb2a231cc54..39b141a4408 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def @@ -49,8 +49,24 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2017/06/02] + \gdef\thesis@czech@facultyName{Ekonomicko-správní fakulta} + +\gdef\thesis@czech@bib@thesisTitleEn{Název práce v angličtině} +\gdef\thesis@czech@bib@department{Katedra} +\gdef\thesis@czech@bib@year{Rok obhajoby} + +\gdef\thesis@czech@abstractTitle{Anotace} +\thesis@def@extra{advisorCsGenitiv} +\gdef\thesis@czech@declaration{Prohlašuji, že jsem + \thesis@lower{czech@typeName@akuzativ} zpracoval% + \thesis@czech@gender@koncovka\ samostatně pod vedením + \thesis@extra@advisorCsGenitiv\ + a~uvedl\thesis@czech@gender@koncovka\ v~ní všechny + odborné zdroje v~souladu s~právními předpisy, vnitřními + předpisy Masarykovy univerzity a~vnitřními akty řízení + Masarykovy univerzity a~Ekonomicko-správní fakulty MU.} \endinput %% %% End of file `mu/econ/fithesis-czech.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def index e4d405bc389..c4f7e8b44d4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def @@ -49,9 +49,15 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2017/06/02] + \gdef\thesis@english@facultyName{Faculty of Economics and Administration} + +\gdef\thesis@english@bib@department{Department} +\gdef\thesis@english@bib@year{Year of Defense} + +\gdef\thesis@english@abstractTitle{Annotation} \endinput %% %% End of file `mu/econ/fithesis-english.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def index a7721a30bed..ff5c20e4506 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def @@ -49,9 +49,25 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2017/06/02] + \gdef\thesis@slovak@facultyName{Ekonomicko-správna fakulta} +\gdef\thesis@slovak@bib@thesisTitleEn{Názov práce v angličtine} +\gdef\thesis@slovak@bib@department{Katedra} +\gdef\thesis@slovak@bib@year{Rok obhajoby} + +\gdef\thesis@slovak@abstractTitle{Anotácie} +\thesis@def@extra{advisorSkGenitiv} +\gdef\thesis@slovak@declaration{Vyhlasujem, že som + \thesis@lower{slovak@typeName@akuzativ} spracoval% + \thesis@slovak@gender@koncovka\ samostatne pod vedením + \thesis@extra@advisorSkGenitiv\ + a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky + odborné zdroje v~súlade s~právnymi predpismi, vnútornými + předpismi Masarykovej univerzity a~vnútornými aktmi riadenia + Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.} + \endinput %% %% End of file `mu/econ/fithesis-slovak.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def index b28ec64b69a..c1fd1008418 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22] +\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2017/06/02] \gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem @@ -60,6 +60,9 @@ \gdef\thesis@czech@bib@title{Bibliografický záznam} \gdef\thesis@czech@bib@pages{str} +\global\let\thesis@czech@bib@author\thesis@czech@authorTitle +\gdef\thesis@czech@bib@thesisTitle{Název práce} +\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle \gdef\thesis@czech@idTitle{UČO} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def index 37cb55f708a..d0038a2ead3 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22] +\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2017/06/02] \gdef\thesis@english@universityName{Masaryk University} \gdef\thesis@english@declaration{% Hereby I declare that this paper is my original authorial work, @@ -59,6 +59,9 @@ \gdef\thesis@english@bib@title{Bibliographic record} \gdef\thesis@english@bib@pages{p} +\global\let\thesis@english@bib@author\thesis@english@authorTitle +\gdef\thesis@english@bib@thesisTitle{Title of Thesis} +\gdef\thesis@english@bib@advisor{Supervisor} \gdef\thesis@english@idTitle{UČO} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def index 0bc46c823e7..1af90e9f384 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22] +\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2017/06/02] \gdef\thesis@slovak@universityName{Masarykova univerzita} \gdef\thesis@slovak@declaration{% @@ -60,6 +60,9 @@ \gdef\thesis@slovak@bib@title{Bibliografický záznam} \gdef\thesis@slovak@bib@pages{str} +\global\let\thesis@slovak@bib@author\thesis@slovak@authorTitle +\gdef\thesis@slovak@bib@thesisTitle{Názov práce} +\global\let\thesis@slovak@bib@advisor\thesis@slovak@advisorTitle \gdef\thesis@slovak@idTitle{UČO} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def index 54d013bcbda..a3186a173d6 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2017/06/02] \gdef\thesis@english@facultyName{Faculty of Sports Studies} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def index 95428ca1c4a..b5263a740ee 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def @@ -51,9 +51,9 @@ %% \ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23] -\gdef\thesis@czech@abstractTitle{Anotace} - \gdef\thesis@czech@facultyName{Lékařská fakulta} + +\gdef\thesis@czech@abstractTitle{Anotace} \endinput %% %% End of file `mu/med/fithesis-czech.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def index df6ebe4b653..a27b2188ddd 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def @@ -51,9 +51,9 @@ %% \ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23] -\gdef\thesis@english@abstractTitle{Annotation} - \gdef\thesis@english@facultyName{Faculty of Medicine} + +\gdef\thesis@english@abstractTitle{Annotation} \endinput %% %% End of file `mu/med/fithesis-english.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def index 24bb664eb1c..a6ba5dddc16 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def @@ -52,9 +52,9 @@ \ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23] -\gdef\thesis@slovak@abstractTitle{Anotácie} - \gdef\thesis@slovak@facultyName{Lekárska fakulta} + +\gdef\thesis@slovak@abstractTitle{Anotácie} \endinput %% %% End of file `mu/med/fithesis-slovak.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def index 0c06624e230..c878a4d61f7 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2017/06/02] \gdef\thesis@slovak@facultyName{Pedagogická fakulta} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def index 12937854ce7..496bb5239a5 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/06/02] \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -60,11 +60,8 @@ statně s~využitím informačních zdrojů, které jsou v~práci citovány.} -\global\let\thesis@czech@bib@author\thesis@czech@authorTitle -\gdef\thesis@czech@bib@thesisTitle{Název práce} \gdef\thesis@czech@bib@programme{Studijní program} \global\let\thesis@czech@bib@field\thesis@czech@fieldTitle -\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle \gdef\thesis@czech@bib@academicYear{Akademický rok} \gdef\thesis@czech@bib@pages{Počet stran} \global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def index 567631fc366..8374f89fc31 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def @@ -49,17 +49,14 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2017/06/02] \gdef\thesis@english@facultyName{Faculty of Science} \global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor -\global\let\thesis@english@bib@author\thesis@english@authorTitle -\gdef\thesis@english@bib@thesisTitle{Title of Thesis} \gdef\thesis@english@bib@programme{Degree Programme} \global\let\thesis@english@bib@field\thesis@english@fieldTitle -\gdef\thesis@english@bib@advisor{Supervisor} \gdef\thesis@english@bib@academicYear{Academic Year} \gdef\thesis@english@bib@pages{Number of Pages} \global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def index 74dfec3e3ec..974d1f46cfb 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def @@ -50,9 +50,15 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2017/05/21] \gdef\thesis@slovak@facultyName{Prírodovedecká fakulta} + +\gdef\thesis@slovak@bib@programme{Študijný program} +\global\let\thesis@slovak@bib@field\thesis@slovak@fieldTitle +\gdef\thesis@slovak@bib@academicYear{Akademický rok} +\gdef\thesis@slovak@bib@pages{Počet strán} +\global\let\thesis@slovak@bib@keywords\thesis@slovak@keywordsTitle \endinput %% %% End of file `mu/sci/fithesis-slovak.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf Binary files differindex 3909cdff49d..629c9afa0b3 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf Binary files differindex 002fbbb3f14..d3d9baab2e9 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf Binary files differindex 7ee285dc6e8..64d745802dd 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf Binary files differindex fb3ea46209c..f232a9e0525 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf Binary files differindex 97dc5ad3de6..bbc0e3edab4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf Binary files differindex d8aa1c2fc69..f22e6b1e7b5 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf Binary files differindex c802ca57248..7211bca4e0b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf Binary files differindex ad7521f7a3f..c3417d05192 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf Binary files differindex 41c62081b11..04f50c5161c 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf Binary files differindex 5ce4989d33e..8aab1300b95 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf Binary files differindex bae66eef509..384a9b086ef 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf Binary files differindex 019a8abfd3d..8ff53737f43 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf Binary files differindex e66cbaa7178..54859508f78 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf Binary files differindex 664148cbcbf..9c2a6187a36 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf Binary files differindex 247ea2f725e..da3c873d3d2 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf Binary files differindex b7a280fe6b2..0e9e98ee34b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf Binary files differindex 28123e82e9e..c41033f719b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf Binary files differindex 78305482091..020c703185a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf Binary files differindex 6bb868ae327..9460814c020 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf Binary files differindex 3e4c2975714..886f6862640 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty index a544a3f0ad4..58978444cf2 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -240,8 +240,11 @@ \def\thesis@blocks@clear{% \ifthesis@twoside@ \clearpage - \thispagestyle{empty}% - \cleardoublepage + \ifodd\value{page}\else% + \thispagestyle{empty}% + \hbox{}% + \newpage + \fi \else \newpage \fi} @@ -384,8 +387,9 @@ \fi} \def\thesis@blocks@abstract{% \begin{alwayssingle}% - % Start the new chapter without clearing the right page - {\def\cleardoublepage{} + % Start the new chapter without clearing the left page. + \clearpage + {\let\thesis@blocks@clear\relax \chapter*{\thesis@@{abstractTitle}}}% \noindent\thesis@abstract \par\vfil\null @@ -394,17 +398,19 @@ \ifthesis@english\else {\thesis@selectLocale{english}% \begin{alwayssingle}% - % Start the new chapter without clearing the right page - {\def\cleardoublepage{}% - \chapter*{\thesis@english@abstractTitle}% - \thesis@abstractEn}% + % Start the new chapter without clearing the left page. + \clearpage + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@english@abstractTitle}}% + \noindent\thesis@abstractEn \par\vfil\null \end{alwayssingle}}% \fi} \def\thesis@blocks@keywords{% \begin{alwayssingle}% - % Start the new chapter without clearing the right page - {\def\cleardoublepage{}% + % Start the new chapter without clearing the left page. + \clearpage + {\let\thesis@blocks@clear\relax \chapter*{\thesis@@{keywordsTitle}}% \noindent\thesis@TeXkeywords}% \par\vfil\null @@ -413,10 +419,11 @@ \ifthesis@english\else {\thesis@selectLocale{english}% \begin{alwayssingle}% - % Start the new chapter without clearing the right page - {\def\cleardoublepage{}% - \chapter*{\thesis@english@keywordsTitle}% - \thesis@TeXkeywordsEn}% + % Start the new chapter without clearing the left page. + \clearpage + {\let\thesis@blocks@clear\relax% + \chapter*{\thesis@english@keywordsTitle}}% + \noindent\thesis@TeXkeywordsEn \par\vfil\null \end{alwayssingle}}% \fi} @@ -554,7 +561,7 @@ \bfseries % \chapter (0) \or \slshape % \section (1) -\else + \else \rmfamily % \subsection (2), \subsubsection (3) % \paragraph, \subparagraph (4) \fi} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty index 7cfa25d43dd..a5b318f357e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2017/05/21] \thesis@color@setup{ links={HTML}{F27995}, tableEmph={HTML}{E8B88B}, @@ -62,6 +62,7 @@ \thesis@bibliography@load \thesis@require{tikz} \thesis@require{geometry} +\thesis@require{array} \geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot} \def\thesis@blocks@cover{% \ifthesis@cover@ @@ -140,17 +141,81 @@ \addcontentsline{toc}{chapter}{\listfigurename}% \listoffigures} \fi +\def\thesis@blocks@declaration{% + \begin{alwayssingle}% + \thesis@blocks@clear + \leavevmode\vfill + % Start the new chapter without clearing any page. + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@@{declarationTitle}}}% + \thesis@declaration + \vskip 2cm% + {\let\@A\relax\newlength{\@A} + \settowidth{\@A}{\thesis@@{authorSignature}} + \setlength{\@A}{\@A+1cm} + \noindent\thesis@place, \thesis@@{formattedDate}\hfill + \begin{minipage}[t]{\@A}% + \centering\rule{\@A}{1pt}\\ + \thesis@@{authorSignature}\par + \end{minipage}} + \end{alwayssingle}} +\def\thesis@blocks@abstract{% + \begin{alwayssingle}% + \vskip 40\p@ + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@@{abstractTitle}}}% + \noindent\thesis@abstract + \end{alwayssingle}} +\def\thesis@blocks@abstractEn{% + \ifthesis@english\else + {\thesis@selectLocale{english}% + \begin{alwayssingle}% + \vskip 20\p@ + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@english@abstractTitle}}% + \noindent\thesis@abstractEn + \end{alwayssingle}}% + \fi} +\def\thesis@blocks@keywords{% + \begin{alwayssingle}% + \vskip 40\p@ + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@@{keywordsTitle}}% + \noindent\thesis@TeXkeywords}% + \end{alwayssingle}} +\def\thesis@blocks@keywordsEn{% + \ifthesis@english\else + {\thesis@selectLocale{english}% + \begin{alwayssingle}% + \vskip 20\p@ + {\let\thesis@blocks@clear\relax% + \chapter*{\thesis@english@keywordsTitle}}% + \noindent\thesis@TeXkeywordsEn + \end{alwayssingle}}% + \fi} +\def\thesis@blocks@bibEntry{% + \thesis@blocks@clear + \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}} + \thesis@@{bib@author}: & \thesis@author \\ + \thesis@@{bib@thesisTitle}: & \thesis@title \\ + \ifthesis@english\else + \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ + \fi + \thesis@@{bib@department}: & \thesis@department \\ + \thesis@@{bib@advisor}: & \thesis@advisor \\ + \thesis@@{bib@year}: & \thesis@year \\ + \end{thesis@newtable@old}} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@assignment - \thesis@blocks@clearRight - \thesis@blocks@abstract - \thesis@blocks@abstractEn - \thesis@blocks@keywords - \thesis@blocks@keywordsEn + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@toc} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty index b3d6bd4325c..d127f973dd5 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/15] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/21] \thesis@color@setup{ links={HTML}{93BCF5}, tableEmph={HTML}{A8BDE3}, diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty index 73a6c529d24..84e6d86c2b1 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21] \thesis@color@setup{ links={HTML}{CF86EB}, tableEmph={HTML}{D39BE8}, diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty index 95a6e41eb3e..0d64203b392 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2017/05/21] \thesis@color@setup{ links={HTML}{F58E76}, tableEmph={HTML}{FF9D85}, diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty index 53d383b639f..3aeb70ba081 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/06/06] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2017/06/02] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -61,6 +61,31 @@ sorting=none} \thesis@bibliography@load \thesis@requireLocale{czech} +\def\ifthesis@czech{ + \expandafter\def\expandafter\@czech\expandafter{\string + \czech}% + \expandafter\expandafter\expandafter\def\expandafter + \expandafter\expandafter\@locale\expandafter\expandafter + \expandafter{\expandafter\string\csname\thesis@locale\endcsname}% + \expandafter\csname\expandafter i\expandafter f\ifx\@locale + \@czech + true% + \else + false% + \fi\endcsname} +\ifthesis@czech + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@czech\endcsname\csname iftrue\endcsname +\else + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@czech\endcsname\csname iffalse\endcsname +\fi +\newif\ifthesis@abstractonsinglepage@ +\DeclareOption{abstractonsinglepage}{\thesis@abstractonsinglepage@true} +\ifthesis@czech\else\ifthesis@english\else + \ExecuteOptions{abstractonsinglepage} +\fi\fi +\ProcessOptions* \thesis@require{tikz} \thesis@require{changepage} \ifx\thesis@type\thesis@bachelors\else @@ -70,32 +95,38 @@ \thesis@blocks@assignment@hideIfDigital@false \def\thesis@blocks@bibEntry{% \begin{alwayssingle}% - {% Start the new chapter without clearing the right page - {\def\cleardoublepage{}% - \chapter*{\thesis@czech@bib@title}}% - % Calculate the width of the columns + % Clear only the right page, if the main locale is Czech. + \ifthesis@czech + \begingroup + \let\thesis@blocks@clear\thesis@blocks@clearRight + \fi + \chapter*{\thesis@@{bib@title}}% + \ifthesis@czech + \endgroup + \fi + {% Calculate the width of the columns \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@czech@bib@author:}} + \bf\thesis@@{bib@author}:}} \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% - \bf\thesis@czech@bib@thesisTitle:}} + \bf\thesis@@{bib@thesisTitle}:}} \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@czech@bib@programme:}} + \bf\thesis@@{bib@programme}:}} \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% - \bf\thesis@czech@bib@field:}} + \bf\thesis@@{bib@field}:}} % Unless this is a rigorous thesis, we will be typesetting the % name of the thesis advisor. \let\@E\relax\newlength{\@E} \ifx\thesis@type\thesis@rigorous \setlength{\@E}{0pt}% \else - \settowidth{\@E}{{\bf\thesis@czech@bib@advisor:}} + \settowidth{\@E}{{\bf\thesis@@{bib@advisor}:}} \fi \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% - \bf\thesis@czech@bib@academicYear:}} + \bf\thesis@@{bib@academicYear}:}} \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% - \bf\thesis@czech@bib@pages:}} + \bf\thesis@@{bib@pages}:}} \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% - \bf\thesis@czech@bib@keywords:}} + \bf\thesis@@{bib@keywords}:}} \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} @@ -105,113 +136,253 @@ \renewcommand{\arraystretch}{2} \noindent\begin{thesis@newtable@old}% {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} - \textbf{\thesis@czech@bib@author:} & + \textbf{\thesis@@{bib@author}:} & \noindent\parbox[t]{\@right}{ \thesis@author\\ - \thesis@czech@facultyName, - \thesis@czech@universityName\\ + \thesis@@{facultyName}, + \thesis@@{universityName}\\ \thesis@department@name }\\ - \textbf{\thesis@czech@bib@thesisTitle:} + \textbf{\thesis@@{bib@thesisTitle}:} & \thesis@title \\ - \textbf{\thesis@czech@bib@programme:} + \textbf{\thesis@@{bib@programme}:} & \thesis@programme \\ - \textbf{\thesis@czech@bib@field:} + \textbf{\thesis@@{bib@field}:} & \thesis@field@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else - \textbf{\thesis@czech@bib@advisor:} + \textbf{\thesis@@{bib@advisor}:} & \thesis@advisor \\ \fi - \textbf{\thesis@czech@bib@academicYear:} + \textbf{\thesis@@{bib@academicYear}:} & \thesis@academicYear \\ - \textbf{\thesis@czech@bib@pages:} - & \thesis@pages \\ - \textbf{\thesis@czech@bib@keywords:} + \textbf{\thesis@@{bib@pages}:} + & \thesis@pages@preamble{} + \thesis@pages \\ + \textbf{\thesis@@{bib@keywords}:} & \thesis@TeXkeywords \\ \end{thesis@newtable@old}} \end{alwayssingle}} \def\thesis@blocks@bibEntryEn{% - {\thesis@selectLocale{english} - \begin{alwayssingle} - % Start the new chapter without clearing the right page - {\def\cleardoublepage{}% - \chapter*{\thesis@english@bib@title}}% - {% Calculate the width of the columns - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@english@bib@author:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% - \bf\thesis@english@bib@thesisTitle:}} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@english@bib@programme:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% - \bf\thesis@english@bib@field:}} - % Unless this is a rigorous thesis, we will be typesetting - % the name of the thesis advisor. - \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous - \setlength{\@E}{0pt}% + \ifthesis@english\else + {\thesis@selectLocale{english} + \begin{alwayssingle} + \chapter*{\thesis@english@bib@title}% + {% Calculate the width of the columns + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@english@bib@author:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% + \bf\thesis@english@bib@thesisTitle:}} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@english@bib@programme:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% + \bf\thesis@english@bib@field:}} + % Unless this is a rigorous thesis, we will be typesetting + % the name of the thesis advisor. + \let\@E\relax\newlength{\@E} + \ifx\thesis@type\thesis@rigorous + \setlength{\@E}{0pt}% + \else + \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} + \fi + \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% + \bf\thesis@english@bib@academicYear:}} + \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% + \bf\thesis@english@bib@pages:}} + \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% + \bf\thesis@english@bib@keywords:}} + \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} + \let\@right\relax\newlength{\@right}\setlength{\@right}{% + \textwidth-\@left-\@skip} + % Typeset the table + \renewcommand{\arraystretch}{2} + \noindent\begin{thesis@newtable@old}% + {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} + \textbf{\thesis@english@bib@author:} & + \noindent\parbox[t]{\@right}{ + \thesis@author\\ + \thesis@english@facultyName, + \thesis@english@universityName\\ + \thesis@departmentEn@name + }\\ + \textbf{\thesis@english@bib@thesisTitle:} + & \thesis@titleEn \\ + \textbf{\thesis@english@bib@programme:} + & \thesis@programmeEn \\ + \textbf{\thesis@english@bib@field:} + & \thesis@fieldEn@name \\ + % Unless this is a rigorous thesis, typeset the name of the + % thesis advisor. + \ifx\thesis@type\thesis@rigorous\else + \textbf{\thesis@english@bib@advisor:} + & \thesis@advisor \\ + \fi + \textbf{\thesis@english@bib@academicYear:} + & \thesis@academicYear \\ + \textbf{\thesis@english@bib@pages:} + & \thesis@pages@preamble{} + \thesis@pages \\ + \textbf{\thesis@english@bib@keywords:} + & \thesis@TeXkeywordsEn \\ + \end{thesis@newtable@old}} + \end{alwayssingle} + }% + \fi} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@abstract + \else + \thesis@placeholder@extra@abstractCs + \fi +}]{abstractCs} +\def\thesis@blocks@abstractCs{% + \ifthesis@czech\else + {\thesis@selectLocale{czech}% + \begin{alwayssingle}% + \ifthesis@abstractonsinglepage@ + \thesis@blocks@clear \else - \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} + % Start the new chapter without clearing the left page. + \thesis@blocks@clearRight \fi - \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% - \bf\thesis@english@bib@academicYear:}} - \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% - \bf\thesis@english@bib@pages:}} - \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% - \bf\thesis@english@bib@keywords:}} - \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} - \let\@right\relax\newlength{\@right}\setlength{\@right}{% - \textwidth-\@left-\@skip} - % Typeset the table - \renewcommand{\arraystretch}{2} - \noindent\begin{thesis@newtable@old}% - {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} - \textbf{\thesis@english@bib@author:} & - \noindent\parbox[t]{\@right}{ - \thesis@author\\ - \thesis@english@facultyName, - \thesis@english@universityName\\ - \thesis@departmentEn@name - }\\ - \textbf{\thesis@english@bib@thesisTitle:} - & \thesis@titleEn \\ - \textbf{\thesis@english@bib@programme:} - & \thesis@programmeEn \\ - \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn@name \\ - % Unless this is a rigorous thesis, typeset the name of the - % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else - \textbf{\thesis@english@bib@advisor:} - & \thesis@advisor \\ + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@czech@abstractTitle}% + \thesis@extra@abstractCs}% + \par\vfil\null + \end{alwayssingle}}% + \fi} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@programme + \else + \thesis@placeholder@extra@programmeCs + \fi +}]{programmeCs} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@field@name + \else + \thesis@placeholder@extra@fieldCs + \fi +}]{fieldCs} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@title + \else + \thesis@placeholder@extra@titleCs + \fi +}]{titleCs} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@keywords + \else + \thesis@placeholder@extra@keywordsCs + \fi +}]{keywordsCs} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@TeXkeywords + \else + \thesis@placeholder@extra@keywordsCs + \fi +}]{TeXkeywordsCs} +\def\thesis@blocks@bibEntryCs{% + \ifthesis@czech\else + {\thesis@selectLocale{czech} + \begin{alwayssingle} + % Clear only the right page, if the main locale is English. + \ifthesis@english + \begingroup + \let\thesis@blocks@clear\thesis@blocks@clearRight + \fi + \chapter*{\thesis@czech@bib@title}% + \ifthesis@english + \endgroup + \fi + {% Calculate the width of the columns + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@czech@bib@author:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% + \bf\thesis@czech@bib@thesisTitle:}} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@czech@bib@programme:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% + \bf\thesis@czech@bib@field:}} + % Unless this is a rigorous thesis, we will be typesetting + % the name of the thesis advisor. + \let\@E\relax\newlength{\@E} + \ifx\thesis@type\thesis@rigorous + \setlength{\@E}{0pt}% + \else + \settowidth{\@E}{{\bf\thesis@czech@bib@advisor:}} \fi - \textbf{\thesis@english@bib@academicYear:} - & \thesis@academicYear \\ - \textbf{\thesis@english@bib@pages:} - & \thesis@pages \\ - \textbf{\thesis@english@bib@keywords:} - & \thesis@TeXkeywordsEn \\ - \end{thesis@newtable@old}} - \end{alwayssingle} - }} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% + \bf\thesis@czech@bib@academicYear:}} + \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% + \bf\thesis@czech@bib@pages:}} + \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% + \bf\thesis@czech@bib@keywords:}} + \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} + \let\@right\relax\newlength{\@right}\setlength{\@right}{% + \textwidth-\@left-\@skip} + % Typeset the table + \renewcommand{\arraystretch}{2} + \noindent\begin{thesis@newtable@old}% + {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} + \textbf{\thesis@czech@bib@author:} & + \noindent\parbox[t]{\@right}{ + \thesis@author\\ + \thesis@czech@facultyName, + \thesis@czech@universityName\\ + \thesis@extra@departmentCs + }\\ + \textbf{\thesis@czech@bib@thesisTitle:} + & \thesis@extra@titleCs \\ + \textbf{\thesis@czech@bib@programme:} + & \thesis@extra@programmeCs \\ + \textbf{\thesis@czech@bib@field:} + & \thesis@extra@fieldCs \\ + % Unless this is a rigorous thesis, typeset the name of the + % thesis advisor. + \ifx\thesis@type\thesis@rigorous\else + \textbf{\thesis@czech@bib@advisor:} + & \thesis@advisor \\ + \fi + \textbf{\thesis@czech@bib@academicYear:} + & \thesis@academicYear \\ + \textbf{\thesis@czech@bib@pages:} + & \thesis@pages@preamble{} + \thesis@pages \\ + \textbf{\thesis@czech@bib@keywords:} + & \thesis@extra@TeXkeywordsCs \\ + \end{thesis@newtable@old}} + \end{alwayssingle} + }% + \fi} \def\thesis@blocks@frontMatter{% + \thesis@blocks@clear \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{roman}} -\def\thesis@blocks@cover{% +\thesis@def@extra[{ + \ifthesis@czech + \thesis@department@name + \else + \thesis@placeholder@extra@departmentCs + \fi +}]{departmentCs} +\def\thesis@blocks@cover{{% + \thesis@selectLocale{czech} \ifthesis@cover@ \thesis@blocks@clear \begin{alwayssingle} - \thispagestyle{empty} \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@large\thesis@department@name} + \thesis@titlePage@normalsize\thesis@extra@departmentCs} \vfill {\bf\thesis@titlePage@Huge\thesis@czech@typeName} \vfill @@ -219,11 +390,18 @@ \ \thesis@year\hfill\thesis@author} \end{center} \end{alwayssingle} - \fi} -\def\thesis@blocks@titlePage{% + \fi}} +\thesis@def@extra[{ + \ifthesis@czech + \thesis@TeXtitle + \else + \thesis@placeholder@extra@titleCs + \fi +}]{TeXtitleCs} +\def\thesis@blocks@titlePage{{% \thesis@blocks@clear + \thesis@selectLocale{czech} \begin{alwayssingle} - \thispagestyle{empty} % The top of the page \begin{adjustwidth}{-12mm}{} \begin{minipage}{30mm} @@ -232,7 +410,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@department@name} + \thesis@titlePage@normalsize\thesis@extra@departmentCs} \rule{\textwidth}{2pt}\vspace*{2mm} \end{center} \end{minipage}\begin{minipage}{30mm} @@ -242,7 +420,7 @@ % The middle of the page \vfill \parbox\textwidth{% Prevent vfills from squashing the leading - \bf\thesis@titlePage@Huge\thesis@TeXtitle} + \bf\thesis@titlePage@Huge\thesis@extra@TeXtitleCs} {\thesis@titlePage@Huge\\[0.8em]} {\thesis@titlePage@large\thesis@czech@typeName\\[1em]} {\bf\thesis@titlePage@LARGE\thesis@author\\} @@ -255,38 +433,58 @@ \thesis@czech@advisorTitle: \thesis@advisor\hfill \fi \thesis@place\ \thesis@year} - \end{alwayssingle}} -\def\thesis@blocks@declaration{% + \end{alwayssingle}}} +\def\thesis@blocks@thanks{% \thesis@blocks@clear + \ifx\thesis@thanks\undefined\else + \begin{alwayssingle}% + \chapter*{\thesis@@{thanksTitle}}% + \leavevmode\thesis@thanks + \end{alwayssingle}% + \fi} +\def\thesis@blocks@declaration{% \begin{alwayssingle}% - \chapter*{\thesis@@{declarationTitle}}% + \leavevmode\vfill + % Start the new chapter without clearing any page. + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@@{declarationTitle}}}% \thesis@declaration \vskip 2cm% {\let\@A\relax\newlength{\@A} \settowidth{\@A}{\thesis@@{authorSignature}} \setlength{\@A}{\@A+1cm} - \noindent\thesis@place, \thesis@czech@formattedDate\hfill + \noindent\thesis@place, \thesis@@{formattedDate}\hfill \begin{minipage}[t]{\@A}% \centering\rule{\@A}{1pt}\\ \thesis@@{authorSignature}\par \end{minipage}} \end{alwayssingle}} -\def\thesis@blocks@preamble{{% - \thesis@selectLocale{czech}% +\def\thesis@blocks@preamble{ \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@clearRight + \thesis@blocks@bibEntryCs \thesis@blocks@bibEntry \thesis@blocks@bibEntryEn - \thesis@blocks@abstract - \thesis@blocks@abstractEn} + \thesis@blocks@abstractCs + \ifthesis@abstractonsinglepage@ + \begingroup + \let\clearpage\relax + \fi + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \ifthesis@abstractonsinglepage@ + \endgroup + \fi \thesis@blocks@assignment {\thesis@selectLocale{czech}% \thesis@blocks@thanks \thesis@blocks@declaration - \thesis@blocks@tables}} + \thesis@blocks@clear + \pagestyle{plain}% + \thesis@blocks@tables}} \def\thesis@blocks@postamble{% \thesis@blocks@bibliography} \endinput |