From 0cf37a0dcbc1de449eda38e14e357dd7b19dc5dd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Mar 2016 22:03:32 +0000 Subject: fithesis (25mar16) git-svn-id: svn://tug.org/texlive/trunk@40137 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fithesis/fithesis.pdf | Bin 566911 -> 593913 bytes .../doc/latex/fithesis/guide/mu/econ.pdf | Bin 383246 -> 383293 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf | Bin 367030 -> 367070 bytes .../doc/latex/fithesis/guide/mu/fsps.pdf | Bin 360665 -> 360660 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf | Bin 363028 -> 363042 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/law.pdf | Bin 370635 -> 370627 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/med.pdf | Bin 361086 -> 361151 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf | Bin 364092 -> 363819 bytes .../doc/latex/fithesis/guide/mu/phil.pdf | Bin 361468 -> 361892 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf | Bin 401802 -> 401713 bytes .../texmf-dist/source/latex/fithesis/fithesis.dtx | 44 +++++++--- .../source/latex/fithesis/locale/czech.dtx | 80 +++++++++++------- .../source/latex/fithesis/locale/english.dtx | 42 +++++----- .../source/latex/fithesis/locale/slovak.dtx | 82 ++++++++++++------- .../source/latex/fithesis/style/mu/base.dtx | 90 +++++++++++++++------ .../source/latex/fithesis/style/mu/econ.dtx | 13 +-- .../source/latex/fithesis/style/mu/fi.dtx | 5 +- .../source/latex/fithesis/style/mu/law.dtx | 10 +-- .../source/latex/fithesis/style/mu/med.dtx | 26 +----- .../source/latex/fithesis/style/mu/ped.dtx | 33 ++------ .../source/latex/fithesis/style/mu/phil.dtx | 73 ++++++++++++++++- .../source/latex/fithesis/style/mu/sci.dtx | 14 ++-- Master/texmf-dist/tex/latex/fithesis/fithesis3.cls | 8 +- .../tex/latex/fithesis/locale/fithesis-czech.def | 14 ++-- .../tex/latex/fithesis/locale/fithesis-english.def | 8 +- .../tex/latex/fithesis/locale/fithesis-slovak.def | 14 ++-- .../latex/fithesis/locale/mu/fithesis-czech.def | 5 +- .../latex/fithesis/locale/mu/fithesis-english.def | 5 +- .../latex/fithesis/locale/mu/fithesis-slovak.def | 5 +- .../fithesis/locale/mu/med/fithesis-czech.def | 5 +- .../fithesis/locale/mu/med/fithesis-english.def | 5 +- .../fithesis/locale/mu/med/fithesis-slovak.def | 5 +- .../fithesis/locale/mu/ped/fithesis-czech.def | 5 +- .../fithesis/locale/mu/ped/fithesis-english.def | 5 +- .../fithesis/locale/mu/ped/fithesis-slovak.def | 5 +- .../fithesis/locale/mu/phil/fithesis-czech.def | 40 ++++++--- .../fithesis/locale/mu/phil/fithesis-english.def | 8 +- .../fithesis/locale/mu/phil/fithesis-slovak.def | 45 +++++++---- .../fithesis/locale/mu/sci/fithesis-czech.def | 3 +- .../fithesis/locale/mu/sci/fithesis-english.def | 3 +- .../latex/fithesis/logo/mu/fithesis-base-color.pdf | Bin 15999 -> 15999 bytes .../tex/latex/fithesis/logo/mu/fithesis-base.pdf | Bin 15988 -> 15988 bytes .../latex/fithesis/logo/mu/fithesis-econ-color.pdf | Bin 34491 -> 34491 bytes .../tex/latex/fithesis/logo/mu/fithesis-econ.pdf | Bin 12932 -> 12932 bytes .../latex/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11808 -> 11808 bytes .../tex/latex/fithesis/logo/mu/fithesis-fi.pdf | Bin 11624 -> 11624 bytes .../latex/fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 12560 -> 12560 bytes .../tex/latex/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11730 -> 11730 bytes .../latex/fithesis/logo/mu/fithesis-fss-color.pdf | Bin 11933 -> 11933 bytes .../tex/latex/fithesis/logo/mu/fithesis-fss.pdf | Bin 11590 -> 11590 bytes .../latex/fithesis/logo/mu/fithesis-law-color.pdf | Bin 18971 -> 18971 bytes .../tex/latex/fithesis/logo/mu/fithesis-law.pdf | Bin 18435 -> 18435 bytes .../latex/fithesis/logo/mu/fithesis-med-color.pdf | Bin 11116 -> 11116 bytes .../tex/latex/fithesis/logo/mu/fithesis-med.pdf | Bin 10590 -> 10590 bytes .../latex/fithesis/logo/mu/fithesis-ped-color.pdf | Bin 11027 -> 11027 bytes .../tex/latex/fithesis/logo/mu/fithesis-ped.pdf | Bin 10492 -> 10492 bytes .../latex/fithesis/logo/mu/fithesis-phil-color.pdf | Bin 12736 -> 12736 bytes .../tex/latex/fithesis/logo/mu/fithesis-phil.pdf | Bin 12180 -> 12180 bytes .../latex/fithesis/logo/mu/fithesis-sci-color.pdf | Bin 25965 -> 25965 bytes .../tex/latex/fithesis/logo/mu/fithesis-sci.pdf | Bin 25494 -> 25494 bytes .../tex/latex/fithesis/style/mu/fithesis-base.sty | 40 ++++++--- .../tex/latex/fithesis/style/mu/fithesis-econ.sty | 8 +- .../tex/latex/fithesis/style/mu/fithesis-law.sty | 4 +- .../tex/latex/fithesis/style/mu/fithesis-med.sty | 13 +-- .../tex/latex/fithesis/style/mu/fithesis-ped.sty | 18 ++--- .../tex/latex/fithesis/style/mu/fithesis-phil.sty | 37 ++++++++- .../tex/latex/fithesis/style/mu/fithesis-sci.sty | 14 ++-- 67 files changed, 518 insertions(+), 316 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf index 2c2a1aa70bd..11d0b2cf5ee 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 73c7a1afe4a..7b933cff441 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 7f282ec7ddf..b23e4a1f3d1 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 7b899b6ee79..4fc8f1f4f28 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 2e80de94d4d..128261d8f4f 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 6f99791e397..d7628c8184d 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 97205e1f64e..6fab8ab281b 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 2ea691feba0..be3823b940b 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 da6ec10bac2..ce2fd33692b 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 53f0b1f4c15..01e9bf4b7af 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 fd7e796cfe9..5d4b06d465c 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,11 +56,21 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.34}{2016/02/24}} +\thesis@versiondef{v0.3.35}{2016/03/23}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.35:3}{2016/03/23}{Fixed \cs{l@}\textit{locale} +% being possibly undefined in a LuaLaTeX run.} +% \changes{v0.3.35:2}{2016/03/22}{Added support for seminar papers +% on the \textsf{fithesis3} class level. The style files for the +% faculties of the Masaryk University in Brno do not provide any +% special handling of this thesis type yet.} +% \changes{v0.3.35:1}{2016/03/22}{Added support for the Division of +% Information and Library Studies of the Faculty of Arts at the +% Masaryk University in Brno. This support is enabled by +% specifying \cs{thesis@department} to be \texttt{kisk}.} % \changes{v0.3.34} {2016/02/24}{Added visual tests of output % PDFs. The \texttt{test/} directory is now also uses the % \textit{university}\texttt{/}\textit{faculty} path scheme @@ -629,22 +639,25 @@ % The \marg{\texttt{type}=type} pair sets the type of the thesis % to \textit{type}. The following types of theses are recognized: % \begin{center}\begin{tabular}{lc}\toprule -% The thesis type & The value of \textit{type} \\\midrule +% The thesis type & The value of \textit{type} \\\midrule +% Seminar paper & \texttt{sem} \\ % Bachelor's thesis & \texttt{bc} \\ -% Master's thesis & \texttt{mgr} \\ -% Doctoral thesis & \texttt{d} \\ -% Rigorous thesis & \texttt{r} \\\bottomrule +% Master's thesis & \texttt{mgr} \\ +% Doctoral thesis & \texttt{d} \\ +% Rigorous thesis & \texttt{r} \\\bottomrule % \end{tabular}\end{center} % The \textit{type} is stored within the |\thesis@type| macro, % whose implicit value is |bc|. For the ease of testing of the % thesis type via |\ifx| conditions within style and locale files, -% the \DescribeMacro{\thesis@bachelors}|\thesis@bachelors|, +% the \DescribeMacro{\thesis@sempaper}|\thesis@sempaper|, +% \DescribeMacro{\thesis@bachelors}|\thesis@bachelors|, % \DescribeMacro{\thesis@masters}|\thesis@masters|, % \DescribeMacro{\thesis@doctoral}|\thesis@doctoral| and % \DescribeMacro{\thesis@rigorous}|\thesis@rigorous| macros % containing the corresponding \textit{type} values are available % as a part of the private API. % \begin{macrocode} +\def\thesis@sempaper{sem} \def\thesis@bachelors{bc} \def\thesis@masters{mgr} \def\thesis@doctoral{d} @@ -698,10 +711,10 @@ % \subsubsection{The \texttt{department} key} % The \marg{\texttt{department}=name} pair sets the name of the % department, at which the thesis is being written, to -% \textit{name}. Unlike the university and faculty identifiers, the -% department \textit{name} is only used for typesetting and it -% should therefore be specified in plain language with optional -% \TeX\ macros. The \textit{name} is stored within the +% \textit{name}. Unlike the university and faculty identifiers, +% \textsf{fithesis3} does not prescribe the format of the +% \textit{name}; the style files may internally parse it, or +% typeset it as-is. The \textit{name} is stored within the % |\thesis@department| macro. % \begin{macrocode} \thesis@def{department} @@ -1261,6 +1274,17 @@ \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} % \end{macrocode} +% Coerce LuaTeX into defining |\l@|\textit{locale} for +% \textit{locale}s with known hyphenation patterns, unless +% \textsf{babel} has been loaded. In that case +% |\l@|\textit{locale} has already been defined. +% \begin{macrocode} + \ifluatex + \ltx@ifpackageloaded{babel}{}{ + % See + \RequirePackage[base]{babel}} + \fi +% \end{macrocode} % If the \textsf{babel} or \textsf{polyglossia} locale is identical % to the thesis locale, the |\thesis@selectLocale| macro will be % used to globally set up the \textsf{csquotes} style appropriate for diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 90bd93292f8..ff39c373c4c 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/01/13] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/03/22] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -45,7 +45,9 @@ \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminární práce% + \else\ifx\thesis@type\thesis@bachelors Bakalářská práce% \else\ifx\thesis@type\thesis@masters Diplomová práce% @@ -55,9 +57,11 @@ Rigorózní práce% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminární práci% + \else\ifx\thesis@type\thesis@bachelors Bakalářskou práci% \else\ifx\thesis@type\thesis@masters Diplomovou práci% @@ -67,7 +71,7 @@ Rigorózní práci% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fithesis-czech.def} @@ -78,7 +82,7 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/11/17] +\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22] % Zástupné texty \gdef\thesis@czech@universityName{Masarykova univerzita} @@ -88,6 +92,10 @@ použil\thesis@czech@gender@koncovka\ jen prameny uvedené~v seznamu literatury.} +% Bibliografický záznam +\gdef\thesis@czech@bib@title{Bibliografický záznam} +\gdef\thesis@czech@bib@pages{str} + % Různé \gdef\thesis@czech@idTitle{UČO} % \end{macrocode}\iffalse @@ -175,17 +183,13 @@ % \iffalse %<*mu/med> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23] % Různé \gdef\thesis@czech@abstractTitle{Anotace} % Zástupné texty \gdef\thesis@czech@facultyName{Lékařská fakulta} - -% Bibliografický záznam -\gdef\thesis@czech@bib@title{Bibliografický záznam} -\gdef\thesis@czech@bib@pages{str} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fi/fithesis-czech.def} @@ -228,39 +232,60 @@ % correct value. It also redefines the \texttt{declaration}, % \texttt{typeName} and \texttt{typeName@akuzativ} strings in % accordance with the requirements of the faculty. +% +% The locale file also defines the \texttt{departmentName} +% string, which is used by the \texttt{style/mu/fithesis-phil^^A +% .sty} style file, when typesetting the names of known +% departments. % \iffalse %<*mu/phil> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/01/07] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/03/22] % Zástupné texty \gdef\thesis@czech@facultyName{Filozofická fakulta} +\gdef\thesis@czech@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Kabinet informačních studií a knihovnictví% + \else + <>% + \fi} \gdef\thesis@czech@declaration{% - Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} - vypracoval\thesis@czech@gender@koncovka\ samostatně~s využitím - uvedené literatury.} + \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á + 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 + uvedené literatury.% + \fi} % Ostatní +\global\let\thesis@czech@typeName@super + \thesis@czech@typeName \gdef\thesis@czech@typeName{% \ifx\thesis@type\thesis@bachelors Bakalářská diplomová práce% \else\ifx\thesis@type\thesis@masters Magisterská diplomová práce% - \else\ifx\thesis@type\thesis@doctoral - Disertační práce% \else - <>% - \fi\fi\fi} + \thesis@czech@typeName@super + \fi\fi} + +\global\let\thesis@czech@typeName@akuzativ@super + \thesis@czech@typeName@akuzativ \gdef\thesis@czech@typeName@akuzativ{% \ifx\thesis@type\thesis@bachelors Diplomovou práci% \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral - Disertační práci% \else - <>% - \fi\fi\fi} + \thesis@czech@typeName@akuzativ@super + \fi\fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/ped/fithesis-czech.def} @@ -275,14 +300,10 @@ % \iffalse %<*mu/ped> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/ped/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-czech.def}[2016/03/22] % Zástupné texty \gdef\thesis@czech@facultyName{Pedagogická fakulta} - -% Bibliografický záznam -\gdef\thesis@czech@bib@title{Bibliografický záznam} -\gdef\thesis@czech@bib@pages{str} % \end{macrocode}\iffalse % % \fi\file{locale/mu/sci/fithesis-czech.def} @@ -298,7 +319,7 @@ % \iffalse %<*mu/sci> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/01/12] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/03/23] % Zástupné texty \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -347,7 +368,6 @@ \thesis@year}} % Bibliografický záznam -\gdef\thesis@czech@bib@title{Bibliografický záznam} \global\let\thesis@czech@bib@author\thesis@czech@authorTitle \gdef\thesis@czech@bib@thesisTitle{Název práce} \gdef\thesis@czech@bib@programme{Studijní program} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 8effab18e32..96ce9bdd6c6 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/01/13] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/03/22] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -34,7 +34,9 @@ \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} \gdef\thesis@english@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminar Paper% + \else\ifx\thesis@type\thesis@bachelors Bachelor's Thesis% \else\ifx\thesis@type\thesis@masters Master's Thesis% @@ -44,7 +46,7 @@ Rigorous Thesis% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fithesis-english.def} @@ -55,7 +57,7 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2015/11/30] +\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22] \gdef\thesis@english@universityName{Masaryk University} \gdef\thesis@english@declaration{% Hereby I declare that this paper is my original authorial work, @@ -63,6 +65,10 @@ literature used or excerpted during elaboration of this work are properly cited and listed in complete reference to the due source.} +% Bibliographic entry +\gdef\thesis@english@bib@title{Bibliographic record} +\gdef\thesis@english@bib@pages{p} + % Miscellaneous \gdef\thesis@english@idTitle{UČO} % \end{macrocode}\iffalse @@ -144,17 +150,13 @@ % \iffalse %<*mu/med> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23] % Miscellaneous \gdef\thesis@english@abstractTitle{Annotation} % Placeholders \gdef\thesis@english@facultyName{Faculty of Medicine} - -% Bibliographic entry -\gdef\thesis@english@bib@title{Bibliographic record} -\gdef\thesis@english@bib@pages{p} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fi/fithesis-english.def} @@ -187,12 +189,21 @@ % This is the English locale file specific to the Faculty of % Arts at the Masaryk University in Brno. % It replaces the \texttt{facultyName} placeholder with the -% correct value. +% correct value. It also defines the \texttt{departmentName} +% string, which is used by the \texttt{style/mu/fithesis-phil^^A +% .sty} style file, when typesetting the names of known +% departments. % \iffalse %<*mu/phil> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/phil/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-english.def}[2016/03/22] \gdef\thesis@english@facultyName{Faculty of Arts} +\gdef\thesis@english@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Division of Information and Library Studies% + \else + <>% + \fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/ped/fithesis-english.def} @@ -207,14 +218,10 @@ % \iffalse %<*mu/ped> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/ped/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-english.def}[2016/03/22] % Placeholders \gdef\thesis@english@facultyName{Faculty of Education} - -% Bibliographic entry -\gdef\thesis@english@bib@title{Bibliographic record} -\gdef\thesis@english@bib@pages{p} % \end{macrocode}\iffalse % % \fi\file{locale/mu/sci/fithesis-english.def} @@ -230,7 +237,7 @@ % \iffalse %<*mu/sci> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23] % Placeholders \gdef\thesis@english@facultyName{Faculty of Science} @@ -239,7 +246,6 @@ \global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor % Bibliographic entry -\gdef\thesis@english@bib@title{Bibliographic entry} \global\let\thesis@english@bib@author\thesis@english@authorTitle \gdef\thesis@english@bib@thesisTitle{Title of Thesis} \gdef\thesis@english@bib@programme{Degree Programme} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 91d13745198..8fc9056f053 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/01/13] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/03/22] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -45,7 +45,9 @@ \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminárna práca% + \else\ifx\thesis@type\thesis@bachelors Bakalárska práca% \else\ifx\thesis@type\thesis@masters Diplomová práca% @@ -55,9 +57,11 @@ Rigorózna práca% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminárnu prácu% + \else\ifx\thesis@type\thesis@bachelors Bakalársku prácu% \else\ifx\thesis@type\thesis@masters Diplomovú prácu% @@ -67,7 +71,7 @@ Rigoróznu prácu% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fithesis-slovak.def} @@ -78,7 +82,7 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/11/17] +\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22] % Zástupné texty \gdef\thesis@slovak@universityName{Masarykova univerzita} @@ -88,6 +92,10 @@ \thesis@slovak@gender@koncovka\ samostatne len s~použitím uvedenej literatúry a prameňov.} +% Bibliografický zoznam +\gdef\thesis@slovak@bib@title{Bibliografický záznam} +\gdef\thesis@slovak@bib@pages{str} + % Rôzne \gdef\thesis@slovak@idTitle{UČO} % \end{macrocode}\iffalse @@ -176,17 +184,13 @@ % \iffalse %<*mu/med> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23] % Rôzne \gdef\thesis@slovak@abstractTitle{Anotácie} % Zástupné texty \gdef\thesis@slovak@facultyName{Lekárska fakulta} - -% Bibliografický zoznam -\gdef\thesis@slovak@bib@title{Bibliografický záznam} -\gdef\thesis@slovak@bib@pages{str} % \end{macrocode}\iffalse % % \fi\file{locale/mu/fi/fithesis-slovak.def} @@ -230,41 +234,61 @@ % and redefines the \texttt{typeName} and % \texttt{typeName@akuzativ} strings in accordance with the % requirements of the faculty. +% +% The locale file also defines the \texttt{departmentName} +% string, which is used by the \texttt{style/mu/fithesis-phil^^A +% .sty} style file, when typesetting the names of known +% departments. % \iffalse %<*mu/phil> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/01/07] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/03/22] % Zástupné texty \gdef\thesis@slovak@facultyName{Filozofická fakulta} -\gdef\thesis@slovak@declaration{% - Prehlasujem, že som predloženú \thesis@lower{% - slovak@typeName@akuzativ} vypracoval% - \thesis@slovak@gender@koncovka\ samostatne na - základe vlastných zistení a len s~použitím - uvedenej literatúry a prameňov.} +\gdef\thesis@slovak@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Kabinet informačných štúdií a knihovníctva% + \else + <>% + \fi} +\gdef\thesis@czech@declaration{% + \ifx\thesis@department\thesis@departments@kisk + Prehlasujem, ž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á + verzia tejto práce bola sprístupnená cez informačný + systém Masarykovej univerzity.% + \else + Prehlasujem, že som predloženú \thesis@lower{% + slovak@typeName@akuzativ} vypracoval% + \thesis@slovak@gender@koncovka\ samostatne na základe vlastných + zistení a len s~použitím uvedenej literatúry a prameňov.% + \fi} % Rôzne +\global\let\thesis@slovak@typeName@super + \thesis@slovak@typeName \gdef\thesis@slovak@typeName{% \ifx\thesis@type\thesis@bachelors Bakalárska diplomová práca% \else\ifx\thesis@type\thesis@masters Magisterská diplomová práca% - \else\ifx\thesis@type\thesis@doctoral - Dizertačná práca% \else - <>% - \fi\fi\fi} + \thesis@slovak@typeName@super + \fi\fi} + +\global\let\thesis@slovak@typeName@akuzativ@super + \thesis@slovak@typeName@akuzativ \gdef\thesis@slovak@typeName@akuzativ{% \ifx\thesis@type\thesis@bachelors Diplomovú prácu% \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral - Dizertačnú prácu% \else - <>% - \fi\fi\fi} + \thesis@slovak@typeName@akuzativ@super + \fi\fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/ped/fithesis-slovak.def} @@ -279,14 +303,10 @@ % \iffalse %<*mu/ped> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22] % Zástupné texty \gdef\thesis@slovak@facultyName{Pedagogická fakulta} - -% Bibliografický zoznam -\gdef\thesis@slovak@bib@title{Bibliografický záznam} -\gdef\thesis@slovak@bib@pages{str} % \end{macrocode}\iffalse % % \fi\file{locale/mu/sci/fithesis-slovak.def} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx index 646be523ba4..1af3d32430d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -7,7 +7,7 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/01/07] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/03/22] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -114,20 +114,26 @@ % the option to be processed by the \textsf{xcolor} package as % well and it is therefore an elegant solution to the problem % at hand. -% \item\texttt{lot}, \texttt{nolot} -- |\listoftables| either is -% or isn't going to be included in the -% \DescribeMacro{\thesis@blocks@tables}|\thesis@|^^A -% \discretionary{}{}{}|blocks@tables| block, respectively. +% \item\texttt{lot}, \texttt{nolot} -- The \DescribeMacro{^^A +% \thesis@blocks@lot}|\thesis@blocks@lot| macro will be defined +% as either |\listoftables| or |\relax|, respectively. As a +% side effect, the |\listoftables| either is or isn't going to +% be included in the \DescribeMacro{\thesis@blocks@tables}^^A +% |\thesis@|\discretionary{}{}{}|blocks@tables| block, +% respectively. % \begin{macrocode} -\DeclareOption{nolot}{\def\thesis@blocks@lot{}} +\DeclareOption{nolot}{\let\thesis@blocks@lot\relax} \DeclareOption{lot}{\let\thesis@blocks@lot\listoftables} % \end{macrocode} -% \item\texttt{lof}, \texttt{nolof} -- |\listoffigures| is or -% isn't going to be included in the -% \DescribeMacro{\thesis@blocks@tables}|\thesis@|^^A -% \discretionary{}{}{}|blocks@tables| block, respectively. +% \item\texttt{lot}, \texttt{nolot} -- The \DescribeMacro{^^A +% \thesis@blocks@lof}|\thesis@blocks@lof| macro will be defined +% as either |\listoffigures| or |\relax|, respectively. As a +% side effect, the |\listoffigures| either is or isn't going to +% be included in the \DescribeMacro{\thesis@blocks@tables}^^A +% |\thesis@|\discretionary{}{}{}|blocks@tables| block, +% respectively. % \begin{macrocode} -\DeclareOption{nolof}{\def\thesis@blocks@lof{}} +\DeclareOption{nolof}{\let\thesis@blocks@lof\relax} \DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures} % \end{macrocode} % \item\texttt{cover}, \texttt{nocover} -- The @@ -308,16 +314,16 @@ \let\thesis@newtable@oldx\tabularx \let\endthesis@newtable@oldx\endtabularx \renewenvironment{tabularx}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldx}% {\endthesis@newtable@oldx} % The redefinition of `tabu` \let\thesis@newtable@oldtabu\tabu \let\endthesis@newtable@oldtabu\endtabu \renewenvironment{tabu}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldtabu}% {\endthesis@newtable@oldtabu} \fi @@ -484,6 +490,18 @@ \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} % \end{macrocode} +% The |\thesis@department@name| and |\thesis@field@name| macros and +% their English counterparts provide a level of indirection that +% allows the subsequently loaded style files to parse the values of +% |\thesis@department| and |\thesis@field| (and their English +% counterparts) and map them to human-readable names, which will +% then be typeset. +% \begin{macrocode} +\let\thesis@department@name\thesis@department +\let\thesis@departmentEn@name\thesis@departmentEn +\let\thesis@field@name\thesis@field +\let\thesis@fieldEn@name\thesis@fieldEn +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@cover} % The |\thesis@blocks@cover| macro typesets the thesis % cover. It is composed of three macros: @@ -558,11 +576,11 @@ \fi\ifthesis@blocks@cover@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@cover@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@cover@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \def\thesis@blocks@cover@content{% {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}% @@ -646,23 +664,29 @@ \fi\ifthesis@blocks@titlePage@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@titlePage@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@titlePage@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content \let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@toc} +% The |\thesis@blocks@toc| macro typesets the table of contents. +% \begin{macrocode} +\def\thesis@blocks@toc{% + \thesis@blocks@clear + \tableofcontents} +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@tables} % The |\thesis@blocks@tables| macro typesets the table of -% contents and optionally the |\listoftables| and the -% |\listoffigures|. +% contents and optionally the list of tables and the +% list of figures. % \begin{macrocode} \def\thesis@blocks@tables{% - \thesis@blocks@clear - \tableofcontents + \thesis@blocks@toc \thesis@blocks@lot \thesis@blocks@lof} % \end{macrocode} @@ -814,6 +838,26 @@ \pagestyle{thesisheadings} \parindent 1.5em\relax} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@bibEntry} +% The |\thesis@blocks@bibEntry| macro typesets a bibliographical +% entry. Along with the macros required by the locale file +% interface, the \textit{locale} files need to define the following +% strings: +% \begin{itemize} +% \item\texttt{bib@title} -- The title of the entire block +% \item\texttt{bib@pages} -- The abbreviation of pages used in +% the bibliographical entry +% \end{itemize} +% \begin{macrocode} +\def\thesis@blocks@bibEntry{% + \chapter*{\thesis@@{bib@title}} + \noindent\thesis@upper{author@tail}, \thesis@author@head. + \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, + \thesis@@{facultyName}, \thesis@department@name, \thesis@year. + \thesis@pages\ \thesis@@{bib@pages}. + \thesis@@{advisorTitle}: \thesis@advisor + \thesis@blocks@clearRight} +% \end{macrocode} % \end{macro} % The rest of the file comprises redefinitions of \LaTeX\ commands % and private \texttt{rapport3} class macros altering the layout of diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx index 606c9133f8b..0e0b079739d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -120,20 +120,11 @@ \fi\pagestyle{thesisheadings} \parindent 1.5em\relax} % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@toc} -% The |\thesis@blocks@toc| macro typesets the table of -% contents. -% \begin{macrocode} -\def\thesis@blocks@toc{% - \thesis@blocks@clear - \tableofcontents} -% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@tables} % The |\thesis@blocks@tables| macro optionally typesets the % |\listoftables| and |\listoffigures|. % \begin{macrocode} \def\thesis@blocks@tables{% - \thesis@blocks@clear \thesis@blocks@lot \thesis@blocks@lof} % \end{macrocode} @@ -142,7 +133,7 @@ % |\thesis@blocks@lot| and |\thesis@blocks@lof| macros are % redefined to create an entry in the table of contents. % \begin{macrocode} -\ifx\thesis@blocks@lot\empty\else +\ifx\thesis@blocks@lot\relax\else \def\thesis@blocks@lot{% \thesis@blocks@clear \phantomsection @@ -150,7 +141,7 @@ \listoftables} \fi -\ifx\thesis@blocks@lof\empty\else +\ifx\thesis@blocks@lof\relax\else \def\thesis@blocks@lof{% \thesis@blocks@clear \phantomsection diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx index c107b8311d9..2324918d90b 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx @@ -30,10 +30,9 @@ % include the thesis advisor's name and signature in case of a % rigorous thesis. Along with the macros required by the % locale file interface, the locale files need to define the -% following macros: +% following strings: % \begin{itemize} -% \item\DescribeMacro{\thesis@advisorSignature}% -% |\thesis@advisorSignature| -- The label of the advisor +% \item\texttt{advisorSignature} -- The label of the advisor % signature field typeset in the case of rigorous theses % \end{itemize} % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx index d511c4cb87f..88c5f9a6557 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx @@ -6,7 +6,7 @@ % o/law/ud/predp/smer/S-07-2012.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/03/22] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -19,15 +19,15 @@ % The style file configures the cover and title page headers to % include only the faculty name and the department name. % Along with the macros required by the locale file interface, -% the locale files need to define the following macros: +% the locale files need to define the following strings: % \begin{itemize} -% \item|\thesis@|\textit{locale}|@facultyLongName| -- The name -% of the faculty combined with the name of the university. +% \item\texttt{facultyLongName} -- The name of the faculty +% combined with the name of the university. % \end{itemize} % \begin{macrocode} \def\thesis@blocks@cover@header{% {\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\% - \thesis@titlePage@large\thesis@department\\\vskip 2em}} + \thesis@titlePage@large\thesis@department@name\\\vskip 2em}} \let\thesis@blocks@titlePage@header=\thesis@blocks@cover@header % \end{macrocode} % \begin{macro}{\thesis@blocks@frontMatter} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx index 16c72d811bf..1174710d2f0 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx @@ -7,7 +7,7 @@ % ZITOSTI_ZAVERECNE_PRACE.doc}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/02/18] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/03/22] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -76,7 +76,7 @@ \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} \let\@E\relax\newlength{\@E}\settowidth{\@E}{{% \bf\thesis@@{fieldTitle}:}} - \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field@name} \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% max(\@A,\@B)} \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% @@ -86,7 +86,7 @@ {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor \end{minipage}\hfill\begin{minipage}[t]{\@right} {\bf\thesis@@{authorTitle}:}\\\thesis@author - \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field + \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field@name \end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}} % \end{macrocode} % \begin{macro}{\thesis@blocks@frontMatter} @@ -124,26 +124,6 @@ \parindent 1.5em \onehalfspacing} % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@bibEntry} -% The |\thesis@blocks@bibEntry| macro typesets a -% bibliographical entry. Along with the macros required by the -% locale file interface, the \textit{locale} files need to define -% the following macros: -% \begin{itemize} -% \item|\thesis@|\emph{locale}|@bib@title| -- The title of the -% entire block -% \item|\thesis@|\emph{locale}|@bib@pages| -- The abbreviation of -% pages used in the bibliographical entry -% \end{itemize} -% \begin{macrocode} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} -% \end{macrocode} % \end{macro} % All blocks within the autolayout postamble that are not defined % within this file are defined in the diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx index e3491504715..86204f51617 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx @@ -6,7 +6,7 @@ % do/ped/VPAN/pokdek/Pokyn_dekana_c._1-2010__2_.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/03/22] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -17,7 +17,7 @@ tableEven={HTML}{FFDEB7}} % \end{macrocode} % The style file configures the title page header to include the -% department name and the title page content to include +% department name and the title page content to include the % advisor's name. % \begin{macrocode} \thesis@blocks@titlePage@department@true @@ -29,26 +29,6 @@ {\thesis@titlePage@large\\[0.3in] {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} % \end{macrocode} -% \begin{macro}{\thesis@blocks@bibEntry} -% The |\thesis@blocks@bibEntry| macro typesets a -% bibliographical entry. Along with the macros required by the -% locale file interface, the \textit{locale} files need to define -% the following macros: -% \begin{itemize} -% \item|\thesis@|\emph{locale}|@bib@title| -- The title of the -% entire block -% \item|\thesis@|\emph{locale}|@bib@pages| -- The abbreviation of -% pages used in the bibliographical entry -% \end{itemize} -% \begin{macrocode} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} -% \end{macrocode} % \end{macro} % All blocks within the autolayout postamble that are not defined % within this file are defined in the @@ -60,11 +40,10 @@ \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@bibEntry - \thesis@blocks@clearRight - \thesis@blocks@abstract - \thesis@blocks@abstractEn - \thesis@blocks@keywords - \thesis@blocks@keywordsEn + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@tables} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx index b2541f43f99..07413917417 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx @@ -6,7 +6,7 @@ % 1421/4581421/Vzor_bakalarske_prace.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/03/22] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -22,6 +22,45 @@ \thesis@blocks@titlePage@department@true \thesis@blocks@titlePage@field@true % \end{macrocode} +% The style file parses the value of the |\thesis@department| macro +% and recognizes the following divisions of the Faculty of Arts: +% \begin{itemize} +% \item\texttt{kisk} -- The Division of Information and Library +% Studies \footnote{See \url{http://kisk.phil.muni.cz/cs/pov^^A +% vinnosti}.} (KISK) +% \begin{macrocode} +\def\thesis@departments@kisk{kisk} +% \end{macrocode} +% \end{itemize} +% Along with the macros required by the locale file interface, the +% locale files need to define the following macros: +% \begin{itemize} +% \item\texttt{departmentName} -- The human-readable name of the +% given recognized division. +% \end{itemize} +% \begin{macrocode} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@department@name{\thesis@@{departmentName}} + \def\thesis@departmentEn@name{\thesis@english@departmentName} +\fi +% \end{macrocode} +% \begin{macro}{\thesis@blocks@titlePage} +% In the case of a KISK thesis, the style file redefines the cover +% and title page footers to include the thesis advisor's name. +% \begin{macrocode} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@titlePage@content{% + {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in + {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} + {\thesis@titlePage@Large\bf\thesis@author} + % If this is a KISK thesis, typeset the name of the thesis + % advisor. + \ifx\thesis@department\thesis@departments@kisk + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor} + \fi}% +\fi +% \end{macrocode} % All blocks within the autolayout postamble that are not defined % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. @@ -31,7 +70,37 @@ \thesis@blocks@cover \thesis@blocks@titlePage \thesis@blocks@frontMatter +% \end{macrocode} +% In KISK theses, the bibliographical entry, the abstract, and the +% keywords will be included after the cover matter. +% \begin{macrocode} + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \fi \thesis@blocks@declaration \thesis@blocks@thanks - \thesis@blocks@tables} +% \end{macrocode} +% In KISK theses, the lists of tables and figures will be included +% behind the bibliography rather than at the beginning of the +% document. +% \begin{macrocode} + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@toc + \else + \thesis@blocks@tables + \fi} +% \end{macrocode} +% In KISK theses, the lists of tables and figures will be included +% behind the bibliography rather than at the beginning of the +% document. +% \begin{macrocode} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@postamble{% + \thesis@blocks@lot + \thesis@blocks@lof} +\fi % \end{macrocode} 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 da28f49e77c..8803568843d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -6,7 +6,7 @@ % \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/01/12] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/03/22] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -114,14 +114,14 @@ \thesis@author\\ \thesis@czech@facultyName, \thesis@czech@universityName\\ - \thesis@department + \thesis@department@name }\\ \textbf{\thesis@czech@bib@thesisTitle:} & \thesis@title \\ \textbf{\thesis@czech@bib@programme:} & \thesis@programme \\ \textbf{\thesis@czech@bib@field:} - & \thesis@field \\ + & \thesis@field@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -214,14 +214,14 @@ \thesis@author\\ \thesis@english@facultyName, \thesis@english@universityName\\ - \thesis@departmentEn + \thesis@departmentEn@name }\\ \textbf{\thesis@english@bib@thesisTitle:} & \thesis@titleEn \\ \textbf{\thesis@english@bib@programme:} & \thesis@programmeEn \\ \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn \\ + & \thesis@fieldEn@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -262,7 +262,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@large\thesis@department} + \thesis@titlePage@large\thesis@department@name} \vfill {\bf\thesis@titlePage@Huge\thesis@czech@typeName} \vfill @@ -291,7 +291,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@department} + \thesis@titlePage@normalsize\thesis@department@name} \rule{\textwidth}{2pt}\vspace*{2mm} \end{center} \end{minipage}\begin{minipage}{30mm} diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 75e366a2c4c..199a088a912 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.34}{2016/02/24}} +\thesis@versiondef{v0.3.35}{2016/03/23}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -157,6 +157,7 @@ \thesis@def{id} \define@key{thesis}{id}{% \def\thesis@id{#1}} +\def\thesis@sempaper{sem} \def\thesis@bachelors{bc} \def\thesis@masters{mgr} \def\thesis@doctoral{d} @@ -346,6 +347,11 @@ \ifx\thesis@locale\empty\else \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} + \ifluatex + \ltx@ifpackageloaded{babel}{}{ + % See + \RequirePackage[base]{babel}} + \fi \ifx\languagename\empty\else \begingroup \edef\@doclocale{\languagename}% 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 b9b57cfad96..e4b6ec6f43d 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/01/13] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/03/22] \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} @@ -76,7 +76,9 @@ \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminární práce% + \else\ifx\thesis@type\thesis@bachelors Bakalářská práce% \else\ifx\thesis@type\thesis@masters Diplomová práce% @@ -86,9 +88,11 @@ Rigorózní práce% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminární práci% + \else\ifx\thesis@type\thesis@bachelors Bakalářskou práci% \else\ifx\thesis@type\thesis@masters Diplomovou práci% @@ -98,7 +102,7 @@ Rigorózní práci% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \endinput %% %% End of file `fithesis-czech.def'. 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 01a4ffa2d5a..9836e02a3c0 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/01/13] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/03/22] \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} @@ -73,7 +73,9 @@ \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} \gdef\thesis@english@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminar Paper% + \else\ifx\thesis@type\thesis@bachelors Bachelor's Thesis% \else\ifx\thesis@type\thesis@masters Master's Thesis% @@ -83,7 +85,7 @@ Rigorous Thesis% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \endinput %% %% End of file `fithesis-english.def'. 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 e2d870a38ff..c82a19dac99 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/01/13] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/03/22] \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} @@ -76,7 +76,9 @@ \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminárna práca% + \else\ifx\thesis@type\thesis@bachelors Bakalárska práca% \else\ifx\thesis@type\thesis@masters Diplomová práca% @@ -86,9 +88,11 @@ Rigorózna práca% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors + \ifx\thesis@type\thesis@sempaper + Seminárnu prácu% + \else\ifx\thesis@type\thesis@bachelors Bakalársku prácu% \else\ifx\thesis@type\thesis@masters Diplomovú prácu% @@ -98,7 +102,7 @@ Rigoróznu prácu% \else <>% - \fi\fi\fi\fi} + \fi\fi\fi\fi\fi} \endinput %% 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 5ef32a7ab48..35765e1c535 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/11/17] +\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22] \gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem @@ -58,6 +58,9 @@ použil\thesis@czech@gender@koncovka\ jen prameny uvedené~v seznamu literatury.} +\gdef\thesis@czech@bib@title{Bibliografický záznam} +\gdef\thesis@czech@bib@pages{str} + \gdef\thesis@czech@idTitle{UČO} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def index bf184859739..3906a1eeca7 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2015/11/30] +\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22] \gdef\thesis@english@universityName{Masaryk University} \gdef\thesis@english@declaration{% Hereby I declare that this paper is my original authorial work, @@ -57,6 +57,9 @@ literature used or excerpted during elaboration of this work are properly cited and listed in complete reference to the due source.} +\gdef\thesis@english@bib@title{Bibliographic record} +\gdef\thesis@english@bib@pages{p} + \gdef\thesis@english@idTitle{UČO} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def index 967160a57b0..160806ba413 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/11/17] +\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22] \gdef\thesis@slovak@universityName{Masarykova univerzita} \gdef\thesis@slovak@declaration{% @@ -58,6 +58,9 @@ \thesis@slovak@gender@koncovka\ samostatne len s~použitím uvedenej literatúry a prameňov.} +\gdef\thesis@slovak@bib@title{Bibliografický záznam} +\gdef\thesis@slovak@bib@pages{str} + \gdef\thesis@slovak@idTitle{UČO} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def index 7d03825ab72..15145790fd7 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def @@ -49,14 +49,11 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23] \gdef\thesis@czech@abstractTitle{Anotace} \gdef\thesis@czech@facultyName{Lékařská fakulta} - -\gdef\thesis@czech@bib@title{Bibliografický záznam} -\gdef\thesis@czech@bib@pages{str} \endinput %% %% End of file `mu/med/fithesis-czech.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def index 1abe9b7b4cd..346c0d39e4d 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def @@ -49,14 +49,11 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23] \gdef\thesis@english@abstractTitle{Annotation} \gdef\thesis@english@facultyName{Faculty of Medicine} - -\gdef\thesis@english@bib@title{Bibliographic record} -\gdef\thesis@english@bib@pages{p} \endinput %% %% End of file `mu/med/fithesis-english.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def index 4e295691b6e..eadc0d67d4a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def @@ -50,14 +50,11 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23] \gdef\thesis@slovak@abstractTitle{Anotácie} \gdef\thesis@slovak@facultyName{Lekárska fakulta} - -\gdef\thesis@slovak@bib@title{Bibliografický záznam} -\gdef\thesis@slovak@bib@pages{str} \endinput %% %% End of file `mu/med/fithesis-slovak.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def index e280b416c0d..77bd961e370 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def @@ -49,12 +49,9 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/ped/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-czech.def}[2016/03/22] \gdef\thesis@czech@facultyName{Pedagogická fakulta} - -\gdef\thesis@czech@bib@title{Bibliografický záznam} -\gdef\thesis@czech@bib@pages{str} \endinput %% %% End of file `mu/ped/fithesis-czech.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-english.def index 95c240bdb1d..4f49734e2a5 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-english.def @@ -49,12 +49,9 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/ped/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-english.def}[2016/03/22] \gdef\thesis@english@facultyName{Faculty of Education} - -\gdef\thesis@english@bib@title{Bibliographic record} -\gdef\thesis@english@bib@pages{p} \endinput %% %% End of file `mu/ped/fithesis-english.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def index fb77f3bff10..2e5a23c8ba3 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def @@ -50,12 +50,9 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22] \gdef\thesis@slovak@facultyName{Pedagogická fakulta} - -\gdef\thesis@slovak@bib@title{Bibliografický záznam} -\gdef\thesis@slovak@bib@pages{str} \endinput %% %% End of file `mu/ped/fithesis-slovak.def'. 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 d59cf6bd76d..84ef718d6fb 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-czech.def @@ -49,34 +49,50 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/01/07] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/03/22] \gdef\thesis@czech@facultyName{Filozofická fakulta} +\gdef\thesis@czech@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Kabinet informačních studií a knihovnictví% + \else + <>% + \fi} \gdef\thesis@czech@declaration{% - Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} - vypracoval\thesis@czech@gender@koncovka\ samostatně~s využitím - uvedené literatury.} + \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á + 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 + uvedené literatury.% + \fi} +\global\let\thesis@czech@typeName@super + \thesis@czech@typeName \gdef\thesis@czech@typeName{% \ifx\thesis@type\thesis@bachelors Bakalářská diplomová práce% \else\ifx\thesis@type\thesis@masters Magisterská diplomová práce% - \else\ifx\thesis@type\thesis@doctoral - Disertační práce% \else - <>% - \fi\fi\fi} + \thesis@czech@typeName@super + \fi\fi} + +\global\let\thesis@czech@typeName@akuzativ@super + \thesis@czech@typeName@akuzativ \gdef\thesis@czech@typeName@akuzativ{% \ifx\thesis@type\thesis@bachelors Diplomovou práci% \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral - Disertační práci% \else - <>% - \fi\fi\fi} + \thesis@czech@typeName@akuzativ@super + \fi\fi} \endinput %% %% End of file `mu/phil/fithesis-czech.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-english.def index be4341bf6c6..068559a66f8 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-english.def @@ -49,8 +49,14 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/phil/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-english.def}[2016/03/22] \gdef\thesis@english@facultyName{Faculty of Arts} +\gdef\thesis@english@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Division of Information and Library Studies% + \else + <>% + \fi} \endinput %% %% End of file `mu/phil/fithesis-english.def'. 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 d146d42e774..7efb4d0e5ac 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def @@ -50,36 +50,51 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/01/07] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/03/22] \gdef\thesis@slovak@facultyName{Filozofická fakulta} -\gdef\thesis@slovak@declaration{% - Prehlasujem, že som predloženú \thesis@lower{% - slovak@typeName@akuzativ} vypracoval% - \thesis@slovak@gender@koncovka\ samostatne na - základe vlastných zistení a len s~použitím - uvedenej literatúry a prameňov.} +\gdef\thesis@slovak@departmentName{% + \ifx\thesis@department\thesis@departments@kisk + Kabinet informačných štúdií a knihovníctva% + \else + <>% + \fi} +\gdef\thesis@czech@declaration{% + \ifx\thesis@department\thesis@departments@kisk + Prehlasujem, ž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á + verzia tejto práce bola sprístupnená cez informačný + systém Masarykovej univerzity.% + \else + Prehlasujem, že som predloženú \thesis@lower{% + slovak@typeName@akuzativ} vypracoval% + \thesis@slovak@gender@koncovka\ samostatne na základe vlastných + zistení a len s~použitím uvedenej literatúry a prameňov.% + \fi} +\global\let\thesis@slovak@typeName@super + \thesis@slovak@typeName \gdef\thesis@slovak@typeName{% \ifx\thesis@type\thesis@bachelors Bakalárska diplomová práca% \else\ifx\thesis@type\thesis@masters Magisterská diplomová práca% - \else\ifx\thesis@type\thesis@doctoral - Dizertačná práca% \else - <>% - \fi\fi\fi} + \thesis@slovak@typeName@super + \fi\fi} + +\global\let\thesis@slovak@typeName@akuzativ@super + \thesis@slovak@typeName@akuzativ \gdef\thesis@slovak@typeName@akuzativ{% \ifx\thesis@type\thesis@bachelors Diplomovú prácu% \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral - Dizertačnú prácu% \else - <>% - \fi\fi\fi} + \thesis@slovak@typeName@akuzativ@super + \fi\fi} \endinput %% %% End of file `mu/phil/fithesis-slovak.def'. 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 70853efa40f..581b2bfb91b 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/01/12] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/03/23] \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -94,7 +94,6 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} -\gdef\thesis@czech@bib@title{Bibliografický záznam} \global\let\thesis@czech@bib@author\thesis@czech@authorTitle \gdef\thesis@czech@bib@thesisTitle{Název práce} \gdef\thesis@czech@bib@programme{Studijní program} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def index 0d80ef99089..344b1ac7fec 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def @@ -49,13 +49,12 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23] \gdef\thesis@english@facultyName{Faculty of Science} \global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor -\gdef\thesis@english@bib@title{Bibliographic entry} \global\let\thesis@english@bib@author\thesis@english@authorTitle \gdef\thesis@english@bib@thesisTitle{Title of Thesis} \gdef\thesis@english@bib@programme{Degree Programme} 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 0b74dbe2502..956394ba412 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 8f974a651de..6752603de82 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 7a7dba83b57..e4cf1a5d74b 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 8d46f5d5830..559b2293a9c 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf differ diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf index b4e9ba06232..752baf6e664 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 5eb7d661b8c..18be5ff242a 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 9192054bdc8..12f074b6eb2 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 41d820fa459..662585def8a 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 2a2b22db882..66d967d6d38 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 430d0d95e9a..463b4102332 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 3946f20e680..82a338a8f98 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 cd2fdd8e4ef..983664826a1 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 fd32c52a28c..a9c2620fb34 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 4ba62a93d07..6a0d213f8dd 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 c7edae507bc..5fb28aacdfd 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 185af05f4ea..d7e123b670b 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 05f345be67e..235c014fae0 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 2e845ad3004..526a1303f41 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 98abd9fa4df..0ee45aafccf 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 a59ffc27247..f0dd8241c2f 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-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty index 87f2473b9b8..7b48fb729a6 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/01/07] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/03/22] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -75,9 +75,9 @@ \newif\ifthesis@newtable@ \DeclareOption{table}{\thesis@newtable@true} \DeclareOption{oldtable}{\thesis@newtable@false} -\DeclareOption{nolot}{\def\thesis@blocks@lot{}} +\DeclareOption{nolot}{\let\thesis@blocks@lot\relax} \DeclareOption{lot}{\let\thesis@blocks@lot\listoftables} -\DeclareOption{nolof}{\def\thesis@blocks@lof{}} +\DeclareOption{nolof}{\let\thesis@blocks@lof\relax} \DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures} \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} @@ -143,16 +143,16 @@ \let\thesis@newtable@oldx\tabularx \let\endthesis@newtable@oldx\endtabularx \renewenvironment{tabularx}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldx}% {\endthesis@newtable@oldx} % The redefinition of `tabu` \let\thesis@newtable@oldtabu\tabu \let\endthesis@newtable@oldtabu\endtabu \renewenvironment{tabu}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldtabu}% {\endthesis@newtable@oldtabu} \fi @@ -217,6 +217,10 @@ \edef\@path{\thesis@logopath\thesis@universityLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} +\let\thesis@department@name\thesis@department +\let\thesis@departmentEn@name\thesis@departmentEn +\let\thesis@field@name\thesis@field +\let\thesis@fieldEn@name\thesis@fieldEn \def\thesis@blocks@cover{% \ifthesis@cover@ \thesis@blocks@clear @@ -248,11 +252,11 @@ \fi\ifthesis@blocks@cover@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@cover@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@cover@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \def\thesis@blocks@cover@content{% {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}% @@ -290,17 +294,19 @@ \fi\ifthesis@blocks@titlePage@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@titlePage@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@titlePage@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content \let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer -\def\thesis@blocks@tables{% +\def\thesis@blocks@toc{% \thesis@blocks@clear - \tableofcontents + \tableofcontents} +\def\thesis@blocks@tables{% + \thesis@blocks@toc \thesis@blocks@lot \thesis@blocks@lof} \def\thesis@blocks@declaration{% @@ -391,6 +397,14 @@ \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em\relax} +\def\thesis@blocks@bibEntry{% + \chapter*{\thesis@@{bib@title}} + \noindent\thesis@upper{author@tail}, \thesis@author@head. + \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, + \thesis@@{facultyName}, \thesis@department@name, \thesis@year. + \thesis@pages\ \thesis@@{bib@pages}. + \thesis@@{advisorTitle}: \thesis@advisor + \thesis@blocks@clearRight} \setcounter{tocdepth}{3} \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty index a4c96c43cf7..833e6e76536 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty @@ -118,14 +118,10 @@ right=15mm, includeheadfoot} \fi\pagestyle{thesisheadings} \parindent 1.5em\relax} -\def\thesis@blocks@toc{% - \thesis@blocks@clear - \tableofcontents} \def\thesis@blocks@tables{% - \thesis@blocks@clear \thesis@blocks@lot \thesis@blocks@lof} -\ifx\thesis@blocks@lot\empty\else +\ifx\thesis@blocks@lot\relax\else \def\thesis@blocks@lot{% \thesis@blocks@clear \phantomsection @@ -133,7 +129,7 @@ \listoftables} \fi -\ifx\thesis@blocks@lof\empty\else +\ifx\thesis@blocks@lof\relax\else \def\thesis@blocks@lof{% \thesis@blocks@clear \phantomsection diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty index b23caa1af61..3248ec6e448 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/03/22] \thesis@color@setup{ links={HTML}{CF86EB}, tableEmph={HTML}{D39BE8}, @@ -58,7 +58,7 @@ tableEven={HTML}{E5CCED}} \def\thesis@blocks@cover@header{% {\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\% - \thesis@titlePage@large\thesis@department\\\vskip 2em}} + \thesis@titlePage@large\thesis@department@name\\\vskip 2em}} \let\thesis@blocks@titlePage@header=\thesis@blocks@cover@header \def\thesis@blocks@frontMatter{% \thesis@blocks@clear diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty index 97cadd1de78..7db6e208364 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/02/18] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/03/22] \thesis@color@setup{ links={HTML}{F58E76}, tableEmph={HTML}{FF9D85}, @@ -90,7 +90,7 @@ \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} \let\@E\relax\newlength{\@E}\settowidth{\@E}{{% \bf\thesis@@{fieldTitle}:}} - \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field@name} \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% max(\@A,\@B)} \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% @@ -100,7 +100,7 @@ {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor \end{minipage}\hfill\begin{minipage}[t]{\@right} {\bf\thesis@@{authorTitle}:}\\\thesis@author - \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field + \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field@name \end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear @@ -123,13 +123,6 @@ \pagestyle{thesisheadings} \parindent 1.5em \onehalfspacing} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty index 560e9cead1b..23edc45a399 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/03/22] \thesis@color@setup{ links={HTML}{FFA02F}, tableEmph={HTML}{FFBB6B}, @@ -64,24 +64,16 @@ % Typeset the name of the thesis advisor. {\thesis@titlePage@large\\[0.3in] {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@bibEntry - \thesis@blocks@clearRight - \thesis@blocks@abstract - \thesis@blocks@abstractEn - \thesis@blocks@keywords - \thesis@blocks@keywordsEn + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@tables} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty index 8d39b72dca5..ca0beddd487 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/03/22] \thesis@color@setup{ links={HTML}{6FCEF2}, tableEmph={HTML}{78CEF0}, @@ -58,14 +58,47 @@ tableEven={HTML}{D0EBF5}} \thesis@blocks@titlePage@department@true \thesis@blocks@titlePage@field@true +\def\thesis@departments@kisk{kisk} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@department@name{\thesis@@{departmentName}} + \def\thesis@departmentEn@name{\thesis@english@departmentName} +\fi +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@titlePage@content{% + {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in + {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} + {\thesis@titlePage@Large\bf\thesis@author} + % If this is a KISK thesis, typeset the name of the thesis + % advisor. + \ifx\thesis@department\thesis@departments@kisk + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor} + \fi}% +\fi \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@titlePage \thesis@blocks@frontMatter + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \fi \thesis@blocks@declaration \thesis@blocks@thanks - \thesis@blocks@tables} + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@toc + \else + \thesis@blocks@tables + \fi} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@postamble{% + \thesis@blocks@lot + \thesis@blocks@lof} +\fi \endinput %% %% End of file `fithesis-phil.sty'. diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty index da898d86a11..8ae9fe28e11 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/01/12] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/03/22] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -105,14 +105,14 @@ \thesis@author\\ \thesis@czech@facultyName, \thesis@czech@universityName\\ - \thesis@department + \thesis@department@name }\\ \textbf{\thesis@czech@bib@thesisTitle:} & \thesis@title \\ \textbf{\thesis@czech@bib@programme:} & \thesis@programme \\ \textbf{\thesis@czech@bib@field:} - & \thesis@field \\ + & \thesis@field@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -170,14 +170,14 @@ \thesis@author\\ \thesis@english@facultyName, \thesis@english@universityName\\ - \thesis@departmentEn + \thesis@departmentEn@name }\\ \textbf{\thesis@english@bib@thesisTitle:} & \thesis@titleEn \\ \textbf{\thesis@english@bib@programme:} & \thesis@programmeEn \\ \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn \\ + & \thesis@fieldEn@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -206,7 +206,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@large\thesis@department} + \thesis@titlePage@large\thesis@department@name} \vfill {\bf\thesis@titlePage@Huge\thesis@czech@typeName} \vfill @@ -227,7 +227,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@department} + \thesis@titlePage@normalsize\thesis@department@name} \rule{\textwidth}{2pt}\vspace*{2mm} \end{center} \end{minipage}\begin{minipage}{30mm} -- cgit v1.2.3