diff options
Diffstat (limited to 'Master/texmf-dist/source')
6 files changed, 271 insertions, 60 deletions
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 + <<neznámý měsíc (\the\@month)>> + \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 - <<neznámý měsíc (\the\@month)>> - \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 + <<unknown month (\the\@month)>> + \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 + <<neznámy mesiac (\the\@month)>> + \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 %</mu/fss> @@ -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} |