From 090b5d243358cf8b008c9e0f528d2a09c040e828 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 May 2017 21:44:24 +0000 Subject: fithesis (18may17) git-svn-id: svn://tug.org/texlive/trunk@44411 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fithesis/fithesis.pdf | Bin 630729 -> 648174 bytes .../doc/latex/fithesis/guide/mu/econ.pdf | Bin 369275 -> 369275 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf | Bin 374969 -> 374953 bytes .../doc/latex/fithesis/guide/mu/fsps.pdf | Bin 367464 -> 367735 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf | Bin 370148 -> 370148 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/law.pdf | Bin 377472 -> 377472 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/med.pdf | Bin 366997 -> 366997 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf | Bin 369284 -> 369283 bytes .../doc/latex/fithesis/guide/mu/phil.pdf | Bin 367882 -> 367882 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf | Bin 406317 -> 406317 bytes .../texmf-dist/source/latex/fithesis/fithesis.dtx | 23 +- .../source/latex/fithesis/locale/czech.dtx | 96 +-- .../source/latex/fithesis/locale/english.dtx | 35 +- .../source/latex/fithesis/locale/slovak.dtx | 46 +- .../source/latex/fithesis/style/mu/fsps.dtx | 128 +++- .../source/latex/fithesis/style/mu/sci.dtx | 3 +- Master/texmf-dist/tex/latex/fithesis/fithesis3.cls | 2 +- .../tex/latex/fithesis/locale/fithesis-czech.def | 35 +- .../tex/latex/fithesis/locale/fithesis-english.def | 35 +- .../tex/latex/fithesis/locale/fithesis-slovak.def | 35 +- .../latex/fithesis/locale/mu/fi/fithesis-czech.def | 2 +- .../latex/fithesis/locale/mu/fithesis-czech.def | 4 +- .../fithesis/locale/mu/fsps/fithesis-czech.def | 6 +- .../fithesis/locale/mu/fsps/fithesis-slovak.def | 7 +- .../fithesis/locale/mu/fss/fithesis-czech.def | 4 +- .../fithesis/locale/mu/fss/fithesis-slovak.def | 2 +- .../fithesis/locale/mu/phil/fithesis-czech.def | 8 +- .../fithesis/locale/mu/phil/fithesis-slovak.def | 2 +- .../fithesis/locale/mu/sci/fithesis-czech.def | 36 +- .../latex/fithesis/logo/mu/fithesis-base-color.pdf | Bin 15158 -> 15158 bytes .../tex/latex/fithesis/logo/mu/fithesis-base.pdf | Bin 15988 -> 15988 bytes .../latex/fithesis/logo/mu/fithesis-econ-color.pdf | Bin 12402 -> 12402 bytes .../tex/latex/fithesis/logo/mu/fithesis-econ.pdf | Bin 12932 -> 12932 bytes .../latex/fithesis/logo/mu/fithesis-fi-color.eps | 816 ++++++++++----------- .../latex/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11813 -> 11804 bytes .../tex/latex/fithesis/logo/mu/fithesis-fi.pdf | Bin 11626 -> 11626 bytes .../latex/fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 11296 -> 11296 bytes .../tex/latex/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11730 -> 11730 bytes .../latex/fithesis/logo/mu/fithesis-fss-color.pdf | Bin 10854 -> 10854 bytes .../tex/latex/fithesis/logo/mu/fithesis-fss.pdf | Bin 11590 -> 11590 bytes .../latex/fithesis/logo/mu/fithesis-law-color.pdf | Bin 17676 -> 17676 bytes .../tex/latex/fithesis/logo/mu/fithesis-law.pdf | Bin 18435 -> 18435 bytes .../latex/fithesis/logo/mu/fithesis-med-color.pdf | Bin 10052 -> 10052 bytes .../tex/latex/fithesis/logo/mu/fithesis-med.pdf | Bin 10590 -> 10590 bytes .../latex/fithesis/logo/mu/fithesis-ped-color.pdf | Bin 9997 -> 9997 bytes .../tex/latex/fithesis/logo/mu/fithesis-ped.pdf | Bin 10492 -> 10492 bytes .../latex/fithesis/logo/mu/fithesis-phil-color.pdf | Bin 11692 -> 11692 bytes .../tex/latex/fithesis/logo/mu/fithesis-phil.pdf | Bin 12180 -> 12180 bytes .../latex/fithesis/logo/mu/fithesis-sci-color.pdf | Bin 24425 -> 24425 bytes .../tex/latex/fithesis/logo/mu/fithesis-sci.pdf | Bin 25494 -> 25494 bytes .../tex/latex/fithesis/style/mu/fithesis-fsps.sty | 67 +- 51 files changed, 867 insertions(+), 525 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf index 02616e3624e..936471ec37d 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf and b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf index 9dc4c0dc614..1d19322e45a 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf index f74dae25613..454bec04c8f 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf index e3dfc4484a9..677d80e23e6 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf index c59b34d3fab..1a7b04b0bf1 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf index a0924f5b139..6837fdaa72e 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf index 3947e64a5fd..ee271dfb81f 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf index 089d680197f..8839be7178b 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf index f6347e5e8e0..ffb7862368d 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf index 8c459438285..cbb8d95e5b0 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf differ diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index acdc6e95b94..6cd07cfd184 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,11 +56,32 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.43}{2017/05/07}} +\thesis@versiondef{v0.3.44}{2017/05/18}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.44} {2017/05/18}{Fixed the color in the logo of FI +% MU. [VN]} +% \changes{v0.3.44} {2017/05/18}{The captions in the examples for +% MU are now above tables. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% uses a 14 cm wide type area. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% uses 1.5 spacing outside bibliography. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% uses different title page layout. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% uses different declaration text. [VN]} +% \changes{v0.3.44} {2017/05/18}{Fixed wrong / missing +% non-breaking spaces in Czech / Slovak localization. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% includes place, date, and signature field next to the +% declaration. [VN]} +% \changes{v0.3.44} {2017/05/18}{Added an additional hyphenation +% hint to the example document. [VN]} +% \changes{v0.3.44} {2017/05/18}{The style file for FSpS, MU now +% complies with updated requirements. [VN]} % \changes{v0.3.43} {2017/05/07}{Added a mention about the thesis % proposal thesis type to the user guide for the Faculty of % Informatics at the Masaryk University, Brno and fixed a bad diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 5bb0313d706..7b27eaf0a5d 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -2,7 +2,7 @@ % This is the base file of the Czech locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/05/25] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2017/05/15] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -40,8 +40,41 @@ \gdef\thesis@czech@fall{podzim} \gdef\thesis@czech@semester{% \thesis@{czech@\thesis@season} \thesis@seasonYear} +\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}} % Různé +\gdef\thesis@czech@authorSignature{Podpis autora} \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} @@ -110,9 +143,9 @@ \gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} zpracoval% - \thesis@czech@gender@koncovka\ samostatně a + \thesis@czech@gender@koncovka\ samostatně a~% použil\thesis@czech@gender@koncovka\ jen prameny - uvedené~v seznamu literatury.} + uvedené v~seznamu literatury.} % Bibliografický záznam \gdef\thesis@czech@bib@title{Bibliografický záznam} @@ -153,10 +186,14 @@ % \iffalse %<*mu/fsps> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fsps/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fsps/fithesis-czech.def}[2017/05/15] % Zástupné texty \gdef\thesis@czech@facultyName{Fakulta sportovních studií} +\gdef\thesis@czech@declaration{Prohlašuji, že jsem + \thesis@lower{czech@typeName@akuzativ} vypracoval% + \thesis@czech@gender@koncovka\ samostatně a~na základě + literatury a~pramenů uvedených v~použitých zdrojích.} % Různé \gdef\thesis@czech@fieldTitle{Specializace} @@ -180,8 +217,8 @@ zadání práce, prohlášení autora školního díla nebo obojí. \else Místo tohoto listu vložte kopie oficiálního podepsaného zadání - práce nebo prohlášení autora školního díla nebo obojí~v - závislosti na požadavcích příslušné katedry. + práce nebo prohlášení autora školního díla nebo obojí + v~závislosti na požadavcích příslušné katedry. \fi} % \end{macrocode}\iffalse @@ -248,7 +285,7 @@ Prohlašuji, že tato \thesis@lower{czech@typeName} je mým původním autorským dílem, které jsem vypracoval% \thesis@czech@gender@koncovka\ samostatně. Všechny zdroje, - prameny a literaturu, které jsem při vypracování + prameny a~literaturu, které jsem při vypracování používal\thesis@czech@gender@koncovka\ nebo z~nich čerpal\thesis@czech@gender@koncovka, v~práci řádně cituji s~uvedením úplného odkazu na příslušný zdroj.} @@ -287,14 +324,14 @@ \gdef\thesis@czech@declaration{% \ifx\thesis@department\thesis@departments@kisk Prohlašuji, že jsem předkládanou práci zpracoval% - \thesis@czech@gender@koncovka\ samostatně~a použil% - \thesis@czech@gender@koncovka\ jen uvedené prameny~a - literaturu. Současně dávám svolení k tomu, aby elektronická + \thesis@czech@gender@koncovka\ samostatně a~použil% + \thesis@czech@gender@koncovka\ jen uvedené prameny a~% + literaturu. Současně dávám svolení k~tomu, aby elektronická verze této práce byla zpřístupněna přes informační systém Masarykovy univerzity.% \else Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} - vypracoval\thesis@czech@gender@koncovka\ samostatně~s využitím + vypracoval\thesis@czech@gender@koncovka\ samostatně s~využitím uvedené literatury.% \fi} @@ -353,7 +390,7 @@ % \iffalse %<*mu/sci> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/03/23] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15] % Zástupné texty \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -365,41 +402,6 @@ 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} - -% Časové údaje -\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}} % Bibliografický záznam \global\let\thesis@czech@bib@author\thesis@czech@authorTitle diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 29e5cc1226f..860080d534e 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -2,7 +2,7 @@ % This is the base file of the English locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/05/25] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2017/05/15] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -29,8 +29,41 @@ \gdef\thesis@english@fall{Fall} \gdef\thesis@english@semester{% \thesis@{english@\thesis@season} \thesis@seasonYear} +\gdef\thesis@english@formattedDate{{% + \thesis@day. + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month=1% + January + \else\ifnum\@month=2% + February + \else\ifnum\@month=3% + March + \else\ifnum\@month=4% + April + \else\ifnum\@month=5% + May + \else\ifnum\@month=6% + June + \else\ifnum\@month=7% + July + \else\ifnum\@month=8% + August + \else\ifnum\@month=9% + September + \else\ifnum\@month=10% + October + \else\ifnum\@month=11% + November + \else\ifnum\@month=12% + December + \else + <> + \fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi + \thesis@year}} % Miscellaneous +\gdef\thesis@english@authorSignature{Author's signature} \gdef\thesis@english@fieldTitle{Field of study} \gdef\thesis@english@advisorTitle{Advisor} \gdef\thesis@english@authorTitle{Author} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 6107a023b72..e23ab05aa7c 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -2,7 +2,7 @@ % This is the base file of the Slovak locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/05/25] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2017/05/15] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -40,8 +40,41 @@ \gdef\thesis@slovak@fall{jeseň} \gdef\thesis@slovak@semester{% \thesis@{slovak@\thesis@season} \thesis@seasonYear} +\gdef\thesis@slovak@formattedDate{{% + \thesis@day. + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month=1% + januára + \else\ifnum\@month=2% + februára + \else\ifnum\@month=3% + marca + \else\ifnum\@month=4% + apríla + \else\ifnum\@month=5% + mája + \else\ifnum\@month=6% + júna + \else\ifnum\@month=7% + júla + \else\ifnum\@month=8% + augusta + \else\ifnum\@month=9% + septembra + \else\ifnum\@month=10% + októbra + \else\ifnum\@month=11% + novembra + \else\ifnum\@month=12% + decembra + \else + <> + \fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi + \thesis@year}} % Rôzne +\gdef\thesis@slovak@authorSignature{Podpis autora} \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} @@ -153,10 +186,15 @@ % \iffalse %<*mu/fsps> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fsps/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fsps/fithesis-slovak.def}[2017/05/15] % Zástupné texty \gdef\thesis@slovak@facultyName{Fakulta športových štúdií} +\gdef\thesis@slovak@declaration{% + Vyhlasujem, že som \thesis@lower{% + slovak@typeName@akuzativ} vypracoval% + \thesis@slovak@gender@koncovka\ samostatne a~na základe + literatúry a~prameňov uvedených v~použitých zdrojoch.} % Rôzne \gdef\thesis@slovak@fieldTitle{Špecializácie} @@ -182,7 +220,7 @@ \else Namiesto tejto stránky vložte kópiu oficiálneho podpísaného zadania práce alebo vyhlásenie autora školského diela alebo - obidve~v závislosti na požiadavkách príslušnej katedry. + obidve v~závislosti na požiadavkách príslušnej katedry. \fi} % \end{macrocode}\iffalse % @@ -292,7 +330,7 @@ Vyhlasujem, že som predkladanú prácu spracoval% \thesis@slovak@gender@koncovka\ samostatne~a použil% \thesis@slovak@gender@koncovka\ len uvedené pramene~a - literatúru. Súčasne dávam súhlas k tomu, aby elektronická + literatúru. Súčasne dávam súhlas k~tomu, aby elektronická verzia tejto práce bola sprístupnená cez informačný systém Masarykovej univerzity.% \else diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx index 3f5781f3df0..2c116f72556 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx @@ -2,11 +2,11 @@ % This is the style file for the theses written at the Faculty of % Sports Studies at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at -% the website of the faculty\footnote{See \url{http://www.fsps.^^A -% muni.cz/~korvas/pokyny_k_zaverecne_praci.doc}}. +% the website of the faculty\footnote{See \url{https://is.muni.cz/^^A +% auth/do/fsps/studijni/info-stud/SZZ/pokyny_ZP_13-5-2013.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/15] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -26,11 +26,127 @@ sorting=nty} \thesis@bibliography@load % \end{macrocode} -% The style file configures the title page header to include the -% field name. +% The file loads the following packages: +% \begin{itemize} +% \item\textsf{tikz} -- Used for dimension arithmetic. +% \item\textsf{geometry} -- Allows for modifications of the type +% area dimensions. +% \item\textsf{setspace} -- Allows for line height modifications. +% \end{itemize} +% In addition to this, the type area width is set to +% 14\,cm in accordance with the formal requirements of the faculty. % \begin{macrocode} -\thesis@blocks@titlePage@field@true +\thesis@require{tikz} +\thesis@require{geometry} +\thesis@require{setspace} +\geometry{top=30mm,bottom=30mm,left=40mm,right=30mm,includeheadfoot} % \end{macrocode} +% The paragraph indentation is 1.25\,cm as per the requirements of the faculty. +% \begin{macrocode} +\setlength{\parindent}{1.25cm} +% \end{macrocode} +% The style file redefines the title page content +% not to include the author's name and the title page footer +% to include both the author's and advisor's name, the year and +% place of the thesis defense in accordance with the formal +% requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@titlePage@footer{% + {\thesis@titlePage@large + {% Calculate the width of the thesis author and advisor boxes + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@@{advisorTitle}:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{\thesis@advisor} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@@{authorTitle}:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} + \let\@E\relax\newlength{\@E}\settowidth{\@E}{\thesis@field} + \let\@F\relax\newlength{\@F}\pgfmathsetlength{\@F}{max(\@D,\@E)} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B)} + \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% + max(\@C,\@F)} + % Typeset the thesis author and advisor boxes + \vskip 2in\begin{minipage}[t]{\@left} + {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor + \end{minipage}\hfill\begin{minipage}[t]{\@right} + {\bf\thesis@@{authorTitle}:}\\\thesis@author\\\thesis@field + \end{minipage}}\\[4em]\thesis@place, \thesis@year}} +% \end{macrocode} +% \begin{macro}{\thesis@blocks@frontMatter} +% The |\thesis@blocks@frontMatter| macro sets up the style of the +% front matter of the thesis. The leading is adjusted in +% accordance with the requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@frontMatter{% + \thesis@blocks@clear + \pagestyle{plain} + \parindent 1.5em + \setcounter{page}{1} + \pagenumbering{roman} + \onehalfspacing} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@mainMatter} +% The |\thesis@blocks@mainMatter| macro sets up the style +% of the main matter of the thesis. The leading is adjusted in +% accordance with the requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@mainMatter{% + \thesis@blocks@clear + \setcounter{page}{1} + \pagenumbering{arabic} + \pagestyle{thesisheadings} + \parindent 1.5em + \onehalfspacing} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@bibliography} +% The |\thesis@blocks@bibliography| macro typesets the +% bibliography. The leading is adjusted in accordance +% with the requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@bibliography{% + \ifthesis@bibliography@loaded@ + \ifthesis@bibliography@included@\else + \singlespacing + \thesis@blocks@clear + {\emergencystretch=3em% + \printbibliography[heading=bibintoc]}% + \fi + \fi} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@declaration} +% The |\thesis@blocks@declaration| macro typesets the declaration +% text. Unlike the generic |\thesis@blocks@declaration| macro from +% the \texttt{style/mu/fithesis-sci.sty} file, this definition +% includes the date and a blank line for the author's signature, as +% per the requirements of the faculty. +% +% Along with the macros required by the locale file interface, the +% locale files need to define the following macros: +% \begin{itemize} +% \item|\thesis@|\textit{locale}|@authorSignature| -- The +% label of the author's signature field +% \item|\thesis@|\textit{locale}|@formattedDate| -- A +% formatted date +% \end{itemize} +% \begin{macrocode} +\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@@{formattedDate}\hfill + \begin{minipage}[t]{\@A}% + \centering\rule{\@A}{1pt}\\ + \thesis@@{authorSignature}\par + \end{minipage}} + \end{alwayssingle}} +% \end{macrocode} +% \end{macro} % Note that there is no direct support for the seminar paper and % thesis proposal types. If you would like to change the contents % of the preamble and the postamble, you should modify the diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx index 2ecd4da33ce..1b79501dee8 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -341,9 +341,10 @@ % Along with the macros required by the locale file interface, the % locale files need to define the following macros: % \begin{itemize} -% \item\DescribeMacro{\thesis@czech@bib@title} +% \item\DescribeMacro{\thesis@czech@authorSignature} % |\thesis@czech@authorSignature| -- The label of the author's % signature field +% \item\DescribeMacro{\thesis@czech@formattedDate} % |\thesis@czech@formattedDate| -- A formatted date % \end{itemize} % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 391d17979ab..bab6089754b 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.43}{2017/05/07}} +\thesis@versiondef{v0.3.44}{2017/05/18}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] 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 05922c32bde..bd60528a431 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/05/25] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2017/05/15] \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} @@ -72,7 +72,40 @@ \gdef\thesis@czech@fall{podzim} \gdef\thesis@czech@semester{% \thesis@{czech@\thesis@season} \thesis@seasonYear} +\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@authorSignature{Podpis autora} \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} 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 3496db41602..7d4ec0c679c 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}[2016/05/25] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2017/05/15] \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} @@ -69,7 +69,40 @@ \gdef\thesis@english@fall{Fall} \gdef\thesis@english@semester{% \thesis@{english@\thesis@season} \thesis@seasonYear} +\gdef\thesis@english@formattedDate{{% + \thesis@day. + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month=1% + January + \else\ifnum\@month=2% + February + \else\ifnum\@month=3% + March + \else\ifnum\@month=4% + April + \else\ifnum\@month=5% + May + \else\ifnum\@month=6% + June + \else\ifnum\@month=7% + July + \else\ifnum\@month=8% + August + \else\ifnum\@month=9% + September + \else\ifnum\@month=10% + October + \else\ifnum\@month=11% + November + \else\ifnum\@month=12% + December + \else + <> + \fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi + \thesis@year}} +\gdef\thesis@english@authorSignature{Author's signature} \gdef\thesis@english@fieldTitle{Field of study} \gdef\thesis@english@advisorTitle{Advisor} \gdef\thesis@english@authorTitle{Author} 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 7859f10a328..2a9b4e14e85 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}[2016/05/25] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2017/05/15] \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} @@ -72,7 +72,40 @@ \gdef\thesis@slovak@fall{jeseň} \gdef\thesis@slovak@semester{% \thesis@{slovak@\thesis@season} \thesis@seasonYear} +\gdef\thesis@slovak@formattedDate{{% + \thesis@day. + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month=1% + januára + \else\ifnum\@month=2% + februára + \else\ifnum\@month=3% + marca + \else\ifnum\@month=4% + apríla + \else\ifnum\@month=5% + mája + \else\ifnum\@month=6% + júna + \else\ifnum\@month=7% + júla + \else\ifnum\@month=8% + augusta + \else\ifnum\@month=9% + septembra + \else\ifnum\@month=10% + októbra + \else\ifnum\@month=11% + novembra + \else\ifnum\@month=12% + decembra + \else + <> + \fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi + \thesis@year}} +\gdef\thesis@slovak@authorSignature{Podpis autora} \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def index 985e72c5239..60bc64fcc96 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def @@ -64,7 +64,7 @@ Prohlašuji, že tato \thesis@lower{czech@typeName} je mým původním autorským dílem, které jsem vypracoval% \thesis@czech@gender@koncovka\ samostatně. Všechny zdroje, - prameny a literaturu, které jsem při vypracování + prameny a~literaturu, které jsem při vypracování používal\thesis@czech@gender@koncovka\ nebo z~nich čerpal\thesis@czech@gender@koncovka, v~práci řádně cituji s~uvedením úplného odkazu na příslušný zdroj.} 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 b7bdc39e159..b28ec64b69a 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 @@ -54,9 +54,9 @@ \gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} zpracoval% - \thesis@czech@gender@koncovka\ samostatně a + \thesis@czech@gender@koncovka\ samostatně a~% použil\thesis@czech@gender@koncovka\ jen prameny - uvedené~v seznamu literatury.} + uvedené v~seznamu literatury.} \gdef\thesis@czech@bib@title{Bibliografický záznam} \gdef\thesis@czech@bib@pages{str} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-czech.def index d455ce2fea5..a135818821e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-czech.def @@ -49,9 +49,13 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fsps/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fsps/fithesis-czech.def}[2017/05/15] \gdef\thesis@czech@facultyName{Fakulta sportovních studií} +\gdef\thesis@czech@declaration{Prohlašuji, že jsem + \thesis@lower{czech@typeName@akuzativ} vypracoval% + \thesis@czech@gender@koncovka\ samostatně a~na základě + literatury a~pramenů uvedených v~použitých zdrojích.} \gdef\thesis@czech@fieldTitle{Specializace} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-slovak.def index da9b159f89c..017b9710d41 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-slovak.def @@ -49,9 +49,14 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fsps/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fsps/fithesis-slovak.def}[2017/05/15] \gdef\thesis@slovak@facultyName{Fakulta športových štúdií} +\gdef\thesis@slovak@declaration{% + Vyhlasujem, že som \thesis@lower{% + slovak@typeName@akuzativ} vypracoval% + \thesis@slovak@gender@koncovka\ samostatne a~na základe + literatúry a~prameňov uvedených v~použitých zdrojoch.} \gdef\thesis@slovak@fieldTitle{Špecializácie} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def index 0eb5c84f716..f46ac912e86 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def @@ -58,8 +58,8 @@ zadání práce, prohlášení autora školního díla nebo obojí. \else Místo tohoto listu vložte kopie oficiálního podepsaného zadání - práce nebo prohlášení autora školního díla nebo obojí~v - závislosti na požadavcích příslušné katedry. + práce nebo prohlášení autora školního díla nebo obojí + v~závislosti na požadavcích příslušné katedry. \fi} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def index e72374c002a..99e495d5535 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def @@ -60,7 +60,7 @@ \else Namiesto tejto stránky vložte kópiu oficiálneho podpísaného zadania práce alebo vyhlásenie autora školského diela alebo - obidve~v závislosti na požiadavkách príslušnej katedry. + obidve v~závislosti na požiadavkách príslušnej katedry. \fi} \endinput 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 94449a1c8d9..c5510db95b4 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 @@ -61,14 +61,14 @@ \gdef\thesis@czech@declaration{% \ifx\thesis@department\thesis@departments@kisk Prohlašuji, že jsem předkládanou práci zpracoval% - \thesis@czech@gender@koncovka\ samostatně~a použil% - \thesis@czech@gender@koncovka\ jen uvedené prameny~a - literaturu. Současně dávám svolení k tomu, aby elektronická + \thesis@czech@gender@koncovka\ samostatně a~použil% + \thesis@czech@gender@koncovka\ jen uvedené prameny a~% + literaturu. Současně dávám svolení k~tomu, aby elektronická verze této práce byla zpřístupněna přes informační systém Masarykovy univerzity.% \else Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} - vypracoval\thesis@czech@gender@koncovka\ samostatně~s využitím + vypracoval\thesis@czech@gender@koncovka\ samostatně s~využitím uvedené literatury.% \fi} 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 815c35d38b6..3786705fbcd 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 @@ -64,7 +64,7 @@ Vyhlasujem, že som predkladanú prácu spracoval% \thesis@slovak@gender@koncovka\ samostatne~a použil% \thesis@slovak@gender@koncovka\ len uvedené pramene~a - literatúru. Súčasne dávam súhlas k tomu, aby elektronická + literatúru. Súčasne dávam súhlas k~tomu, aby elektronická verzia tejto práce bola sprístupnená cez informačný systém Masarykovej univerzity.% \else 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 ff07c952ce5..12937854ce7 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}[2016/03/23] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15] \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -59,40 +59,6 @@ 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}} \global\let\thesis@czech@bib@author\thesis@czech@authorTitle \gdef\thesis@czech@bib@thesisTitle{Název práce} 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 d6db9538292..3909cdff49d 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 5f298d4d791..002fbbb3f14 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 37aaa7d7788..7ee285dc6e8 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 89624661aab..fb3ea46209c 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.eps b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.eps index f8395995d26..6d8defd3ef4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.eps +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.eps @@ -1,10 +1,10 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.13.1 (http://cairographics.org) -%%CreationDate: Thu Apr 16 20:54:49 2015 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Thu May 11 20:04:30 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 -%%BoundingBox: 0 -1 290 290 +%%BoundingBox: 0 0 290 290 %%EndComments %%BeginProlog save @@ -63,421 +63,415 @@ save %%EndSetup %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 0 -1 290 290 +%%PageBoundingBox: 0 0 290 290 %%EndPageSetup -q 0 -1 290 291 rectclip q -q -0 289.984 290 -290 re W n -[ 1 0 0 1 0 -0.0159912 ] concat - q +q 0 0 290 290 rectclip q 0 g -156.402 40.488 m 155.668 40.129 l 135.418 40.129 l 128.434 52.645 l 147.934 - 52.645 l 148.668 53.004 l 235.512 204.254 l 242.137 190.645 l h -165.605 150.52 m 166.34 150.16 l 168.918 137.645 l 161.184 122.551 l 158.605 - 136.535 l 157.871 136.91 l 109.668 136.91 l 117.762 150.52 l h -145.355 56.691 m 78.387 173.348 l 94.574 173.348 l 111.871 142.801 l 108.184 - 136.535 l 116.293 121.457 l 126.23 121.082 l 153.09 71.035 l h -182.527 173.348 m 188.418 184.02 l 189.887 173.348 l 196.887 173.348 l -146.09 86.129 l 127.324 121.082 l 161.184 121.082 l 169.652 137.645 l 166.699 - 151.27 l 117.027 151.27 l 112.605 143.895 l 95.684 173.348 l h -205.715 189.16 m 197.621 174.441 l 190.996 174.441 l 188.777 189.16 l h -189.512 193.582 m 187.309 189.895 l 188.043 185.488 l 188.043 185.488 182.527 - 175.176 182.527 175.176 c 180.324 191.004 l 187.309 203.52 l h -56.668 204.629 m 186.574 204.629 l 179.59 191.738 l 48.574 191.738 l h -124.746 56.691 m 129.543 56.691 l 127.324 53.379 l 135.059 39.395 l 156.402 - 39.395 l 243.246 190.645 l 242.137 193.207 235.887 205.723 235.887 205.723 - c 196.512 205.723 l 190.262 194.691 l 187.684 205.723 l 143.887 205.723 - 99.73 205.723 55.934 205.723 c 55.934 205.723 47.105 191.738 47.105 191.738 - c h -157.871 136.91 m 158.605 136.535 l 166.34 150.16 l 165.605 150.52 l h -156.402 40.488 m 155.668 40.129 l 147.934 52.645 l 148.668 53.004 l h -4.418 132.863 m 4.418 130.66 6.262 128.816 8.465 128.816 c 10.309 128.816 - 12.137 130.66 12.137 132.863 c 12.137 134.707 10.309 136.535 8.465 136.535 - c 6.262 136.535 4.418 134.707 4.418 132.863 c h -274.902 132.863 m 274.902 130.66 276.73 128.816 278.949 128.816 c 280.777 - 128.816 282.621 130.66 282.621 132.863 c 282.621 134.707 280.777 136.535 - 278.949 136.535 c 276.73 136.535 274.902 134.707 274.902 132.863 c h -0.73 142.801 m 0.73 144.645 l 0.73 145.004 0.73 145.738 1.84 145.738 c -15.449 145.738 l 16.559 145.738 16.559 145.004 16.559 144.645 c 16.559 142.801 - l 17.293 142.801 l 17.293 150.895 l 16.559 150.895 l 16.559 149.051 l 16.559 - 148.691 16.184 147.957 15.09 147.957 c 8.824 147.957 l 8.824 149.426 l -8.824 150.895 10.309 152.004 12.137 152.363 c 12.137 153.098 l 4.777 153.098 - l 4.777 152.363 l 6.621 152.004 7.73 150.895 7.73 149.426 c 7.73 147.957 - l 1.84 147.957 l 0.73 147.957 0.73 147.957 0.73 149.051 c 0.73 151.629 -l 0.73 152.738 1.105 153.832 1.84 154.941 c 2.574 155.316 4.043 156.051 -5.887 156.41 c 5.887 157.145 l -0.004 156.785 l -0.004 142.801 l h -1.465 167.082 m 11.043 160.832 15.824 157.879 16.184 157.52 c 16.559 157.145 - 16.934 156.785 16.559 155.676 c 17.293 155.676 l 18.402 161.941 l 17.668 - 162.301 l 16.934 158.988 17.293 158.254 12.887 161.566 c 13.98 168.191 -l 17.293 168.926 l 17.668 168.926 18.762 168.551 18.402 166.723 c 19.137 - 166.348 l 20.246 173.348 l 19.496 173.348 l 19.496 172.238 19.137 171.863 - 18.027 171.504 c 1.465 168.191 l 0.73 167.816 0.73 167.457 1.465 167.082 - c h -12.887 167.816 m 11.777 161.941 l 4.418 165.988 l h -8.09 190.27 m 6.621 188.426 5.887 187.691 5.512 186.223 c 4.043 181.801 - 6.996 177.395 12.512 175.926 c 17.293 174.441 21.34 177.395 22.809 181.441 - c 23.918 184.754 22.074 187.691 18.762 189.535 c 18.402 189.535 18.027 -189.16 18.402 188.801 c 21.34 186.957 23.184 184.754 22.074 181.441 c 21.715 - 178.488 18.027 177.395 13.246 178.863 c 7.355 180.332 5.512 183.285 6.621 - 185.848 c 6.996 186.957 7.73 188.066 8.824 188.801 c 9.934 189.16 11.777 - 189.535 13.621 189.535 c 13.98 189.895 l 6.996 192.113 l 6.996 191.379 -l h -9.574 195.785 m 11.043 198.738 9.574 199.473 16.934 195.426 c 20.605 193.582 - 22.809 192.848 23.918 192.848 c 25.762 192.848 31.652 196.16 29.809 202.41 - c 29.434 203.52 28.34 204.629 26.496 205.363 c 18.762 209.035 l 17.293 -210.145 16.934 210.879 18.027 212.723 c 16.934 213.457 l 13.98 207.191 l - 15.09 206.457 l 16.184 209.035 16.184 209.035 18.762 207.566 c 30.543 202.785 - 29.434 200.941 27.965 198.004 c 26.871 195.426 26.121 195.051 24.293 195.051 - c 23.559 195.051 21.34 195.785 17.668 197.629 c 14.355 199.473 12.512 200.207 - 12.137 200.566 c 12.137 200.941 12.512 201.676 13.246 203.145 c 12.512 -203.879 l 8.824 196.16 l h -18.762 214.926 m 20.246 217.504 19.137 217.863 26.871 213.082 c 35.324 -208.301 33.855 209.035 32.387 206.457 c 32.746 206.098 l 40.48 218.238 l - 34.965 222.285 l 34.59 221.551 l 37.902 218.613 38.637 216.77 37.168 214.191 - c 34.59 210.145 36.434 210.145 27.965 214.926 c 20.246 219.707 21.34 218.973 - 23.184 221.926 c 22.449 222.285 l 18.027 215.301 l h -32.012 225.223 m 32.387 225.973 l 28.34 233.332 31.652 234.066 32.387 233.332 - c 39.371 227.441 43.059 224.129 43.059 223.754 c 43.418 223.395 43.059 -223.02 41.949 221.926 c 42.684 221.176 l 47.465 227.066 l 46.73 227.801 -l 45.996 226.707 45.262 225.973 44.902 225.973 c 44.527 226.332 41.215 229.285 - 34.23 235.16 c 32.746 236.645 34.23 240.316 41.215 235.895 c 41.59 237.004 - l 36.434 241.051 l 27.605 230.02 l h -43.059 248.41 m 47.84 238.113 50.043 232.598 49.684 231.848 c 49.684 231.488 - 49.309 230.754 48.949 230.379 c 49.684 230.02 l 54.09 234.426 l 53.73 235.16 - l 51.152 231.848 50.418 234.426 50.043 235.535 c 49.309 237.379 l 54.09 - 242.16 l 59.98 239.207 58.512 239.957 56.668 238.113 c 57.402 237.738 l - 62.559 242.52 l 61.824 242.895 l 61.09 242.16 60.355 241.785 59.621 242.16 - c 44.152 249.145 l 43.418 249.52 42.684 249.52 43.059 248.41 c h -52.996 242.52 m 48.574 238.113 l 45.262 245.832 l h -61.824 262.035 m 59.98 262.035 51.512 260.191 56.309 253.191 c 57.777 251.363 - 59.98 251.363 63.293 252.457 c 68.449 254.301 68.449 254.301 69.918 252.832 - c 71.387 251.363 70.652 249.145 68.809 247.676 c 66.246 246.207 63.293 -246.207 60.355 249.145 c 59.621 248.41 l 63.293 242.895 l 64.402 243.629 - l 64.762 245.832 l 70.293 244.004 72.871 251.723 71.027 254.301 c 68.809 - 257.254 67.34 256.879 62.559 255.035 c 59.98 254.301 55.199 253.566 56.309 - 257.613 c 57.043 260.926 61.09 262.035 65.496 258.723 c 66.246 259.082 -l 62.184 263.863 l 61.824 263.504 l h -82.793 259.816 m 82.793 257.988 82.434 256.879 81.324 256.504 c 81.324 -255.77 l 86.84 258.348 l 86.48 259.082 l 85.012 257.988 83.902 256.879 83.902 - 262.77 c 89.793 265.707 l 94.215 262.395 94.215 262.395 91.637 261.301 -c 91.637 260.551 l 97.887 263.504 l 97.512 263.863 l 96.418 263.504 95.684 - 263.504 94.949 264.238 c 82.793 275.645 l 82.059 276.379 81.699 276.379 - 81.699 275.285 c h -89.059 266.441 m 83.543 263.863 l 82.793 272.332 l h -93.105 279.332 m 95.684 280.426 95.684 281.535 98.621 273.066 c 101.574 - 264.613 101.199 265.707 98.621 264.613 c 98.621 263.863 l 106.355 266.441 - l 105.98 267.176 l 103.402 266.816 103.777 264.973 100.824 273.801 c 104.512 - 274.91 105.98 274.535 107.09 270.863 c 108.184 267.551 113.715 265.348 -112.98 272.707 c 112.98 273.066 112.246 273.801 112.246 272.707 c 112.98 - 270.129 111.496 269.02 109.293 271.973 c 107.824 275.285 107.449 274.535 - 104.137 275.285 c 107.824 277.113 108.934 278.957 108.184 280.801 c 107.09 - 283.738 104.512 284.473 101.199 283.004 c 92.73 280.066 l h -100.824 274.535 m 97.512 282.27 97.512 281.16 101.574 282.27 c 103.402 -282.645 104.887 282.27 105.621 280.801 c 107.09 277.848 105.246 276.02 102.309 - 274.91 c h -112.98 279.332 m 113.715 279.691 l 114.449 285.582 117.027 287.051 118.121 - 285.957 c 118.496 285.957 118.871 283.738 119.605 278.957 c 120.699 274.176 - 121.074 271.598 120.699 271.223 c 120.699 270.863 119.965 270.863 118.496 - 270.488 c 118.496 269.754 l 126.23 270.863 l 126.23 271.598 l 123.277 271.223 - 123.652 270.129 121.809 279.332 c 121.074 284.113 120.699 286.316 120.699 - 286.691 c 121.074 287.051 124.387 289.27 126.965 281.895 c 128.059 281.895 - l 126.59 288.52 l 112.605 285.957 l h -131.012 288.16 m 133.949 288.52 133.949 288.52 133.949 287.051 c 134.684 - 278.223 134.684 273.441 134.324 273.066 c 133.949 272.707 133.215 272.707 - 131.746 272.332 c 131.746 271.598 l 139.84 272.332 l 139.84 273.066 l 138.371 - 273.066 137.262 273.066 136.902 273.441 c 136.527 273.801 136.527 278.223 - 136.152 287.051 c 136.152 288.52 136.152 288.52 139.105 288.895 c 139.105 - 289.629 l 131.012 288.895 l h -150.887 288.16 m 149.043 289.27 147.934 290.004 146.465 290.004 c 143.512 - 290.004 141.309 287.785 141.309 284.473 c 141.309 283.379 141.684 282.27 - 142.777 281.16 c 143.512 280.801 144.621 280.066 146.465 279.691 c 151.246 - 278.598 151.98 278.223 151.98 276.02 c 151.98 274.176 150.512 272.707 147.934 - 272.707 c 144.996 272.707 142.418 274.535 142.043 278.598 c 140.949 278.598 - l 140.949 271.973 l 142.043 271.973 l 143.512 273.441 l 144.621 272.332 - 146.09 271.598 147.934 271.598 c 151.246 271.598 153.824 274.176 153.824 - 277.113 c 153.824 280.066 152.355 281.16 147.199 282.27 c 143.152 283.738 - 142.777 283.738 142.777 285.957 c 142.777 287.426 144.621 288.895 146.465 - 288.895 c 149.043 288.895 150.512 287.426 151.98 283.379 c 152.715 283.379 - l 152.355 289.629 l 151.621 289.629 l h -165.965 287.426 m 169.277 286.316 168.918 287.785 167.434 278.598 c 166.34 - 269.754 165.965 271.223 163.027 271.598 c 163.027 270.863 l 171.121 269.395 - l 171.121 270.129 l 168.168 270.488 167.809 269.395 169.277 278.223 c 170.746 - 287.426 170.012 287.051 174.059 285.957 c 174.059 286.691 l 165.965 288.16 +156.402 40.473 m 155.668 40.113 l 135.418 40.113 l 128.434 52.629 l 147.934 + 52.629 l 148.668 52.988 l 235.512 204.238 l 242.137 190.629 l h +165.605 150.504 m 166.34 150.145 l 168.918 137.629 l 161.184 122.535 l +158.605 136.52 l 157.871 136.895 l 109.668 136.895 l 117.762 150.504 l h +145.355 56.676 m 78.387 173.332 l 94.574 173.332 l 111.871 142.785 l 108.184 + 136.52 l 116.293 121.441 l 126.23 121.066 l 153.09 71.02 l h +182.527 173.332 m 188.418 184.004 l 189.887 173.332 l 196.887 173.332 l + 146.09 86.113 l 127.324 121.066 l 161.184 121.066 l 169.652 137.629 l 166.699 + 151.254 l 117.027 151.254 l 112.605 143.879 l 95.684 173.332 l h +205.715 189.145 m 197.621 174.426 l 190.996 174.426 l 188.777 189.145 l + h +189.512 193.566 m 187.309 189.879 l 188.043 185.473 l 182.527 175.16 l +180.324 190.988 l 187.309 203.504 l h +56.668 204.613 m 186.574 204.613 l 179.59 191.723 l 48.574 191.723 l h +124.746 56.676 m 129.543 56.676 l 127.324 53.363 l 135.059 39.379 l 156.402 + 39.379 l 243.246 190.629 l 242.137 193.191 235.887 205.707 235.887 205.707 + c 196.512 205.707 l 190.262 194.676 l 187.684 205.707 l 143.887 205.707 + 99.73 205.707 55.934 205.707 c 47.105 191.723 l h +157.871 136.895 m 158.605 136.52 l 166.34 150.145 l 165.605 150.504 l h +156.402 40.473 m 155.668 40.113 l 147.934 52.629 l 148.668 52.988 l h +4.418 132.848 m 4.418 130.645 6.262 128.801 8.465 128.801 c 10.309 128.801 + 12.137 130.645 12.137 132.848 c 12.137 134.691 10.309 136.52 8.465 136.52 + c 6.262 136.52 4.418 134.691 4.418 132.848 c h +274.902 132.848 m 274.902 130.645 276.73 128.801 278.949 128.801 c 280.777 + 128.801 282.621 130.645 282.621 132.848 c 282.621 134.691 280.777 136.52 + 278.949 136.52 c 276.73 136.52 274.902 134.691 274.902 132.848 c h +0.73 142.785 m 0.73 144.629 l 0.73 144.988 0.73 145.723 1.84 145.723 c +15.449 145.723 l 16.559 145.723 16.559 144.988 16.559 144.629 c 16.559 142.785 + l 17.293 142.785 l 17.293 150.879 l 16.559 150.879 l 16.559 149.035 l 16.559 + 148.676 16.184 147.941 15.09 147.941 c 8.824 147.941 l 8.824 149.41 l 8.824 + 150.879 10.309 151.988 12.137 152.348 c 12.137 153.082 l 4.777 153.082 +l 4.777 152.348 l 6.621 151.988 7.73 150.879 7.73 149.41 c 7.73 147.941 +l 1.84 147.941 l 0.73 147.941 0.73 147.941 0.73 149.035 c 0.73 151.613 l + 0.73 152.723 1.105 153.816 1.84 154.926 c 2.574 155.301 4.043 156.035 5.887 + 156.395 c 5.887 157.129 l -0.004 156.77 l -0.004 142.785 l h +1.465 167.066 m 11.043 160.816 15.824 157.863 16.184 157.504 c 16.559 157.129 + 16.934 156.77 16.559 155.66 c 17.293 155.66 l 18.402 161.926 l 17.668 162.285 + l 16.934 158.973 17.293 158.238 12.887 161.551 c 13.98 168.176 l 17.293 + 168.91 l 17.668 168.91 18.762 168.535 18.402 166.707 c 19.137 166.332 l + 20.246 173.332 l 19.496 173.332 l 19.496 172.223 19.137 171.848 18.027 +171.488 c 1.465 168.176 l 0.73 167.801 0.73 167.441 1.465 167.066 c h +12.887 167.801 m 11.777 161.926 l 4.418 165.973 l h +8.09 190.254 m 6.621 188.41 5.887 187.676 5.512 186.207 c 4.043 181.785 + 6.996 177.379 12.512 175.91 c 17.293 174.426 21.34 177.379 22.809 181.426 + c 23.918 184.738 22.074 187.676 18.762 189.52 c 18.402 189.52 18.027 189.145 + 18.402 188.785 c 21.34 186.941 23.184 184.738 22.074 181.426 c 21.715 178.473 + 18.027 177.379 13.246 178.848 c 7.355 180.316 5.512 183.27 6.621 185.832 + c 6.996 186.941 7.73 188.051 8.824 188.785 c 9.934 189.145 11.777 189.52 + 13.621 189.52 c 13.98 189.879 l 6.996 192.098 l 6.996 191.363 l h +9.574 195.77 m 11.043 198.723 9.574 199.457 16.934 195.41 c 20.605 193.566 + 22.809 192.832 23.918 192.832 c 25.762 192.832 31.652 196.145 29.809 202.395 + c 29.434 203.504 28.34 204.613 26.496 205.348 c 18.762 209.02 l 17.293 +210.129 16.934 210.863 18.027 212.707 c 16.934 213.441 l 13.98 207.176 l + 15.09 206.441 l 16.184 209.02 16.184 209.02 18.762 207.551 c 30.543 202.77 + 29.434 200.926 27.965 197.988 c 26.871 195.41 26.121 195.035 24.293 195.035 + c 23.559 195.035 21.34 195.77 17.668 197.613 c 14.355 199.457 12.512 200.191 + 12.137 200.551 c 12.137 200.926 12.512 201.66 13.246 203.129 c 12.512 203.863 + l 8.824 196.145 l h +18.762 214.91 m 20.246 217.488 19.137 217.848 26.871 213.066 c 35.324 208.285 + 33.855 209.02 32.387 206.441 c 32.746 206.082 l 40.48 218.223 l 34.965 +222.27 l 34.59 221.535 l 37.902 218.598 38.637 216.754 37.168 214.176 c +34.59 210.129 36.434 210.129 27.965 214.91 c 20.246 219.691 21.34 218.957 + 23.184 221.91 c 22.449 222.27 l 18.027 215.285 l h +32.012 225.207 m 32.387 225.957 l 28.34 233.316 31.652 234.051 32.387 233.316 + c 39.371 227.426 43.059 224.113 43.059 223.738 c 43.418 223.379 43.059 +223.004 41.949 221.91 c 42.684 221.16 l 47.465 227.051 l 46.73 227.785 l + 45.996 226.691 45.262 225.957 44.902 225.957 c 44.527 226.316 41.215 229.27 + 34.23 235.145 c 32.746 236.629 34.23 240.301 41.215 235.879 c 41.59 236.988 + l 36.434 241.035 l 27.605 230.004 l h +43.059 248.395 m 47.84 238.098 50.043 232.582 49.684 231.832 c 49.684 231.473 + 49.309 230.738 48.949 230.363 c 49.684 230.004 l 54.09 234.41 l 53.73 235.145 + l 51.152 231.832 50.418 234.41 50.043 235.52 c 49.309 237.363 l 54.09 242.145 + l 59.98 239.191 58.512 239.941 56.668 238.098 c 57.402 237.723 l 62.559 + 242.504 l 61.824 242.879 l 61.09 242.145 60.355 241.77 59.621 242.145 c + 44.152 249.129 l 43.418 249.504 42.684 249.504 43.059 248.395 c h +52.996 242.504 m 48.574 238.098 l 45.262 245.816 l h +61.824 262.02 m 59.98 262.02 51.512 260.176 56.309 253.176 c 57.777 251.348 + 59.98 251.348 63.293 252.441 c 68.449 254.285 68.449 254.285 69.918 252.816 + c 71.387 251.348 70.652 249.129 68.809 247.66 c 66.246 246.191 63.293 246.191 + 60.355 249.129 c 59.621 248.395 l 63.293 242.879 l 64.402 243.613 l 64.762 + 245.816 l 70.293 243.988 72.871 251.707 71.027 254.285 c 68.809 257.238 + 67.34 256.863 62.559 255.02 c 59.98 254.285 55.199 253.551 56.309 257.598 + c 57.043 260.91 61.09 262.02 65.496 258.707 c 66.246 259.066 l 62.184 263.848 + l 61.824 263.488 l h +82.793 259.801 m 82.793 257.973 82.434 256.863 81.324 256.488 c 81.324 +255.754 l 86.84 258.332 l 86.48 259.066 l 85.012 257.973 83.902 256.863 +83.902 262.754 c 89.793 265.691 l 94.215 262.379 94.215 262.379 91.637 261.285 + c 91.637 260.535 l 97.887 263.488 l 97.512 263.848 l 96.418 263.488 95.684 + 263.488 94.949 264.223 c 82.793 275.629 l 82.059 276.363 81.699 276.363 + 81.699 275.27 c h +89.059 266.426 m 83.543 263.848 l 82.793 272.316 l h +93.105 279.316 m 95.684 280.41 95.684 281.52 98.621 273.051 c 101.574 264.598 + 101.199 265.691 98.621 264.598 c 98.621 263.848 l 106.355 266.426 l 105.98 + 267.16 l 103.402 266.801 103.777 264.957 100.824 273.785 c 104.512 274.895 + 105.98 274.52 107.09 270.848 c 108.184 267.535 113.715 265.332 112.98 272.691 + c 112.98 273.051 112.246 273.785 112.246 272.691 c 112.98 270.113 111.496 + 269.004 109.293 271.957 c 107.824 275.27 107.449 274.52 104.137 275.27 +c 107.824 277.098 108.934 278.941 108.184 280.785 c 107.09 283.723 104.512 + 284.457 101.199 282.988 c 92.73 280.051 l h +100.824 274.52 m 97.512 282.254 97.512 281.145 101.574 282.254 c 103.402 + 282.629 104.887 282.254 105.621 280.785 c 107.09 277.832 105.246 276.004 + 102.309 274.895 c h +112.98 279.316 m 113.715 279.676 l 114.449 285.566 117.027 287.035 118.121 + 285.941 c 118.496 285.941 118.871 283.723 119.605 278.941 c 120.699 274.16 + 121.074 271.582 120.699 271.207 c 120.699 270.848 119.965 270.848 118.496 + 270.473 c 118.496 269.738 l 126.23 270.848 l 126.23 271.582 l 123.277 271.207 + 123.652 270.113 121.809 279.316 c 121.074 284.098 120.699 286.301 120.699 + 286.676 c 121.074 287.035 124.387 289.254 126.965 281.879 c 128.059 281.879 + l 126.59 288.504 l 112.605 285.941 l h +131.012 288.145 m 133.949 288.504 133.949 288.504 133.949 287.035 c 134.684 + 278.207 134.684 273.426 134.324 273.051 c 133.949 272.691 133.215 272.691 + 131.746 272.316 c 131.746 271.582 l 139.84 272.316 l 139.84 273.051 l 138.371 + 273.051 137.262 273.051 136.902 273.426 c 136.527 273.785 136.527 278.207 + 136.152 287.035 c 136.152 288.504 136.152 288.504 139.105 288.879 c 139.105 + 289.613 l 131.012 288.879 l h +150.887 288.145 m 149.043 289.254 147.934 289.988 146.465 289.988 c 143.512 + 289.988 141.309 287.77 141.309 284.457 c 141.309 283.363 141.684 282.254 + 142.777 281.145 c 143.512 280.785 144.621 280.051 146.465 279.676 c 151.246 + 278.582 151.98 278.207 151.98 276.004 c 151.98 274.16 150.512 272.691 147.934 + 272.691 c 144.996 272.691 142.418 274.52 142.043 278.582 c 140.949 278.582 + l 140.949 271.957 l 142.043 271.957 l 143.512 273.426 l 144.621 272.316 + 146.09 271.582 147.934 271.582 c 151.246 271.582 153.824 274.16 153.824 + 277.098 c 153.824 280.051 152.355 281.145 147.199 282.254 c 143.152 283.723 + 142.777 283.723 142.777 285.941 c 142.777 287.41 144.621 288.879 146.465 + 288.879 c 149.043 288.879 150.512 287.41 151.98 283.363 c 152.715 283.363 + l 152.355 289.613 l 151.621 289.613 l h +165.965 287.41 m 169.277 286.301 168.918 287.77 167.434 278.582 c 166.34 + 269.738 165.965 271.207 163.027 271.582 c 163.027 270.848 l 171.121 269.379 + l 171.121 270.113 l 168.168 270.473 167.809 269.379 169.277 278.207 c 170.746 + 287.41 170.012 287.035 174.059 285.941 c 174.059 286.676 l 165.965 288.145 l h -176.277 285.207 m 177.371 284.848 178.105 284.848 178.48 284.473 c 178.84 - 284.113 177.746 280.066 175.168 271.973 c 174.793 270.488 173.324 269.754 - 171.855 270.129 c 171.48 269.395 l 178.48 267.551 l 178.48 267.926 l 176.637 - 269.02 176.277 270.129 176.637 271.598 c 179.59 281.535 l 185.84 265.348 - l 186.949 264.973 l 189.512 274.91 190.996 279.691 191.73 280.066 c 192.465 - 280.426 193.199 280.426 193.934 280.066 c 194.309 280.801 l 188.043 282.645 - l 188.043 281.895 l 188.777 281.535 189.152 281.16 189.512 280.426 c 189.887 - 280.066 189.152 276.02 186.949 268.66 c 180.324 284.848 l 176.277 285.957 +176.277 285.191 m 177.371 284.832 178.105 284.832 178.48 284.457 c 178.84 + 284.098 177.746 280.051 175.168 271.957 c 174.793 270.473 173.324 269.738 + 171.855 270.113 c 171.48 269.379 l 178.48 267.535 l 178.48 267.91 l 176.637 + 269.004 176.277 270.113 176.637 271.582 c 179.59 281.52 l 185.84 265.332 + l 186.949 264.957 l 189.512 274.895 190.996 279.676 191.73 280.051 c 192.465 + 280.41 193.199 280.41 193.934 280.051 c 194.309 280.785 l 188.043 282.629 + l 188.043 281.879 l 188.777 281.52 189.152 281.145 189.512 280.41 c 189.887 + 280.051 189.152 276.004 186.949 268.645 c 180.324 284.832 l 176.277 285.941 l h -195.043 279.332 m 197.98 278.223 199.09 279.332 195.043 270.488 c 191.73 - 262.035 192.09 263.504 189.512 264.613 c 189.152 263.863 l 196.512 260.926 - l 196.887 261.66 l 193.934 262.77 192.824 261.301 196.887 269.754 c 200.184 - 268.285 200.184 267.176 199.824 264.613 c 200.184 264.613 l 203.137 271.598 - l 202.402 271.973 l 201.293 270.129 200.184 269.02 197.246 270.488 c 199.449 - 276.379 l 201.668 277.488 207.918 274.91 206.074 269.395 c 206.449 269.02 - l 208.293 274.535 l 195.402 280.066 l h -219.699 268.66 m 216.746 270.863 210.871 268.66 208.652 264.973 c 206.074 - 259.816 207.559 255.035 211.23 252.832 c 214.918 250.629 220.059 252.098 - 222.637 256.879 c 225.215 261.301 224.105 266.441 219.699 268.66 c h -219.699 267.551 m 221.902 266.082 223.012 263.863 220.059 257.988 c 216.746 - 252.457 213.809 252.098 211.605 253.566 c 209.027 255.035 208.293 257.988 - 211.23 263.504 c 214.168 267.926 217.121 269.02 219.699 267.551 c h -229.637 260.926 m 231.105 259.816 231.465 258.723 230.73 257.613 c 225.59 - 250.629 222.637 247.316 222.277 246.941 c 221.902 246.941 221.168 247.316 - 220.059 248.41 c 219.699 247.676 l 225.949 242.895 l 226.324 243.27 l 224.48 - 245.098 223.012 244.004 228.902 250.988 c 232.574 248.785 232.215 247.676 - 230.371 245.098 c 228.527 242.16 228.527 240.316 229.637 239.207 c 231.465 - 238.113 232.949 238.848 234.777 240.691 c 235.152 241.051 235.512 242.16 - 234.418 241.051 c 231.465 238.848 230.73 240.316 232.215 242.52 c 234.043 - 245.832 233.684 246.566 231.84 249.52 c 235.887 245.098 244.355 249.145 - 236.996 256.145 c 229.996 261.301 l h -229.637 251.723 m 234.043 257.988 233.309 257.988 236.262 255.41 c 238.09 - 254.301 238.465 253.191 238.09 252.098 c 237.355 249.52 234.777 247.316 - 229.637 251.723 c h -246.559 246.566 m 247.668 245.473 248.027 244.738 247.668 244.363 c 247.668 - 244.004 244.355 241.426 238.09 235.895 c 236.621 234.801 235.887 234.801 - 234.418 235.895 c 233.684 235.535 l 238.09 230.754 l 238.824 231.113 l -237.73 232.598 237.355 233.691 237.73 234.066 c 238.09 234.426 241.777 237.738 - 248.762 243.629 c 240.309 228.176 l 240.668 227.801 l 257.23 233.691 l -249.871 227.441 245.824 224.129 245.09 224.129 c 244.715 224.129 243.98 -224.863 243.246 225.973 c 242.512 225.598 l 247.668 219.348 l 248.402 219.707 - l 246.559 222.285 245.09 221.176 252.449 227.066 c 260.168 233.332 258.699 - 231.848 259.809 230.379 c 260.543 230.754 l 257.23 234.801 l 243.621 229.645 - l 250.605 242.895 l 247.293 246.941 l h -268.277 219.707 m 257.23 217.863 251.34 217.129 250.605 217.129 c 250.246 - 217.504 249.496 217.863 249.137 218.613 c 248.402 218.238 l 251.715 212.723 - l 252.449 213.082 l 251.34 215.66 249.871 216.035 255.762 216.77 c 259.434 - 210.879 l 256.496 206.457 256.496 206.457 255.027 209.035 c 254.293 208.676 - l 257.965 202.785 l 258.34 203.145 l 257.965 204.254 257.965 204.988 258.34 - 205.363 c 268.637 218.973 l 269.012 219.707 269.012 219.707 268.277 219.707 +195.043 279.316 m 197.98 278.207 199.09 279.316 195.043 270.473 c 191.73 + 262.02 192.09 263.488 189.512 264.598 c 189.152 263.848 l 196.512 260.91 + l 196.887 261.645 l 193.934 262.754 192.824 261.285 196.887 269.738 c 200.184 + 268.27 200.184 267.16 199.824 264.598 c 200.184 264.598 l 203.137 271.582 + l 202.402 271.957 l 201.293 270.113 200.184 269.004 197.246 270.473 c 199.449 + 276.363 l 201.668 277.473 207.918 274.895 206.074 269.379 c 206.449 269.004 + l 208.293 274.52 l 195.402 280.051 l h +219.699 268.645 m 216.746 270.848 210.871 268.645 208.652 264.957 c 206.074 + 259.801 207.559 255.02 211.23 252.816 c 214.918 250.613 220.059 252.082 + 222.637 256.863 c 225.215 261.285 224.105 266.426 219.699 268.645 c h +219.699 267.535 m 221.902 266.066 223.012 263.848 220.059 257.973 c 216.746 + 252.441 213.809 252.082 211.605 253.551 c 209.027 255.02 208.293 257.973 + 211.23 263.488 c 214.168 267.91 217.121 269.004 219.699 267.535 c h +229.637 260.91 m 231.105 259.801 231.465 258.707 230.73 257.598 c 225.59 + 250.613 222.637 247.301 222.277 246.926 c 221.902 246.926 221.168 247.301 + 220.059 248.395 c 219.699 247.66 l 225.949 242.879 l 226.324 243.254 l +224.48 245.082 223.012 243.988 228.902 250.973 c 232.574 248.77 232.215 +247.66 230.371 245.082 c 228.527 242.145 228.527 240.301 229.637 239.191 + c 231.465 238.098 232.949 238.832 234.777 240.676 c 235.152 241.035 235.512 + 242.145 234.418 241.035 c 231.465 238.832 230.73 240.301 232.215 242.504 + c 234.043 245.816 233.684 246.551 231.84 249.504 c 235.887 245.082 244.355 + 249.129 236.996 256.129 c 229.996 261.285 l h +229.637 251.707 m 234.043 257.973 233.309 257.973 236.262 255.395 c 238.09 + 254.285 238.465 253.176 238.09 252.082 c 237.355 249.504 234.777 247.301 + 229.637 251.707 c h +246.559 246.551 m 247.668 245.457 248.027 244.723 247.668 244.348 c 247.668 + 243.988 244.355 241.41 238.09 235.879 c 236.621 234.785 235.887 234.785 + 234.418 235.879 c 233.684 235.52 l 238.09 230.738 l 238.824 231.098 l 237.73 + 232.582 237.355 233.676 237.73 234.051 c 238.09 234.41 241.777 237.723 +248.762 243.613 c 240.309 228.16 l 240.668 227.785 l 257.23 233.676 l 249.871 + 227.426 245.824 224.113 245.09 224.113 c 244.715 224.113 243.98 224.848 + 243.246 225.957 c 242.512 225.582 l 247.668 219.332 l 248.402 219.691 l + 246.559 222.27 245.09 221.16 252.449 227.051 c 260.168 233.316 258.699 +231.832 259.809 230.363 c 260.543 230.738 l 257.23 234.785 l 243.621 229.629 + l 250.605 242.879 l 247.293 246.926 l h +268.277 219.691 m 257.23 217.848 251.34 217.113 250.605 217.113 c 250.246 + 217.488 249.496 217.848 249.137 218.598 c 248.402 218.223 l 251.715 212.707 + l 252.449 213.066 l 251.34 215.645 249.871 216.02 255.762 216.754 c 259.434 + 210.863 l 256.496 206.441 256.496 206.441 255.027 209.02 c 254.293 208.66 + l 257.965 202.77 l 258.34 203.129 l 257.965 204.238 257.965 204.973 258.34 + 205.348 c 268.637 218.957 l 269.012 219.691 269.012 219.691 268.277 219.691 c h -260.168 211.613 m 256.871 217.129 l 264.965 218.613 l h -267.168 208.301 m 267.543 207.566 l 269.371 207.941 270.84 207.941 271.949 - 207.566 c 274.902 206.457 274.902 204.988 274.527 204.629 c 274.527 204.254 - 270.105 202.41 260.918 198.738 c 260.543 198.738 260.543 198.363 259.434 - 200.941 c 258.699 200.566 l 261.652 193.582 l 262.387 193.957 l 262.012 - 195.785 259.809 196.16 268.637 199.473 c 273.059 201.316 275.262 202.051 - 275.637 201.676 c 275.996 201.676 279.309 199.098 272.324 195.051 c 272.684 - 194.316 l 278.949 196.895 l 273.418 209.77 l h -285.574 169.301 m 286.668 171.129 286.668 172.613 286.668 174.082 c 285.934 - 178.129 281.887 181.441 275.996 180.707 c 271.59 179.973 267.902 175.926 - 268.637 171.863 c 269.012 167.816 271.59 165.988 275.637 165.988 c 276.371 - 165.988 276.371 166.723 275.637 166.723 c 272.324 167.082 269.746 168.551 - 269.371 171.863 c 269.012 174.816 271.59 177.395 276.371 177.754 c 282.621 - 178.863 285.199 176.66 285.574 173.707 c 285.574 172.613 285.199 171.504 - 284.465 170.395 c 283.355 169.301 282.262 168.551 280.418 167.457 c 280.418 - 167.082 l 287.402 168.191 l 287.043 168.926 l h -280.043 192.473 m 280.418 189.535 280.777 189.535 279.309 189.16 c 266.434 - 185.488 l 266.059 185.488 265.699 185.113 264.59 188.066 c 263.855 188.066 - l 266.059 179.973 l 266.793 180.332 l 266.434 183.285 264.965 183.285 273.793 - 185.848 c 282.996 188.426 281.152 187.332 282.262 184.754 c 282.996 184.754 - l 280.777 192.848 l h -287.777 159.723 m 287.777 156.41 287.402 156.785 287.043 156.785 c 286.668 - 156.785 284.465 157.879 279.684 159.723 c 270.48 163.77 271.215 163.41 -271.215 164.879 c 270.48 164.879 l 270.84 160.098 l 271.59 160.098 l 271.59 - 163.035 271.59 162.301 278.574 159.363 c 278.574 154.566 l 271.215 154.207 - 271.949 153.832 271.949 156.785 c 271.215 156.785 l 272.324 142.801 l 278.949 - 143.16 l 278.574 143.895 l 273.793 144.645 273.059 145.004 272.324 149.051 - c 272.324 152.004 271.215 152.363 280.043 152.363 c 280.043 148.316 279.309 - 147.957 276.73 147.957 c 276.73 147.582 l 284.824 147.957 l 284.824 148.316 - l 282.262 148.691 281.152 149.785 280.777 152.363 c 287.043 152.738 l 287.402 - 152.738 288.137 153.473 288.137 148.691 c 288.512 146.473 286.668 145.004 - 283.355 144.645 c 283.73 143.895 l 289.246 144.645 l 288.512 159.723 l +260.168 211.598 m 256.871 217.113 l 264.965 218.598 l h +267.168 208.285 m 267.543 207.551 l 269.371 207.926 270.84 207.926 271.949 + 207.551 c 274.902 206.441 274.902 204.973 274.527 204.613 c 274.527 204.238 + 270.105 202.395 260.918 198.723 c 260.543 198.723 260.543 198.348 259.434 + 200.926 c 258.699 200.551 l 261.652 193.566 l 262.387 193.941 l 262.012 + 195.77 259.809 196.145 268.637 199.457 c 273.059 201.301 275.262 202.035 + 275.637 201.66 c 275.996 201.66 279.309 199.082 272.324 195.035 c 272.684 + 194.301 l 278.949 196.879 l 273.418 209.754 l h +285.574 169.285 m 286.668 171.113 286.668 172.598 286.668 174.066 c 285.934 + 178.113 281.887 181.426 275.996 180.691 c 271.59 179.957 267.902 175.91 + 268.637 171.848 c 269.012 167.801 271.59 165.973 275.637 165.973 c 276.371 + 165.973 276.371 166.707 275.637 166.707 c 272.324 167.066 269.746 168.535 + 269.371 171.848 c 269.012 174.801 271.59 177.379 276.371 177.738 c 282.621 + 178.848 285.199 176.645 285.574 173.691 c 285.574 172.598 285.199 171.488 + 284.465 170.379 c 283.355 169.285 282.262 168.535 280.418 167.441 c 280.418 + 167.066 l 287.402 168.176 l 287.043 168.91 l h +280.043 192.457 m 280.418 189.52 280.777 189.52 279.309 189.145 c 266.434 + 185.473 l 266.059 185.473 265.699 185.098 264.59 188.051 c 263.855 188.051 + l 266.059 179.957 l 266.793 180.316 l 266.434 183.27 264.965 183.27 273.793 + 185.832 c 282.996 188.41 281.152 187.316 282.262 184.738 c 282.996 184.738 + l 280.777 192.832 l h +287.777 159.707 m 287.777 156.395 287.402 156.77 287.043 156.77 c 286.668 + 156.77 284.465 157.863 279.684 159.707 c 270.48 163.754 271.215 163.395 + 271.215 164.863 c 270.48 164.863 l 270.84 160.082 l 271.59 160.082 l 271.59 + 163.02 271.59 162.285 278.574 159.348 c 278.574 154.551 l 271.215 154.191 + 271.949 153.816 271.949 156.77 c 271.215 156.77 l 272.324 142.785 l 278.949 + 143.145 l 278.574 143.879 l 273.793 144.629 273.059 144.988 272.324 149.035 + c 272.324 151.988 271.215 152.348 280.043 152.348 c 280.043 148.301 279.309 + 147.941 276.73 147.941 c 276.73 147.566 l 284.824 147.941 l 284.824 148.301 + l 282.262 148.676 281.152 149.77 280.777 152.348 c 287.043 152.723 l 287.402 + 152.723 288.137 153.457 288.137 148.676 c 288.512 146.457 286.668 144.988 + 283.355 144.629 c 283.73 143.879 l 289.246 144.629 l 288.512 159.707 l h -279.684 154.566 m 279.684 158.988 l 287.402 155.676 l 287.402 154.941 286.668 - 154.941 285.934 154.941 c h -16.934 125.863 m 17.293 122.551 18.402 122.926 10.668 121.082 c 6.996 120.348 - 4.777 119.613 4.043 118.879 c 2.574 117.41 2.215 115.191 2.574 112.254 -c 2.949 110.41 4.043 108.941 5.512 107.832 c 6.621 107.098 9.199 107.473 - 13.246 108.566 c 17.293 109.676 19.871 110.051 20.246 109.676 c 20.605 -109.316 20.98 108.207 21.34 107.098 c 22.449 107.473 l 20.605 114.457 l -19.871 114.098 l 19.871 112.629 19.871 111.879 18.762 111.52 c 18.402 111.145 - 7.73 107.832 5.887 108.941 c 3.309 111.52 3.309 115.566 5.512 117.035 c - 5.887 117.41 8.09 117.77 11.777 118.879 c 15.449 119.988 17.293 120.723 - 17.668 120.348 c 18.027 119.988 18.402 119.254 18.762 117.77 c 19.871 117.77 - l 17.668 126.238 l h -22.074 106.738 m 22.449 106.004 22.449 105.27 22.074 104.52 c 22.074 104.16 - 18.027 102.316 10.309 99.738 c 8.824 99.379 7.355 100.113 6.996 101.582 - c 6.262 101.207 l 8.824 94.598 l 9.574 94.957 l 9.199 96.066 8.824 96.801 - 9.199 97.16 c 9.574 97.895 13.621 99.738 20.98 102.316 c 11.402 87.223 -l 11.043 86.488 11.402 86.488 11.777 86.488 c 20.98 89.801 26.121 91.285 - 26.871 90.91 c 27.605 90.535 27.965 90.176 28.34 89.801 c 29.074 89.801 - l 26.871 95.691 l 26.121 95.332 l 26.496 94.957 26.496 94.223 26.121 93.488 - c 25.762 92.754 22.074 91.285 14.715 88.707 c 23.918 103.426 l 22.809 107.098 +279.684 154.551 m 279.684 158.973 l 287.402 155.66 l 287.402 154.926 286.668 + 154.926 285.934 154.926 c h +16.934 125.848 m 17.293 122.535 18.402 122.91 10.668 121.066 c 6.996 120.332 + 4.777 119.598 4.043 118.863 c 2.574 117.395 2.215 115.176 2.574 112.238 + c 2.949 110.395 4.043 108.926 5.512 107.816 c 6.621 107.082 9.199 107.457 + 13.246 108.551 c 17.293 109.66 19.871 110.035 20.246 109.66 c 20.605 109.301 + 20.98 108.191 21.34 107.082 c 22.449 107.457 l 20.605 114.441 l 19.871 +114.082 l 19.871 112.613 19.871 111.863 18.762 111.504 c 18.402 111.129 +7.73 107.816 5.887 108.926 c 3.309 111.504 3.309 115.551 5.512 117.02 c +5.887 117.395 8.09 117.754 11.777 118.863 c 15.449 119.973 17.293 120.707 + 17.668 120.332 c 18.027 119.973 18.402 119.238 18.762 117.754 c 19.871 +117.754 l 17.668 126.223 l h +22.074 106.723 m 22.449 105.988 22.449 105.254 22.074 104.504 c 22.074 +104.145 18.027 102.301 10.309 99.723 c 8.824 99.363 7.355 100.098 6.996 +101.566 c 6.262 101.191 l 8.824 94.582 l 9.574 94.941 l 9.199 96.051 8.824 + 96.785 9.199 97.145 c 9.574 97.879 13.621 99.723 20.98 102.301 c 11.402 + 87.207 l 11.043 86.473 11.402 86.473 11.777 86.473 c 20.98 89.785 26.121 + 91.27 26.871 90.895 c 27.605 90.52 27.965 90.16 28.34 89.785 c 29.074 89.785 + l 26.871 95.676 l 26.121 95.316 l 26.496 94.941 26.496 94.207 26.121 93.473 + c 25.762 92.738 22.074 91.27 14.715 88.691 c 23.918 103.41 l 22.809 107.082 l h -28.34 89.801 m 29.809 87.223 30.543 86.863 23.184 83.551 c 16.184 80.238 - 15.824 79.863 14.355 82.441 c 13.621 82.082 l 17.293 75.082 l 18.027 75.457 - l 16.559 78.035 16.934 78.395 23.184 81.707 c 30.168 85.02 30.543 85.395 - 32.012 82.816 c 32.746 83.176 l 28.699 90.535 l h -32.387 82.082 m 32.746 81.348 33.121 80.613 32.746 80.238 c 32.746 79.863 - 29.434 74.723 22.809 65.52 c 22.809 65.52 22.449 64.785 23.184 65.145 c - 34.23 67.723 40.105 68.832 40.48 68.457 c 41.215 68.098 41.59 67.723 41.949 - 67.363 c 42.324 67.723 l 39.012 73.254 l 38.277 72.879 l 39.746 70.301 -40.105 69.941 39.012 69.566 c 38.637 69.191 34.23 68.457 26.496 66.988 c - 31.277 73.988 33.855 77.301 34.23 77.301 c 34.59 77.66 34.59 77.66 34.965 - 77.66 c 35.324 77.66 35.699 76.926 36.434 75.816 c 37.168 76.191 l 33.121 - 82.441 l h -42.684 66.629 m 44.152 65.145 43.793 64.051 37.902 59.27 c 32.387 54.848 - 32.012 54.473 30.543 56.316 c 29.809 55.957 l 39.012 44.91 l 44.152 48.598 - l 43.793 49.332 l 37.543 44.91 33.855 52.27 33.855 52.27 c 33.855 52.645 - 35.699 54.113 39.746 57.426 c 41.59 54.473 41.215 53.379 39.371 51.895 -c 39.746 51.16 l 45.996 56.691 l 45.637 57.051 l 43.793 55.582 42.684 55.207 - 40.105 57.785 c 44.902 61.832 l 47.465 62.207 52.621 55.957 47.105 53.004 - c 47.465 52.645 l 52.262 56.316 l 43.059 66.988 l h -53.355 54.113 m 56.309 51.16 54.824 51.16 50.043 45.285 c 45.262 39.754 - 44.902 40.488 43.059 42.332 c 42.324 41.973 l 48.574 36.441 l 48.949 36.816 - l 46.371 39.395 46.73 39.02 52.262 44.535 c 53.355 43.441 l 54.824 41.973 - 54.824 40.863 53.355 38.66 c 50.418 34.238 51.152 33.504 51.887 32.77 c - 53.355 31.301 55.199 31.66 57.043 33.863 c 57.402 34.238 57.402 34.613 -56.668 34.238 c 48.949 30.191 59.98 39.754 54.824 42.332 c 58.512 39.754 - 60.355 40.129 61.824 41.598 c 63.668 43.441 63.293 46.02 60.715 48.598 -c 54.09 54.848 l h -52.621 44.91 m 58.137 51.16 57.043 51.16 59.621 48.598 c 62.934 45.285 -61.09 43.441 59.246 42.332 c 57.777 41.973 56.668 41.598 52.621 44.91 c -h -75.434 36.082 m 73.965 37.926 73.965 39.02 72.496 40.129 c 69.918 41.598 - 66.98 41.223 65.137 38.66 c 64.402 37.551 64.402 36.082 64.762 34.973 c - 65.137 33.863 65.871 32.77 66.98 31.66 c 69.918 27.988 70.652 27.254 69.184 - 25.41 c 68.074 23.941 66.605 23.566 64.027 25.035 c 61.449 26.504 60.715 - 29.816 62.559 33.129 c 61.824 33.863 l 58.137 28.348 l 58.887 27.613 l -61.09 27.988 l 61.09 26.504 61.824 25.035 63.668 23.941 c 72.121 20.988 -75.809 28.348 68.809 33.504 c 66.246 36.816 65.871 37.176 67.34 39.02 c -68.449 40.129 70.293 40.488 72.121 39.395 c 73.965 37.926 74.699 35.707 -73.605 31.66 c 73.965 31.301 l 77.277 36.441 l 76.543 36.816 l h -79.121 34.238 m 80.23 33.863 80.965 33.129 80.965 32.035 c 80.965 31.301 - 78.746 27.254 74.699 20.254 c 74.34 19.52 73.23 19.52 71.387 20.629 c 71.027 - 19.879 l 78.387 16.207 l 78.746 16.941 l 76.918 17.316 76.168 18.051 76.543 - 19.145 c 82.793 30.926 l 83.168 32.035 83.543 32.035 86.105 30.551 c 86.48 - 31.301 l 79.48 34.973 l h -85.371 23.941 m 86.105 23.566 l 89.418 29.082 92.73 27.988 92.73 26.504 - c 93.105 26.145 92.371 23.941 90.527 19.879 c 89.059 15.832 87.949 13.27 - 87.59 12.895 c 87.215 12.52 86.105 12.895 85.012 13.629 c 84.637 12.895 - l 91.637 9.957 l 91.996 10.691 l 89.059 11.785 89.418 11.785 92.371 19.52 - c 94.215 23.566 94.949 25.41 95.309 25.77 c 96.418 26.145 100.09 26.504 - 98.262 18.785 c 99.355 18.41 l 101.199 24.676 l 88.324 29.816 l h -109.293 22.457 m 102.309 13.629 98.621 9.207 98.262 8.848 c 97.887 8.473 - 97.152 8.473 96.418 8.848 c 96.043 8.113 l 102.668 6.27 l 102.668 7.004 - l 98.996 7.738 99.73 8.473 102.309 12.16 c 108.934 9.957 l 110.027 5.16 - 108.934 5.16 107.09 5.535 c 106.715 4.801 l 113.34 2.957 l 113.715 3.691 - l 112.605 4.066 111.871 4.426 111.871 5.535 c 110.402 22.457 l 110.027 -23.191 109.668 22.832 109.293 22.457 c h -108.934 11.051 m 103.043 12.895 l 107.824 19.52 l h -129.168 16.566 m 127.324 18.785 121.434 22.098 119.23 14.363 c 118.871 -13.27 119.23 12.16 119.965 11.051 c 120.699 10.316 121.809 9.582 123.652 - 8.848 c 128.059 7.004 128.434 7.004 128.434 4.426 c 128.434 2.598 126.59 - 1.488 124.012 1.848 c 121.074 2.223 118.871 4.426 118.871 8.473 c 117.762 - 8.473 l 117.027 2.223 l 118.121 1.848 l 119.605 3.332 l 120.699 1.848 122.168 - 1.113 124.012 0.754 c 129.902 -0.355 131.012 5.895 129.902 7.738 c 129.543 - 9.207 128.059 9.957 124.746 11.426 c 120.699 13.629 120.699 13.27 120.699 - 15.832 c 121.074 17.316 122.918 18.41 124.746 18.051 c 127.324 17.676 128.434 - 16.207 129.543 11.785 c 130.277 11.785 l 130.637 18.051 l 129.902 18.051 - l h -142.043 16.566 m 144.996 16.566 144.621 16.566 144.621 15.473 c 145.355 - 3.332 l 145.355 1.488 144.996 0.754 143.152 0.754 c 143.152 0.02 l 149.777 - 0.379 l 149.777 1.113 l 147.199 1.113 146.465 2.223 146.465 4.066 c 145.73 - 16.941 l 153.09 0.754 l 153.824 0.754 l 158.246 17.676 l 159.34 2.957 l - 159.34 2.598 158.98 1.848 157.871 1.848 c 156.402 1.848 l 156.762 1.113 - l 164.871 1.488 l 164.496 2.223 l 163.027 2.223 l 161.918 2.223 161.559 - 2.223 161.559 3.332 c 160.809 16.566 l 160.809 17.676 160.449 18.051 163.387 - 18.051 c 163.387 18.785 l 157.496 18.41 l 153.824 4.066 l 147.199 17.676 - l 141.684 17.316 l h -171.48 20.988 m 169.277 9.582 168.168 3.691 167.809 3.332 c 167.809 2.957 - 167.434 2.957 166.34 2.598 c 166.34 1.848 l 172.59 2.957 l 172.59 3.691 - l 170.012 3.332 168.543 2.957 170.012 8.113 c 176.637 9.207 l 180.324 4.066 - 179.215 4.801 177.012 4.426 c 177.012 3.691 l 183.996 5.16 l 183.637 5.895 - l 182.527 5.535 181.793 5.895 181.418 6.645 c 172.59 20.988 l 171.855 21.723 - 171.855 21.363 171.48 20.988 c h -176.277 10.316 m 170.012 9.207 l 171.48 17.316 l h -191.355 25.035 m 189.887 25.41 180.684 25.77 183.996 18.051 c 185.105 15.473 - 186.949 15.098 190.262 15.473 c 195.402 16.566 195.777 16.207 196.512 13.629 - c 197.621 12.16 196.887 10.691 194.309 9.582 c 191.355 8.473 188.043 9.582 - 186.574 12.895 c 185.465 12.52 l 187.684 6.27 l 188.418 6.645 l 189.887 - 8.848 l 190.996 7.738 192.824 7.738 194.668 8.473 c 200.559 10.316 198.715 - 16.941 196.512 17.676 c 195.402 18.785 194.309 18.785 190.262 18.41 c 185.465 - 17.676 183.637 19.145 184.73 22.098 c 186.574 26.145 189.512 25.035 194.309 - 20.988 c 195.043 21.363 l 192.465 26.879 l 191.73 26.504 l h -200.184 30.551 m 201.293 19.52 201.668 13.629 201.293 13.27 c 200.934 12.895 - 200.559 12.16 199.824 11.785 c 200.184 11.426 l 206.074 14.363 l 205.715 - 15.098 l 203.871 13.629 202.402 14.004 202.402 18.41 c 208.293 21.363 l - 213.809 17.676 212.34 18.051 209.762 16.941 c 210.121 16.207 l 216.387 -19.145 l 216.012 19.879 l 215.277 19.52 l 214.918 19.145 214.168 19.52 213.434 - 19.879 c 200.934 31.301 l 200.559 31.66 200.184 31.66 200.184 30.551 c -h -207.559 22.098 m 202.027 19.52 l 201.293 27.613 l h -208.652 33.863 m 211.23 35.348 211.605 34.973 211.965 34.613 c 216.746 -27.613 219.324 23.566 219.324 22.832 c 219.699 22.457 218.965 21.723 217.855 - 20.988 c 218.23 20.254 l 224.84 24.676 l 224.48 25.41 l 221.902 23.566 -221.902 24.301 221.543 24.676 c 217.855 30.191 l 221.543 32.395 221.543 -32.395 224.105 29.816 c 227.418 25.77 227.793 26.504 229.262 27.254 c 231.105 - 28.348 231.105 29.816 229.637 32.395 c 229.262 32.77 229.262 32.395 229.262 - 32.035 c 230.371 24.676 224.84 35.707 220.434 32.395 c 223.012 34.973 224.84 - 37.176 222.637 39.395 c 221.543 41.223 218.965 41.223 215.652 39.395 c -208.293 34.613 l h -217.48 30.926 m 213.074 37.176 213.074 36.441 215.652 37.926 c 221.902 -41.598 224.84 35.707 217.48 30.926 c h -224.48 44.176 m 225.59 44.91 225.949 45.285 226.324 45.285 c 226.684 45.645 - 230.371 44.535 236.621 42.332 c 239.934 38.285 l 240.309 37.926 240.309 - 37.551 238.465 35.707 c 238.824 34.973 l 245.09 40.488 l 244.355 41.223 - l 242.512 39.395 242.137 37.176 237.73 44.176 c 234.777 55.582 235.512 -54.113 236.996 55.582 c 236.262 55.957 l 231.84 51.895 l 232.215 51.16 l - 232.949 51.895 l 233.309 52.27 234.418 52.27 234.777 51.895 c 235.152 51.535 - 235.512 48.957 236.621 44.176 c 225.949 46.754 228.152 47.488 229.637 48.957 - c 229.262 49.691 l 223.746 44.91 l h -238.465 57.051 m 239.934 58.895 240.309 58.52 240.668 58.16 c 247.293 52.645 - 250.605 49.332 250.98 48.957 c 251.34 48.598 251.34 47.848 250.246 46.754 - c 250.98 46.379 l 256.121 52.27 l 255.387 53.004 l 253.559 50.066 253.559 - 50.801 249.496 54.113 c 249.137 57.785 l 259.809 57.785 258.699 56.316 -256.871 54.473 c 257.605 54.113 l 262.387 60.004 l 261.652 60.363 l 261.277 - 60.004 260.918 59.629 260.168 59.27 c 259.809 59.27 255.762 59.629 248.762 - 60.363 c 247.668 67.723 248.027 68.457 249.137 69.941 c 248.402 70.301 -l 243.98 65.145 l 244.715 64.41 l 245.824 65.879 246.559 66.254 246.934 -64.785 c 247.293 64.41 248.027 61.098 248.402 54.848 c 239.934 61.832 241.402 - 61.098 243.246 62.941 c 242.887 63.676 l 237.73 57.426 l h -249.871 71.41 m 251.34 73.988 251.34 73.988 252.809 72.879 c 260.168 68.457 - 263.855 65.879 264.23 65.52 c 264.59 65.145 264.23 64.051 263.121 62.941 - c 263.855 62.566 l 268.277 69.191 l 267.543 69.566 l 266.059 66.988 267.168 - 65.879 253.918 74.723 c 252.449 75.816 252.449 75.457 254.293 78.035 c -253.559 78.395 l 249.137 71.77 l h -256.871 86.129 m 264.59 78.395 268.277 74.348 268.637 73.254 c 269.012 -72.504 269.012 71.77 268.637 71.035 c 269.371 71.035 l 272.324 76.926 l -271.59 77.301 l 270.105 73.988 269.746 74.348 266.434 78.035 c 269.371 83.926 - l 274.152 83.926 274.527 83.176 273.418 81.348 c 274.152 80.973 l 277.105 - 87.223 l 276.371 87.598 l 275.996 86.863 275.637 86.488 274.527 86.129 -c 257.23 87.223 l 256.871 87.223 256.121 87.223 256.871 86.129 c h -268.277 83.926 m 265.699 78.395 l 259.809 84.285 l h -261.652 93.113 m 262.746 95.691 261.652 96.801 274.902 91.285 c 276.371 - 90.91 277.105 89.066 276.73 87.973 c 277.465 87.598 l 279.684 94.223 l -278.949 94.598 l 278.574 92.754 279.309 91.285 265.699 96.066 c 282.262 -101.582 l 282.621 102.316 l 273.418 105.629 268.637 107.473 268.277 107.832 - c 267.902 108.207 267.543 108.941 267.902 110.41 c 267.168 110.785 l 265.324 - 104.895 l 266.059 104.52 l 266.434 106.363 266.059 108.207 278.949 102.691 - c 262.387 97.16 l 260.918 93.488 l h -281.152 107.473 m 282.621 106.363 282.996 105.629 282.621 104.16 c 283.355 - 104.16 l 284.824 110.41 l 284.09 110.785 l 283.355 107.473 283.355 107.098 - 279.309 110.051 c 280.777 116.676 l 287.402 118.504 285.574 116.676 285.199 - 114.832 c 285.934 114.832 l 287.402 121.457 l 286.668 121.816 l 286.309 - 120.723 285.934 120.348 285.199 119.988 c 268.277 117.41 l 267.902 117.41 - 267.168 117.41 267.902 116.676 c h -279.684 116.676 m 278.215 110.41 l 271.215 115.191 l h -279.684 116.676 m f -0.94902 0.831373 0.360784 rg -242.137 190.645 m 235.512 204.254 l 148.668 53.004 l 156.402 40.488 l h -117.762 150.52 m 109.668 136.91 l 157.871 136.91 l 165.605 150.52 l h -153.09 71.035 m 126.23 121.082 l 116.293 121.457 l 108.184 136.535 l 111.871 - 142.801 l 94.574 173.348 l 78.387 173.348 l 145.355 56.691 l h -161.184 122.551 m 168.918 137.645 l 166.34 150.16 l 158.605 136.535 l h -135.418 40.129 m 155.668 40.129 l 147.934 52.645 l 128.434 52.645 l h -188.777 189.16 m 190.996 174.441 l 197.621 174.441 l 205.715 189.16 l h -187.309 203.52 m 180.324 191.004 l 182.527 175.176 l 182.527 175.176 188.043 - 185.488 188.043 185.488 c 187.309 189.895 l 189.512 193.582 l h -48.574 191.738 m 179.59 191.738 l 186.574 204.629 l 56.668 204.629 l h -48.574 191.738 m f - Q -Q +28.34 89.785 m 29.809 87.207 30.543 86.848 23.184 83.535 c 16.184 80.223 + 15.824 79.848 14.355 82.426 c 13.621 82.066 l 17.293 75.066 l 18.027 75.441 + l 16.559 78.02 16.934 78.379 23.184 81.691 c 30.168 85.004 30.543 85.379 + 32.012 82.801 c 32.746 83.16 l 28.699 90.52 l h +32.387 82.066 m 32.746 81.332 33.121 80.598 32.746 80.223 c 32.746 79.848 + 29.434 74.707 22.809 65.504 c 22.809 65.504 22.449 64.77 23.184 65.129 +c 34.23 67.707 40.105 68.816 40.48 68.441 c 41.215 68.082 41.59 67.707 41.949 + 67.348 c 42.324 67.707 l 39.012 73.238 l 38.277 72.863 l 39.746 70.285 +40.105 69.926 39.012 69.551 c 38.637 69.176 34.23 68.441 26.496 66.973 c + 31.277 73.973 33.855 77.285 34.23 77.285 c 34.59 77.645 34.59 77.645 34.965 + 77.645 c 35.324 77.645 35.699 76.91 36.434 75.801 c 37.168 76.176 l 33.121 + 82.426 l h +42.684 66.613 m 44.152 65.129 43.793 64.035 37.902 59.254 c 32.387 54.832 + 32.012 54.457 30.543 56.301 c 29.809 55.941 l 39.012 44.895 l 44.152 48.582 + l 43.793 49.316 l 37.543 44.895 33.855 52.254 33.855 52.254 c 33.855 52.629 + 35.699 54.098 39.746 57.41 c 41.59 54.457 41.215 53.363 39.371 51.879 c + 39.746 51.145 l 45.996 56.676 l 45.637 57.035 l 43.793 55.566 42.684 55.191 + 40.105 57.77 c 44.902 61.816 l 47.465 62.191 52.621 55.941 47.105 52.988 + c 47.465 52.629 l 52.262 56.301 l 43.059 66.973 l h +53.355 54.098 m 56.309 51.145 54.824 51.145 50.043 45.27 c 45.262 39.738 + 44.902 40.473 43.059 42.316 c 42.324 41.957 l 48.574 36.426 l 48.949 36.801 + l 46.371 39.379 46.73 39.004 52.262 44.52 c 53.355 43.426 l 54.824 41.957 + 54.824 40.848 53.355 38.645 c 50.418 34.223 51.152 33.488 51.887 32.754 + c 53.355 31.285 55.199 31.645 57.043 33.848 c 57.402 34.223 57.402 34.598 + 56.668 34.223 c 48.949 30.176 59.98 39.738 54.824 42.316 c 58.512 39.738 + 60.355 40.113 61.824 41.582 c 63.668 43.426 63.293 46.004 60.715 48.582 + c 54.09 54.832 l h +52.621 44.895 m 58.137 51.145 57.043 51.145 59.621 48.582 c 62.934 45.27 + 61.09 43.426 59.246 42.316 c 57.777 41.957 56.668 41.582 52.621 44.895 +c h +75.434 36.066 m 73.965 37.91 73.965 39.004 72.496 40.113 c 69.918 41.582 + 66.98 41.207 65.137 38.645 c 64.402 37.535 64.402 36.066 64.762 34.957 +c 65.137 33.848 65.871 32.754 66.98 31.645 c 69.918 27.973 70.652 27.238 + 69.184 25.395 c 68.074 23.926 66.605 23.551 64.027 25.02 c 61.449 26.488 + 60.715 29.801 62.559 33.113 c 61.824 33.848 l 58.137 28.332 l 58.887 27.598 + l 61.09 27.973 l 61.09 26.488 61.824 25.02 63.668 23.926 c 72.121 20.973 + 75.809 28.332 68.809 33.488 c 66.246 36.801 65.871 37.16 67.34 39.004 c + 68.449 40.113 70.293 40.473 72.121 39.379 c 73.965 37.91 74.699 35.691 +73.605 31.645 c 73.965 31.285 l 77.277 36.426 l 76.543 36.801 l h +79.121 34.223 m 80.23 33.848 80.965 33.113 80.965 32.02 c 80.965 31.285 + 78.746 27.238 74.699 20.238 c 74.34 19.504 73.23 19.504 71.387 20.613 c + 71.027 19.863 l 78.387 16.191 l 78.746 16.926 l 76.918 17.301 76.168 18.035 + 76.543 19.129 c 82.793 30.91 l 83.168 32.02 83.543 32.02 86.105 30.535 +c 86.48 31.285 l 79.48 34.957 l h +85.371 23.926 m 86.105 23.551 l 89.418 29.066 92.73 27.973 92.73 26.488 + c 93.105 26.129 92.371 23.926 90.527 19.863 c 89.059 15.816 87.949 13.254 + 87.59 12.879 c 87.215 12.504 86.105 12.879 85.012 13.613 c 84.637 12.879 + l 91.637 9.941 l 91.996 10.676 l 89.059 11.77 89.418 11.77 92.371 19.504 + c 94.215 23.551 94.949 25.395 95.309 25.754 c 96.418 26.129 100.09 26.488 + 98.262 18.77 c 99.355 18.395 l 101.199 24.66 l 88.324 29.801 l h +109.293 22.441 m 102.309 13.613 98.621 9.191 98.262 8.832 c 97.887 8.457 + 97.152 8.457 96.418 8.832 c 96.043 8.098 l 102.668 6.254 l 102.668 6.988 + l 98.996 7.723 99.73 8.457 102.309 12.145 c 108.934 9.941 l 110.027 5.145 + 108.934 5.145 107.09 5.52 c 106.715 4.785 l 113.34 2.941 l 113.715 3.676 + l 112.605 4.051 111.871 4.41 111.871 5.52 c 110.402 22.441 l 110.027 23.176 + 109.668 22.816 109.293 22.441 c h +108.934 11.035 m 103.043 12.879 l 107.824 19.504 l h +129.168 16.551 m 127.324 18.77 121.434 22.082 119.23 14.348 c 118.871 13.254 + 119.23 12.145 119.965 11.035 c 120.699 10.301 121.809 9.566 123.652 8.832 + c 128.059 6.988 128.434 6.988 128.434 4.41 c 128.434 2.582 126.59 1.473 + 124.012 1.832 c 121.074 2.207 118.871 4.41 118.871 8.457 c 117.762 8.457 + l 117.027 2.207 l 118.121 1.832 l 119.605 3.316 l 120.699 1.832 122.168 + 1.098 124.012 0.738 c 129.902 -0.371 131.012 5.879 129.902 7.723 c 129.543 + 9.191 128.059 9.941 124.746 11.41 c 120.699 13.613 120.699 13.254 120.699 + 15.816 c 121.074 17.301 122.918 18.395 124.746 18.035 c 127.324 17.66 128.434 + 16.191 129.543 11.77 c 130.277 11.77 l 130.637 18.035 l 129.902 18.035 +l h +142.043 16.551 m 144.996 16.551 144.621 16.551 144.621 15.457 c 145.355 + 3.316 l 145.355 1.473 144.996 0.738 143.152 0.738 c 143.152 0.004 l 149.777 + 0.363 l 149.777 1.098 l 147.199 1.098 146.465 2.207 146.465 4.051 c 145.73 + 16.926 l 153.09 0.738 l 153.824 0.738 l 158.246 17.66 l 159.34 2.941 l +159.34 2.582 158.98 1.832 157.871 1.832 c 156.402 1.832 l 156.762 1.098 +l 164.871 1.473 l 164.496 2.207 l 163.027 2.207 l 161.918 2.207 161.559 +2.207 161.559 3.316 c 160.809 16.551 l 160.809 17.66 160.449 18.035 163.387 + 18.035 c 163.387 18.77 l 157.496 18.395 l 153.824 4.051 l 147.199 17.66 + l 141.684 17.301 l h +171.48 20.973 m 169.277 9.566 168.168 3.676 167.809 3.316 c 167.809 2.941 + 167.434 2.941 166.34 2.582 c 166.34 1.832 l 172.59 2.941 l 172.59 3.676 + l 170.012 3.316 168.543 2.941 170.012 8.098 c 176.637 9.191 l 180.324 4.051 + 179.215 4.785 177.012 4.41 c 177.012 3.676 l 183.996 5.145 l 183.637 5.879 + l 182.527 5.52 181.793 5.879 181.418 6.629 c 172.59 20.973 l 171.855 21.707 + 171.855 21.348 171.48 20.973 c h +176.277 10.301 m 170.012 9.191 l 171.48 17.301 l h +191.355 25.02 m 189.887 25.395 180.684 25.754 183.996 18.035 c 185.105 +15.457 186.949 15.082 190.262 15.457 c 195.402 16.551 195.777 16.191 196.512 + 13.613 c 197.621 12.145 196.887 10.676 194.309 9.566 c 191.355 8.457 188.043 + 9.566 186.574 12.879 c 185.465 12.504 l 187.684 6.254 l 188.418 6.629 l + 189.887 8.832 l 190.996 7.723 192.824 7.723 194.668 8.457 c 200.559 10.301 + 198.715 16.926 196.512 17.66 c 195.402 18.77 194.309 18.77 190.262 18.395 + c 185.465 17.66 183.637 19.129 184.73 22.082 c 186.574 26.129 189.512 25.02 + 194.309 20.973 c 195.043 21.348 l 192.465 26.863 l 191.73 26.488 l h +200.184 30.535 m 201.293 19.504 201.668 13.613 201.293 13.254 c 200.934 + 12.879 200.559 12.145 199.824 11.77 c 200.184 11.41 l 206.074 14.348 l +205.715 15.082 l 203.871 13.613 202.402 13.988 202.402 18.395 c 208.293 +21.348 l 213.809 17.66 212.34 18.035 209.762 16.926 c 210.121 16.191 l 216.387 + 19.129 l 216.012 19.863 l 215.277 19.504 l 214.918 19.129 214.168 19.504 + 213.434 19.863 c 200.934 31.285 l 200.559 31.645 200.184 31.645 200.184 + 30.535 c h +207.559 22.082 m 202.027 19.504 l 201.293 27.598 l h +208.652 33.848 m 211.23 35.332 211.605 34.957 211.965 34.598 c 216.746 +27.598 219.324 23.551 219.324 22.816 c 219.699 22.441 218.965 21.707 217.855 + 20.973 c 218.23 20.238 l 224.84 24.66 l 224.48 25.395 l 221.902 23.551 +221.902 24.285 221.543 24.66 c 217.855 30.176 l 221.543 32.379 221.543 32.379 + 224.105 29.801 c 227.418 25.754 227.793 26.488 229.262 27.238 c 231.105 + 28.332 231.105 29.801 229.637 32.379 c 229.262 32.754 229.262 32.379 229.262 + 32.02 c 230.371 24.66 224.84 35.691 220.434 32.379 c 223.012 34.957 224.84 + 37.16 222.637 39.379 c 221.543 41.207 218.965 41.207 215.652 39.379 c 208.293 + 34.598 l h +217.48 30.91 m 213.074 37.16 213.074 36.426 215.652 37.91 c 221.902 41.582 + 224.84 35.691 217.48 30.91 c h +224.48 44.16 m 225.59 44.895 225.949 45.27 226.324 45.27 c 226.684 45.629 + 230.371 44.52 236.621 42.316 c 239.934 38.27 l 240.309 37.91 240.309 37.535 + 238.465 35.691 c 238.824 34.957 l 245.09 40.473 l 244.355 41.207 l 242.512 + 39.379 242.137 37.16 237.73 44.16 c 234.777 55.566 235.512 54.098 236.996 + 55.566 c 236.262 55.941 l 231.84 51.879 l 232.215 51.145 l 232.949 51.879 + l 233.309 52.254 234.418 52.254 234.777 51.879 c 235.152 51.52 235.512 +48.941 236.621 44.16 c 225.949 46.738 228.152 47.473 229.637 48.941 c 229.262 + 49.676 l 223.746 44.895 l h +238.465 57.035 m 239.934 58.879 240.309 58.504 240.668 58.145 c 247.293 + 52.629 250.605 49.316 250.98 48.941 c 251.34 48.582 251.34 47.832 250.246 + 46.738 c 250.98 46.363 l 256.121 52.254 l 255.387 52.988 l 253.559 50.051 + 253.559 50.785 249.496 54.098 c 249.137 57.77 l 259.809 57.77 258.699 56.301 + 256.871 54.457 c 257.605 54.098 l 262.387 59.988 l 261.652 60.348 l 261.277 + 59.988 260.918 59.613 260.168 59.254 c 259.809 59.254 255.762 59.613 248.762 + 60.348 c 247.668 67.707 248.027 68.441 249.137 69.926 c 248.402 70.285 +l 243.98 65.129 l 244.715 64.395 l 245.824 65.863 246.559 66.238 246.934 + 64.77 c 247.293 64.395 248.027 61.082 248.402 54.832 c 239.934 61.816 241.402 + 61.082 243.246 62.926 c 242.887 63.66 l 237.73 57.41 l h +249.871 71.395 m 251.34 73.973 251.34 73.973 252.809 72.863 c 260.168 68.441 + 263.855 65.863 264.23 65.504 c 264.59 65.129 264.23 64.035 263.121 62.926 + c 263.855 62.551 l 268.277 69.176 l 267.543 69.551 l 266.059 66.973 267.168 + 65.863 253.918 74.707 c 252.449 75.801 252.449 75.441 254.293 78.02 c 253.559 + 78.379 l 249.137 71.754 l h +256.871 86.113 m 264.59 78.379 268.277 74.332 268.637 73.238 c 269.012 +72.488 269.012 71.754 268.637 71.02 c 269.371 71.02 l 272.324 76.91 l 271.59 + 77.285 l 270.105 73.973 269.746 74.332 266.434 78.02 c 269.371 83.91 l +274.152 83.91 274.527 83.16 273.418 81.332 c 274.152 80.957 l 277.105 87.207 + l 276.371 87.582 l 275.996 86.848 275.637 86.473 274.527 86.113 c 257.23 + 87.207 l 256.871 87.207 256.121 87.207 256.871 86.113 c h +268.277 83.91 m 265.699 78.379 l 259.809 84.27 l h +261.652 93.098 m 262.746 95.676 261.652 96.785 274.902 91.27 c 276.371 +90.895 277.105 89.051 276.73 87.957 c 277.465 87.582 l 279.684 94.207 l +278.949 94.582 l 278.574 92.738 279.309 91.27 265.699 96.051 c 282.262 101.566 + l 282.621 102.301 l 273.418 105.613 268.637 107.457 268.277 107.816 c 267.902 + 108.191 267.543 108.926 267.902 110.395 c 267.168 110.77 l 265.324 104.879 + l 266.059 104.504 l 266.434 106.348 266.059 108.191 278.949 102.676 c 262.387 + 97.145 l 260.918 93.473 l h +281.152 107.457 m 282.621 106.348 282.996 105.613 282.621 104.145 c 283.355 + 104.145 l 284.824 110.395 l 284.09 110.77 l 283.355 107.457 283.355 107.082 + 279.309 110.035 c 280.777 116.66 l 287.402 118.488 285.574 116.66 285.199 + 114.816 c 285.934 114.816 l 287.402 121.441 l 286.668 121.801 l 286.309 + 120.707 285.934 120.332 285.199 119.973 c 268.277 117.395 l 267.902 117.395 + 267.168 117.395 267.902 116.66 c h +279.684 116.66 m 278.215 110.395 l 271.215 115.176 l h +279.684 116.66 m f +0.988235 0.831373 0.313726 rg +242.137 190.629 m 235.512 204.238 l 148.668 52.988 l 156.402 40.473 l h +117.762 150.504 m 109.668 136.895 l 157.871 136.895 l 165.605 150.504 l + h +153.09 71.02 m 126.23 121.066 l 116.293 121.441 l 108.184 136.52 l 111.871 + 142.785 l 94.574 173.332 l 78.387 173.332 l 145.355 56.676 l h +161.184 122.535 m 168.918 137.629 l 166.34 150.145 l 158.605 136.52 l h +135.418 40.113 m 155.668 40.113 l 147.934 52.629 l 128.434 52.629 l h +188.777 189.145 m 190.996 174.426 l 197.621 174.426 l 205.715 189.145 l + h +187.309 203.504 m 180.324 190.988 l 182.527 175.16 l 188.043 185.473 l +187.309 189.879 l 189.512 193.566 l h +48.574 191.723 m 179.59 191.723 l 186.574 204.613 l 56.668 204.613 l h +48.574 191.723 m f Q Q showpage %%Trailer 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 5cb3ae70421..97dc5ad3de6 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 d3e41d72738..d8aa1c2fc69 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 61537e2e57c..c802ca57248 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 8b5e0bd337f..ad7521f7a3f 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 f83d94cda72..41c62081b11 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 0bc66d0b8cf..5ce4989d33e 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 37063b8ab48..bae66eef509 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 1566df8e3bc..019a8abfd3d 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 fadcd90105a..e66cbaa7178 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 389316c98e8..664148cbcbf 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 dc35e82f4a3..247ea2f725e 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 829ae2099c0..b7a280fe6b2 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 e7d398e68a5..28123e82e9e 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 d3276a6068a..78305482091 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 1f53c795920..6bb868ae327 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 428d4f7e625..3e4c2975714 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-fsps.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty index a46ea20fb28..b3d6bd4325c 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}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/15] \thesis@color@setup{ links={HTML}{93BCF5}, tableEmph={HTML}{A8BDE3}, @@ -60,7 +60,70 @@ style=iso-authoryear, sorting=nty} \thesis@bibliography@load -\thesis@blocks@titlePage@field@true +\thesis@require{tikz} +\thesis@require{geometry} +\thesis@require{setspace} +\geometry{top=30mm,bottom=30mm,left=40mm,right=30mm,includeheadfoot} +\setlength{\parindent}{1.25cm} +\def\thesis@blocks@titlePage@footer{% + {\thesis@titlePage@large + {% Calculate the width of the thesis author and advisor boxes + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@@{advisorTitle}:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{\thesis@advisor} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@@{authorTitle}:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} + \let\@E\relax\newlength{\@E}\settowidth{\@E}{\thesis@field} + \let\@F\relax\newlength{\@F}\pgfmathsetlength{\@F}{max(\@D,\@E)} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B)} + \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% + max(\@C,\@F)} + % Typeset the thesis author and advisor boxes + \vskip 2in\begin{minipage}[t]{\@left} + {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor + \end{minipage}\hfill\begin{minipage}[t]{\@right} + {\bf\thesis@@{authorTitle}:}\\\thesis@author\\\thesis@field + \end{minipage}}\\[4em]\thesis@place, \thesis@year}} +\def\thesis@blocks@frontMatter{% + \thesis@blocks@clear + \pagestyle{plain} + \parindent 1.5em + \setcounter{page}{1} + \pagenumbering{roman} + \onehalfspacing} +\def\thesis@blocks@mainMatter{% + \thesis@blocks@clear + \setcounter{page}{1} + \pagenumbering{arabic} + \pagestyle{thesisheadings} + \parindent 1.5em + \onehalfspacing} +\def\thesis@blocks@bibliography{% + \ifthesis@bibliography@loaded@ + \ifthesis@bibliography@included@\else + \singlespacing + \thesis@blocks@clear + {\emergencystretch=3em% + \printbibliography[heading=bibintoc]}% + \fi + \fi} +\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@@{formattedDate}\hfill + \begin{minipage}[t]{\@A}% + \centering\rule{\@A}{1pt}\\ + \thesis@@{authorSignature}\par + \end{minipage}} + \end{alwayssingle}} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover -- cgit v1.2.3