From d15b1e7ca9e5168ae4c7ad4f7fc76195e9606a5d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Jan 2016 23:38:48 +0000 Subject: fithesis (14jan16) git-svn-id: svn://tug.org/texlive/trunk@39388 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fithesis/fithesis3.cls | 70 +++---- .../tex/latex/fithesis/locale/fithesis-czech.def | 31 +-- .../tex/latex/fithesis/locale/fithesis-english.def | 21 ++- .../tex/latex/fithesis/locale/fithesis-slovak.def | 31 +-- .../fithesis/locale/mu/phil/fithesis-czech.def | 18 +- .../fithesis/locale/mu/phil/fithesis-slovak.def | 18 +- .../fithesis/locale/mu/sci/fithesis-czech.def | 36 +++- .../latex/fithesis/logo/mu/fithesis-base-color.pdf | Bin 15999 -> 15999 bytes .../tex/latex/fithesis/logo/mu/fithesis-base.pdf | Bin 15988 -> 15988 bytes .../latex/fithesis/logo/mu/fithesis-econ-color.pdf | Bin 34491 -> 34491 bytes .../tex/latex/fithesis/logo/mu/fithesis-econ.pdf | Bin 12932 -> 12932 bytes .../latex/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11808 -> 11808 bytes .../tex/latex/fithesis/logo/mu/fithesis-fi.pdf | Bin 11624 -> 11624 bytes .../latex/fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 12560 -> 12560 bytes .../tex/latex/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11730 -> 11730 bytes .../latex/fithesis/logo/mu/fithesis-fss-color.pdf | Bin 11933 -> 11933 bytes .../tex/latex/fithesis/logo/mu/fithesis-fss.pdf | Bin 11590 -> 11590 bytes .../latex/fithesis/logo/mu/fithesis-law-color.pdf | Bin 18971 -> 18971 bytes .../tex/latex/fithesis/logo/mu/fithesis-law.pdf | Bin 18435 -> 18435 bytes .../latex/fithesis/logo/mu/fithesis-med-color.pdf | Bin 11116 -> 11116 bytes .../tex/latex/fithesis/logo/mu/fithesis-med.pdf | Bin 10590 -> 10590 bytes .../latex/fithesis/logo/mu/fithesis-ped-color.pdf | Bin 11027 -> 11027 bytes .../tex/latex/fithesis/logo/mu/fithesis-ped.pdf | Bin 10492 -> 10492 bytes .../latex/fithesis/logo/mu/fithesis-phil-color.pdf | Bin 12736 -> 12736 bytes .../tex/latex/fithesis/logo/mu/fithesis-phil.pdf | Bin 12180 -> 12180 bytes .../latex/fithesis/logo/mu/fithesis-sci-color.pdf | Bin 25965 -> 25965 bytes .../tex/latex/fithesis/logo/mu/fithesis-sci.pdf | Bin 25494 -> 25494 bytes .../tex/latex/fithesis/style/mu/fithesis-10.clo | 123 ++++++------ .../tex/latex/fithesis/style/mu/fithesis-11.clo | 121 ++++++------ .../tex/latex/fithesis/style/mu/fithesis-12.clo | 115 ++++++------ .../tex/latex/fithesis/style/mu/fithesis-base.sty | 207 ++++++++++----------- .../tex/latex/fithesis/style/mu/fithesis-econ.sty | 6 +- .../tex/latex/fithesis/style/mu/fithesis-fi.sty | 18 +- .../tex/latex/fithesis/style/mu/fithesis-sci.sty | 41 ++-- 34 files changed, 435 insertions(+), 421 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fithesis') diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 849670dae44..05983c918c8 100644 --- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls +++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\def\thesis@version{2015/01/05 v0.3.30 fithesis3 MU thesis class} +\def\thesis@version{2016/01/13 v0.3.31 fithesis3 MU thesis class} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -69,9 +69,9 @@ \setkeys{thesis}{#1}} \def\thesis@basepath{fithesis/} \define@key{thesis}{basePath}{% - \ifx\thesis@empty#1\thesis@empty% + \ifx\thesis@empty#1\thesis@empty \def\thesis@basepath{}% - \else% + \else \def\thesis@basepath{#1/}% \fi} \def\thesis@logopath{\thesis@basepath logo/\thesis@university/} @@ -96,7 +96,7 @@ \else% / -> // #1#2#3#4/% \fi - \else% + \else \if#1.% \ifx#2\empty% . -> ./ ./% @@ -122,7 +122,7 @@ \else \thesis@basepath#1#2#3#4/% \fi - \fi% + \fi \fi} \newcommand{\thesis@def}[2][]{% \expandafter\def\csname thesis@#2\endcsname{% @@ -134,14 +134,14 @@ \define@key{thesis}{gender}{% \def\thesis@male{m}% \def\thesis@arg{#1}% - \ifx\thesis@male\thesis@arg% - \thesis@womanfalse% - \else% - \thesis@womantrue% + \ifx\thesis@male\thesis@arg + \thesis@womanfalse + \else + \thesis@womantrue \fi} \def\thesis@parseAuthor#1{% \def\thesis@author{#1}% - \def\thesis@author@head{\expandafter\expandafter\expandafter% + \def\thesis@author@head{\expandafter\expandafter\expandafter \@gobble\thesis@head#1 \relax}% \def\thesis@author@tail{\thesis@tail#1 \relax}} \thesis@def{author}% @@ -205,20 +205,20 @@ \fi} \def\thesis@locale{% % Babel / polyglossia detection - \ifx\languagename\undefined% + \ifx\languagename\undefined english\else\languagename\fi} \define@key{thesis}{locale}{% \def\thesis@locale{#1}} \def\ifthesis@english{ - \expandafter\def\expandafter\@english\expandafter{\string% + \expandafter\def\expandafter\@english\expandafter{\string \english}% - \expandafter\expandafter\expandafter\def\expandafter% - \expandafter\expandafter\@locale\expandafter\expandafter% + \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% - \@english% + \expandafter\csname\expandafter i\expandafter f\ifx\@locale + \@english true% - \else% + \else false% \fi\endcsname} \newif\ifthesis@locale@inheritance\thesis@locale@inheritancetrue @@ -314,10 +314,10 @@ \define@key{thesis}{autoLayout}[true]{% \def\@true{true}% \def\@arg{#1}% - \ifx\@true\@arg% - \thesis@autotrue% - \else% - \thesis@autofalse% + \ifx\@true\@arg + \thesis@autotrue + \else + \thesis@autofalse \fi} \def\thesis@preamble{% {\thesis@selectLocale{\thesis@locale}% @@ -336,9 +336,9 @@ \newif\ifthesis@loaded\thesis@loadedfalse \AtEndPreamble{\thesis@load} \def\thesis@load{% - \ifthesis@loaded\else% + \ifthesis@loaded\else \thesis@loadedtrue - \makeatletter% + \makeatletter \ifx\thesis@locale\empty\else \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} @@ -381,19 +381,19 @@ \newcommand\thesis@requireIfExists[2][]{% \thesis@exists{#2.sty}{\thesis@require[#1]{#2}}} \def\thesis@requireStyle#1{% - \ifthesis@style@inheritance% + \ifthesis@style@inheritance \thesis@requireIfExists{\thesis@stylepath fithesis-base}% - \thesis@requireIfExists{\thesis@stylepath\thesis@university% + \thesis@requireIfExists{\thesis@stylepath\thesis@university /fithesis-base} - \fi% + \fi \thesis@requireIfExists{\thesis@stylepath#1}} \def\thesis@requireLocale#1{% % Ignore redundant requests - \expandafter\ifx\csname thesis@#1@required\endcsname\relax% + \expandafter\ifx\csname thesis@#1@required\endcsname\relax \expandafter\def\csname thesis@#1@required\endcsname{}% \@ifpackageloaded{polyglossia}{\setotherlanguage{#1}}{} \thesis@input{\thesis@localepath fithesis-#1.def}% - \ifthesis@locale@inheritance% + \ifthesis@locale@inheritance \thesis@input{\thesis@localepath\thesis@university/% fithesis-#1.def}% \thesis@input{\thesis@localepath\thesis@university/% @@ -403,13 +403,13 @@ \def\thesis@#1{\csname thesis@#1\endcsname} \def\thesis@@#1{\thesis@{\thesis@locale @#1}} \def\thesis@lower#1{{% - \let\ea\expandafter% + \let\ea\expandafter \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\lowercase\ea\ea\ea \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% sis@#1\endcsname\endcsname}}} \def\thesis@upper#1{{% - \let\ea\expandafter% + \let\ea\expandafter \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\uppercase\ea\ea\ea \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% @@ -418,16 +418,16 @@ \def\thesis@@upper#1{\thesis@upper{\thesis@locale @#1}} \def\thesis@head#1 #2{% \ifx\relax#2% - \expandafter\@gobbletwo% - \else% + \expandafter\@gobbletwo + \else \ #1% - \fi% + \fi \thesis@head#2}% \def\thesis@tail#1 #2{% \ifx\relax#2% #1% - \expandafter\@gobbletwo% - \fi% + \expandafter\@gobbletwo + \fi \thesis@tail#2}% \AtEndDocument{\write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \ifx\thesis@pages\undefined\def\thesis@pages{??}\fi diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def index c46ef76bcdb..b9b57cfad96 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/01/05] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/01/13] \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} @@ -62,6 +62,11 @@ oficiálního podepsaného zadání práce.} \gdef\thesis@czech@declaration{Text prohlášení ...} +\gdef\thesis@czech@spring{jaro} +\gdef\thesis@czech@fall{podzim} +\gdef\thesis@czech@semester{% + \thesis@{czech@\thesis@season} \thesis@seasonYear} + \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} @@ -70,32 +75,28 @@ \gdef\thesis@czech@thanksTitle{Poděkování} \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} -\gdef\thesis@czech@spring{jaro} -\gdef\thesis@czech@fall{podzim} -\gdef\thesis@czech@semester{% - \thesis@{czech@\thesis@season} \thesis@seasonYear} \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářská práce% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomová práce% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práce% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózní práce% - \else% + \else <>% \fi\fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářskou práci% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práci% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózní práci% - \else% + \else <>% \fi\fi\fi\fi} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def index 69e06fb2232..01a4ffa2d5a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/01/05] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/01/13] \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} @@ -59,6 +59,11 @@ \gdef\thesis@english@csquotesStyle{english} +\gdef\thesis@english@spring{Spring} +\gdef\thesis@english@fall{Fall} +\gdef\thesis@english@semester{% + \thesis@{english@\thesis@season} \thesis@seasonYear} + \gdef\thesis@english@fieldTitle{Field of study} \gdef\thesis@english@advisorTitle{Advisor} \gdef\thesis@english@authorTitle{Author} @@ -67,20 +72,16 @@ \gdef\thesis@english@thanksTitle{Acknowledgement} \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} -\gdef\thesis@english@spring{Spring} -\gdef\thesis@english@fall{Fall} -\gdef\thesis@english@semester{% - \thesis@{english@\thesis@season} \thesis@seasonYear} \gdef\thesis@english@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bachelor's Thesis% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Master's Thesis% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Doctoral Thesis% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorous Thesis% - \else% + \else <>% \fi\fi\fi\fi} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def index 5b2b6431e68..e2d870a38ff 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/01/05] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/01/13] \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} @@ -62,6 +62,11 @@ oficiálneho podpísaného zadania práce.} \gdef\thesis@slovak@declaration{Text prehlásenie ...} +\gdef\thesis@slovak@spring{jar} +\gdef\thesis@slovak@fall{jeseň} +\gdef\thesis@slovak@semester{% + \thesis@{slovak@\thesis@season} \thesis@seasonYear} + \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} @@ -70,32 +75,28 @@ \gdef\thesis@slovak@thanksTitle{Poďakovanie} \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} -\gdef\thesis@slovak@spring{jar} -\gdef\thesis@slovak@fall{jeseň} -\gdef\thesis@slovak@semester{% - \thesis@{slovak@\thesis@season} \thesis@seasonYear} \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalárska práca% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomová práca% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačná práca% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózna práca% - \else% + \else <>% \fi\fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalársku prácu% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačnú prácu% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigoróznu prácu% - \else% + \else <>% \fi\fi\fi\fi} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def index cce29ad39fe..d59cf6bd76d 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/01/07] \gdef\thesis@czech@facultyName{Filozofická fakulta} \gdef\thesis@czech@declaration{% @@ -58,23 +58,23 @@ uvedené literatury.} \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářská diplomová práce% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Magisterská diplomová práce% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práce% - \else% + \else <>% \fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Diplomovou práci% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práci% - \else% + \else <>% \fi\fi\fi} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def index ef539347464..d146d42e774 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/01/07] \gdef\thesis@slovak@facultyName{Filozofická fakulta} \gdef\thesis@slovak@declaration{% @@ -61,23 +61,23 @@ uvedenej literatúry a prameňov.} \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalárska diplomová práca% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Magisterská diplomová práca% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačná práca% - \else% + \else <>% \fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Diplomovú prácu% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačnú prácu% - \else% + \else <>% \fi\fi\fi} \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 c7bbfcb4abd..70853efa40f 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}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/01/12] \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -59,6 +59,40 @@ akuzativ} vypracoval\thesis@czech@gender@koncovka\ samo% statně s~využitím informačních zdrojů, které jsou v~práci citovány.} +\gdef\thesis@czech@authorSignature{Podpis autora} + +\gdef\thesis@czech@formattedDate{{% + \thesis@day. + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month=1% + ledna + \else\ifnum\@month=2% + února + \else\ifnum\@month=3% + března + \else\ifnum\@month=4% + dubna + \else\ifnum\@month=5% + května + \else\ifnum\@month=6% + června + \else\ifnum\@month=7% + července + \else\ifnum\@month=8% + srpna + \else\ifnum\@month=9% + září + \else\ifnum\@month=10% + října + \else\ifnum\@month=11% + listopadu + \else\ifnum\@month=12% + prosince + \else + <> + \fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi + \thesis@year}} \gdef\thesis@czech@bib@title{Bibliografický záznam} \global\let\thesis@czech@bib@author\thesis@czech@authorTitle diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf index cbe4d37b4e8..f92c93c5b89 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf index db9daac6ae9..86c267f4b26 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf index be8cb0cd38f..e1bb7bbd3af 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf index df6e79af8eb..a74cbdf00a9 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf index 3b7f40ad42e..b4b9ceef26f 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf index a9ab4e69398..e93d9c5626a 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf index 43ac7be4a76..04799b62571 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf index 90d763a60bf..4347ab43440 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf index d3a9f7f0404..6e55c8fd830 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf index dd10b4d67b7..1c022fe5e0c 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf index 2a0d03a4ff5..85ede82e0a6 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf index 49e42fe92e9..f64df14136b 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf index 06a9f122f9d..b0d4208c446 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf index a62128e95ab..c79f8126f12 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf index 6ef3332424d..148db199f08 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf index f38d19a01f0..181858e8aca 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf index 33c6da50a84..06186741965 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf index c30226f1d96..20c17b6ccff 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf index e3dbd5133f1..5b68b199dd0 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf index 1774a6ef3ac..531e9fc5571 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo index 1a337652202..9a3b0235b57 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo @@ -49,16 +49,16 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2016/01/07] -\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont% +\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ \belowdisplayshortskip 6\p@ plus3\p@ minus3\p@ \let\@listi\@listI} -\renewcommand{\small}{\fontsize\@ixpt{11}\selectfont% +\renewcommand{\small}{\fontsize\@ixpt{11}\selectfont \abovedisplayskip 8.5\p@ plus3\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus2\p@ @@ -67,7 +67,7 @@ \topsep 4\p@ plus2\p@ minus2\p@\parsep 2\p@ plus\p@ minus\p@ \itemsep \parsep}} -\renewcommand{\footnotesize}{\fontsize\@viiipt{9.5}\selectfont% +\renewcommand{\footnotesize}{\fontsize\@viiipt{9.5}\selectfont \abovedisplayskip 6\p@ plus2\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus\p@ @@ -92,7 +92,7 @@ \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ \let\@listi\@listI} -\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont% +\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -102,7 +102,7 @@ \itemsep \parsep \topsep 9\p@ plus3\p@ minus5\p@}} -\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont% +\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -172,38 +172,31 @@ \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\def\@makechapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \ifnum - \c@secnumdepth >\m@ne - \par\nobreak - \vskip 10\p@ - \fi - \Large \ChapFont \thechapter{} \space #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makechapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \ifnum + \c@secnumdepth >\m@ne + \par\nobreak + \vskip 10\p@ + \fi + \Large \ChapFont \thechapter{} \space #1\par + \nobreak + \vskip 20\p@}} -\def\@makeschapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \Large \ChapFont #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makeschapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \Large \ChapFont #1\par + \nobreak + \vskip 20\p@}} \def\chapter{% - \clearpage - \thispagestyle{plain} - \global\@topnum\z@ - \@afterindentfalse - \secdef\@chapter\@schapter - } + \clearpage + \thispagestyle{plain} + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth @@ -212,7 +205,7 @@ \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}{\protect \numberline{\thechapter}\bfseries #1} - \else% + \else \addcontentsline{toc}{chapter}{\bfseries #1} \fi \chaptermark{#1}% @@ -228,28 +221,24 @@ \fi } - -\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus - -.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}} -\def\subsection{\@startsection{subsection}{2}{\z@}{-3.25ex plus-1ex - minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize\bfseries}} -\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{-3.25ex plus - -1ex minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize}} -\def\paragraph{\@startsection - {paragraph}{4}{\z@}{3.25ex plus1ex minus.2ex}{-1em}{\reset@font - \normalsize\bfseries}} -\def\subparagraph{\@startsection - {subparagraph}{4}{\parindent}{3.25ex plus1ex minus - .2ex}{-1em}{\reset@font\normalsize\bfseries}} +\def\section{\@startsection{section}{1}{\z@}{% + -3.5ex plus-1ex minus-.2ex}{2.3ex plus.2ex}{% + \reset@font\large\bfseries}} +\def\subsection{\@startsection{subsection}{2}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize\bfseries}} +\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize}} +\def\paragraph{\@startsection{paragraph}{4}{\z@}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} +\def\subparagraph{\@startsection{subparagraph}{4}{\parindent}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} \setcounter{secnumdepth}{2} -\def\appendix{\par - \setcounter{chapter}{0}% - \setcounter{section}{0}% - \def\@chapapp{\appendixname}% - \def\thechapter{\Alph{chapter}}} - \leftmargini 2.5em \leftmarginii 2.2em % > \labelsep + width of '(m)' \leftmarginiii 1.87em % > \labelsep + width of 'vii.' @@ -261,7 +250,7 @@ \labelsep .5em \labelwidth\leftmargini\advance\labelwidth-\labelsep -\def\@listI{\leftmargin\leftmargini \parsep 4\p@ plus2\p@ minus\p@% +\def\@listI{\leftmargin\leftmargini \parsep 4\p@ plus2\p@ minus\p@ \topsep 8\p@ plus2\p@ minus4\p@ \itemsep 4\p@ plus2\p@ minus\p@} @@ -269,25 +258,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 4\p@ plus2\p@ minus\p@ - \parsep 2\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 4\p@ plus2\p@ minus\p@ + \parsep 2\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep\p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep\p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} \endinput %% %% End of file `fithesis-10.clo'. diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo index 27a74f7175c..25cc5982bc7 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo @@ -49,15 +49,15 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2016/01/07] -\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont% +\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ \let\@listi\@listI} -\renewcommand{\small}{\fontsize\@xpt{12}\selectfont% +\renewcommand{\small}{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -66,7 +66,7 @@ \topsep 6\p@ plus2\p@ minus2\p@\parsep 3\p@ plus2\p@ minus\p@ \itemsep \parsep}} -\renewcommand{\footnotesize}{\fontsize\@ixpt{11}\selectfont% +\renewcommand{\footnotesize}{\fontsize\@ixpt{11}\selectfont \abovedisplayskip 8\p@ plus2\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus\p@ @@ -91,7 +91,7 @@ \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ \let\@listi\@listI} -\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont% +\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -101,7 +101,7 @@ \itemsep \parsep \topsep 9\p@ plus3\p@ minus5\p@}} -\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont% +\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -171,38 +171,31 @@ \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\def\@makechapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \ifnum - \c@secnumdepth >\m@ne - \par\nobreak - \vskip 10\p@ - \fi - \Large \ChapFont \thechapter{} \space #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makechapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \ifnum + \c@secnumdepth >\m@ne + \par\nobreak + \vskip 10\p@ + \fi + \Large \ChapFont \thechapter{} \space #1\par + \nobreak + \vskip 20\p@}} -\def\@makeschapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \Large \ChapFont #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makeschapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \Large \ChapFont #1\par + \nobreak + \vskip 20\p@}} \def\chapter{% - \clearpage - \thispagestyle{plain} - \global\@topnum\z@ - \@afterindentfalse - \secdef\@chapter\@schapter - } + \clearpage + \thispagestyle{plain} + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth @@ -211,7 +204,7 @@ \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}{\protect \numberline{\thechapter}\bfseries #1} - \else% + \else \addcontentsline{toc}{chapter}{\bfseries #1} \fi \chaptermark{#1}% @@ -227,28 +220,24 @@ \fi } - -\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus - -.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}} -\def\subsection{\@startsection{subsection}{2}{\z@}{-3.25ex plus-1ex - minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize\bfseries}} -\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{-3.25ex plus - -1ex minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize}} -\def\paragraph{\@startsection - {paragraph}{4}{\z@}{3.25ex plus1ex minus.2ex}{-1em}{\reset@font - \normalsize\bfseries}} -\def\subparagraph{\@startsection - {subparagraph}{4}{\parindent}{3.25ex plus1ex minus - .2ex}{-1em}{\reset@font\normalsize\bfseries}} +\def\section{\@startsection{section}{1}{\z@}{% + -3.5ex plus-1ex minus-.2ex}{2.3ex plus.2ex}{% + \reset@font\large\bfseries}} +\def\subsection{\@startsection{subsection}{2}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize\bfseries}} +\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize}} +\def\paragraph{\@startsection{paragraph}{4}{\z@}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} +\def\subparagraph{\@startsection{subparagraph}{4}{\parindent}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} \setcounter{secnumdepth}{2} -\def\appendix{\par - \setcounter{chapter}{0}% - \setcounter{section}{0}% - \def\@chapapp{\appendixname}% - \def\thechapter{\Alph{chapter}}} - \leftmargini 2.5em \leftmarginii 2.2em % > \labelsep + width of '(m)' \leftmarginiii 1.87em % > \labelsep + width of 'vii.' @@ -268,25 +257,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 4.5\p@ plus2\p@ minus\p@ - \parsep 2\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 4.5\p@ plus2\p@ minus\p@ + \parsep 2\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep \p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep \p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} \endinput %% %% End of file `fithesis-11.clo'. diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo index d823f3c7d51..93cc72987d3 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2016/01/07] \def\thesis@titlePage@normalsize{\fontsize\@xiipt{14.5}% \selectfont\abovedisplayskip 12\p@ plus3\p@ minus7\p@ @@ -58,7 +58,7 @@ \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ \let\@listi\@listI} -\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont% +\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -68,7 +68,7 @@ \itemsep \parsep \topsep 9\p@ plus3\p@ minus5\p@}} -\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont% +\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -148,38 +148,31 @@ \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\def\@makechapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \ifnum - \c@secnumdepth >\m@ne - \par\nobreak - \vskip 10\p@ - \fi - \Large \ChapFont \thechapter{} \space #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makechapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \ifnum + \c@secnumdepth >\m@ne + \par\nobreak + \vskip 10\p@ + \fi + \Large \ChapFont \thechapter{} \space #1\par + \nobreak + \vskip 20\p@}} -\def\@makeschapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \Large \ChapFont #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makeschapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \Large \ChapFont #1\par + \nobreak + \vskip 20\p@}} \def\chapter{% - \clearpage - \thispagestyle{plain} - \global\@topnum\z@ - \@afterindentfalse - \secdef\@chapter\@schapter - } + \clearpage + \thispagestyle{plain} + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth @@ -188,7 +181,7 @@ \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}{\protect \numberline{\thechapter}\bfseries #1} - \else% + \else \addcontentsline{toc}{chapter}{\bfseries #1} \fi \chaptermark{#1}% @@ -204,28 +197,24 @@ \fi } - -\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus - -.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}} -\def\subsection{\@startsection{subsection}{2}{\z@}{-3.25ex plus-1ex - minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize\bfseries}} -\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{-3.25ex plus - -1ex minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize}} -\def\paragraph{\@startsection - {paragraph}{4}{\z@}{3.25ex plus1ex minus.2ex}{-1em}{\reset@font - \normalsize\bfseries}} -\def\subparagraph{\@startsection - {subparagraph}{4}{\parindent}{3.25ex plus1ex minus - .2ex}{-1em}{\reset@font\normalsize\bfseries}} +\def\section{\@startsection{section}{1}{\z@}{% + -3.5ex plus-1ex minus-.2ex}{2.3ex plus.2ex}{% + \reset@font\large\bfseries}} +\def\subsection{\@startsection{subsection}{2}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize\bfseries}} +\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize}} +\def\paragraph{\@startsection{paragraph}{4}{\z@}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} +\def\subparagraph{\@startsection{subparagraph}{4}{\parindent}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} \setcounter{secnumdepth}{2} -\def\appendix{\par - \setcounter{chapter}{0}% - \setcounter{section}{0}% - \def\@chapapp{\appendixname}% - \def\thechapter{\Alph{chapter}}} - \leftmargini 2.5em \leftmarginii 2.2em % > \labelsep + width of '(m)' \leftmarginiii 1.87em % > \labelsep + width of 'vii.' @@ -245,25 +234,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 5\p@ plus2.5\p@ minus\p@ - \parsep 2.5\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 5\p@ plus2.5\p@ minus\p@ + \parsep 2.5\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2.5\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep \p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2.5\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep \p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} \endinput %% %% End of file `fithesis-12.clo'. 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 98cde9e2b5c..87f2473b9b8 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}[2015/12/09] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/01/07] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -158,9 +158,7 @@ \fi \fi \thesis@require{hyperref} -\hypersetup{ - pdfborderstyle={/S/U/W 1}, % Less obtrusive borders - plainpages=false} % Multiple page numbering support +\hypersetup{pdfborderstyle={/S/U/W 1}} % Less obtrusive borders \widowpenalty 10000 \clubpenalty 10000 \def\thesis@color@setup#1{% @@ -183,23 +181,23 @@ \setcounter{page}{1} \pagenumbering{roman}} \def\thesis@blocks@clear{% - \ifthesis@twoside@% - \clearpage% + \ifthesis@twoside@ + \clearpage \thispagestyle{empty}% - \cleardoublepage% - \else% - \newpage% + \cleardoublepage + \else + \newpage \fi} \def\thesis@blocks@clearRight{% - \ifthesis@twoside@% - \clearpage% + \ifthesis@twoside@ + \clearpage \ifodd\value{page}% \thispagestyle{empty}% \hbox{}% - \newpage% - \fi% - \else% - \newpage% + \newpage + \fi + \else + \newpage \fi} \newcommand{\thesis@blocks@facultyLogo@monochrome}[1]% [width=40mm]{{% @@ -207,7 +205,7 @@ \includegraphics[#1]{\@path}}} \newcommand{\thesis@blocks@facultyLogo@color}[1]% [width=40mm]{{% - \edef\@path{\thesis@logopath\thesis@facultyLogo% + \edef\@path{\thesis@logopath\thesis@facultyLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} \newcommand{\thesis@blocks@universityLogo@monochrome}[1]% @@ -216,22 +214,22 @@ \includegraphics[#1]{\@path}}} \newcommand{\thesis@blocks@universityLogo@color}[1]% [width=40mm]{{% - \edef\@path{\thesis@logopath\thesis@universityLogo% + \edef\@path{\thesis@logopath\thesis@universityLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} \def\thesis@blocks@cover{% - \ifthesis@cover@% - \thesis@blocks@clear% + \ifthesis@cover@ + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \begin{center}% - \thesis@blocks@cover@header% + \thesis@blocks@cover@header \thesis@blocks@facultyLogo@monochrome\\[0.4in]% - \let\footnotesize\small% + \let\footnotesize\small \let\footnoterule\relax{}% - \thesis@blocks@cover@content% - \par\vfill% - \thesis@blocks@cover@footer% + \thesis@blocks@cover@content + \par\vfill + \thesis@blocks@cover@footer \end{center}% \end{alwayssingle}% \fi} @@ -245,14 +243,14 @@ \thesis@blocks@cover@field@false \def\thesis@blocks@cover@header{% - {\sc\ifthesis@blocks@cover@university@% + {\sc\ifthesis@blocks@cover@university@ \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@cover@faculty@% + \fi\ifthesis@blocks@cover@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@cover@department@% + \fi\ifthesis@blocks@cover@department@ \thesis@titlePage@large\thesis@department\\% \fi} - \ifthesis@blocks@cover@field@% + \ifthesis@blocks@cover@field@ {\thesis@titlePage@large\vskip 1em% {\bf\thesis@@{fieldTitle}:} \thesis@field}% \fi\vskip 2em} @@ -264,17 +262,17 @@ \def\thesis@blocks@cover@footer{% {\thesis@titlePage@large\thesis@place, \thesis@@{semester}}} \def\thesis@blocks@titlePage{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \begin{center}% - \thesis@blocks@titlePage@header% + \thesis@blocks@titlePage@header \thesis@blocks@facultyLogo@color\\[0.4in]% - \let\footnotesize\small% + \let\footnotesize\small \let\footnoterule\relax{}% - \thesis@blocks@titlePage@content% - \par\vfill% - \thesis@blocks@titlePage@footer% + \thesis@blocks@titlePage@content + \par\vfill + \thesis@blocks@titlePage@footer \end{center}% \end{alwayssingle}} \newif\ifthesis@blocks@titlePage@university@ @@ -287,38 +285,38 @@ \thesis@blocks@titlePage@field@false \def\thesis@blocks@titlePage@header{% - {\sc\ifthesis@blocks@titlePage@university@% + {\sc\ifthesis@blocks@titlePage@university@ \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@titlePage@faculty@% + \fi\ifthesis@blocks@titlePage@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@titlePage@department@% + \fi\ifthesis@blocks@titlePage@department@ \thesis@titlePage@large\thesis@department\\% \fi} - \ifthesis@blocks@titlePage@field@% + \ifthesis@blocks@titlePage@field@ {\thesis@titlePage@large\vskip 1em% {\bf\thesis@@{fieldTitle}:} \thesis@field}% \fi\vskip 2em} \let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content \let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer \def\thesis@blocks@tables{% - \thesis@blocks@clear% - \tableofcontents% - \thesis@blocks@lot% + \thesis@blocks@clear + \tableofcontents + \thesis@blocks@lot \thesis@blocks@lof} \def\thesis@blocks@declaration{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\thesis@@{declarationTitle}}% - \thesis@declaration% + \thesis@declaration \vskip 2cm% - \hfill\thesis@author% + \hfill\thesis@author \end{alwayssingle}} \def\thesis@blocks@thanks{% - \ifx\thesis@thanks\undefined\else% - \thesis@blocks@clear% + \ifx\thesis@thanks\undefined\else + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\vspace*{\fill}\thesis@@{thanksTitle}}% - \thesis@thanks% + \thesis@thanks \end{alwayssingle}% \fi} \def\thesis@blocks@abstract{% @@ -326,18 +324,18 @@ % Start the new chapter without clearing the right page {\def\cleardoublepage{} \chapter*{\thesis@@{abstractTitle}}}% - \noindent\thesis@abstract% - \par\vfil\null% + \noindent\thesis@abstract + \par\vfil\null \end{alwayssingle}} \def\thesis@blocks@abstractEn{% - \ifthesis@english\else% + \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}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}}% \fi} \def\thesis@blocks@keywords{% @@ -346,46 +344,46 @@ {\def\cleardoublepage{}% \chapter*{\thesis@@{keywordsTitle}}% \noindent\thesis@TeXkeywords}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}} \def\thesis@blocks@keywordsEn{% - \ifthesis@english\else% + \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}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}}% \fi} \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true \def\thesis@blocks@assignment{% - \ifthesis@blocks@assignment@% - \ifx\thesis@assignmentFiles\undefined% + \ifthesis@blocks@assignment@ + \ifx\thesis@assignmentFiles\undefined % Typeset a placeholder page. - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}% \noindent\textit{\thesis@@{assignment}}% \end{alwayssingle}% - \else% + \else {\edef\@pdfList{\thesis@assignmentFiles}% \ifx\@pdfList\empty\else \let\ea\expandafter % Inject the specified PDF documents. \def\@inject##1,{\thesis@blocks@clear \def\@args{##1}\def\@relax{\relax}% - \ifx\@args\@relax\else% + \ifx\@args\@relax\else % Trim leading spaces. \edef\@trimmed{\romannumeral-`\.##1}% \includepdf[pages=-]\@trimmed \ea\@inject\fi}% \ea\@inject\@pdfList,\relax,% \fi}% - \fi% + \fi \fi} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear @@ -398,56 +396,53 @@ \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax \def\ps@thesisheadings{% -\def\chaptermark##1{% -\markright{% -\ifnum\c@secnumdepth >\m@ne -\thechapter.\ % -\fi ##1}} -\let\@oddfoot\@empty -\let\@oddhead\@empty -\def\@oddhead{\vbox{\hbox to \textwidth{% -\hfil{\sc\rightmark}}\vskip 4pt\hrule}} -\if@twoside - \def\@evenhead{\vbox{\hbox to \textwidth{% - {\sc\rightmark}\hfil}\vskip 4pt\hrule}} -\else - \let\@evenhead\@oddhead -\fi -\def\@oddfoot{\hfil\PageFont\thepage} -\if@twoside - \def\@evenfoot{\PageFont\thepage\hfil}% -\else - \let\@evenfoot\@oddfoot -\fi -\let\@mkboth\markboth -} + \def\chaptermark##1{% + \markright{% + \ifnum\c@secnumdepth >\m@ne + \thechapter.\ % + \fi ##1}} + \let\@oddfoot\@empty + \let\@oddhead\@empty + \def\@oddhead{% + \vbox{% + \hbox to \textwidth{% + \hfil{\sc\rightmark}}% + \vskip 4pt\hrule}} + \if@twoside + \def\@evenhead{% + \vbox{% + \hbox to \textwidth{% + {\sc\rightmark}% + \hfil} + \vskip 4pt\hrule}} + \else + \let\@evenhead\@oddhead + \fi + \def\@oddfoot{\hfil\PageFont\thepage} + \if@twoside + \def\@evenfoot{\PageFont\thepage\hfil}% + \else + \let\@evenfoot\@oddfoot + \fi + \let\@mkboth\markboth} \renewcommand*\chapter{% -\if@twoside - \clearpage - \thispagestyle{empty} - \cleardoublepage -\else - \clearpage -\fi -\thispagestyle{plain}% -\global\@topnum\z@ -\@afterindentfalse -\secdef\@chapter\@schapter} + \thesis@blocks@clear + \thispagestyle{plain}% + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \renewcommand*\part{% -\clearpage -\thispagestyle{empty} -\cleardoublepage -\thispagestyle{empty}% -\if@twocolumn% - \onecolumn - \@tempswatrue -\else - \@tempswafalse -\fi -\hbox{}\vfil -\secdef\@part\@spart} + \thesis@blocks@clear + \if@twocolumn + \onecolumn + \@tempswatrue + \else + \@tempswafalse + \fi + \hbox{}\vfil + \secdef\@part\@spart} \newif\if@restonecol \def\alwayssingle{% 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 61d48b97494..392791a809a 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 @@ -115,11 +115,11 @@ \pagestyle{thesisheadings} \parindent 1.5em\relax} \def\thesis@blocks@toc{% - \thesis@blocks@clear% + \thesis@blocks@clear \tableofcontents} \def\thesis@blocks@tables{% - \thesis@blocks@clear% - \thesis@blocks@lot% + \thesis@blocks@clear + \thesis@blocks@lot \thesis@blocks@lof} \ifx\thesis@blocks@lot\empty\else \def\thesis@blocks@lot{% diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty index 4ca4ec95d38..a94e842c7b7 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2016/01/07] \thesis@color@setup{ links={HTML}{FFD451}, tableEmph={HTML}{FFD451}, @@ -66,7 +66,7 @@ {\thesis@titlePage@Large\bf\thesis@author} % If this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous {\thesis@titlePage@large\\[0.3in] {\bf\thesis@@{advisorTitle}:} \thesis@advisor} \fi}% @@ -74,7 +74,7 @@ {\thesis@titlePage@large\thesis@place, \thesis@@{semester} % If this is a rigorous thesis, create space for the advisor's % signature - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous \let\@A\relax\newlength{\@A} \settowidth{\@A}{\thesis@@{advisorSignature}} \setlength{\@A}{\@A+1cm} @@ -85,15 +85,15 @@ }} \fi}} \def\thesis@blocks@declaration{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\thesis@@{declarationTitle}}% - \thesis@declaration% + \thesis@declaration \vskip 2cm% - \hfill\thesis@author% - \par\vfill\noindent% - \textbf{\thesis@@{advisorTitle}:} \thesis@advisor% - \par\vfil% + \hfill\thesis@author + \par\vfill\noindent + \textbf{\thesis@@{advisorTitle}:} \thesis@advisor + \par\vfil \end{alwayssingle}} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter 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 0e5ee0c73ce..da898d86a11 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}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/01/12] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -80,11 +80,11 @@ % 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% + \ifx\thesis@type\thesis@rigorous \setlength{\@E}{0pt}% - \else% + \else \settowidth{\@E}{{\bf\thesis@czech@bib@advisor:}} - \fi% + \fi \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% \bf\thesis@czech@bib@academicYear:}} \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% @@ -115,7 +115,7 @@ & \thesis@field \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% + \ifx\thesis@type\thesis@rigorous\else \textbf{\thesis@czech@bib@advisor:} & \thesis@advisor \\ \fi @@ -145,11 +145,11 @@ % 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% + \ifx\thesis@type\thesis@rigorous \setlength{\@E}{0pt}% - \else% + \else \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} - \fi% + \fi \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% \bf\thesis@english@bib@academicYear:}} \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% @@ -180,7 +180,7 @@ & \thesis@fieldEn \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% + \ifx\thesis@type\thesis@rigorous\else \textbf{\thesis@english@bib@advisor:} & \thesis@advisor \\ \fi @@ -243,14 +243,29 @@ {\bf\thesis@titlePage@LARGE\thesis@author\\} \vfill\noindent % The bottom of the page - {\bf\thesis@titlePage@normalsize% + {\bf\thesis@titlePage@normalsize % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% - \thesis@czech@advisorTitle: \thesis@advisor\hfill% - \fi% + \ifx\thesis@type\thesis@rigorous\else + \thesis@czech@advisorTitle: \thesis@advisor\hfill + \fi \thesis@place\ \thesis@year} \end{alwayssingle}} +\def\thesis@blocks@declaration{% + \thesis@blocks@clear + \begin{alwayssingle}% + \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 + \begin{minipage}[t]{\@A}% + \centering\rule{\@A}{1pt}\\ + \thesis@@{authorSignature}\par + \end{minipage}} + \end{alwayssingle}} \def\thesis@blocks@preamble{{% \thesis@selectLocale{czech}% \thesis@blocks@coverMatter -- cgit v1.2.3