diff options
author | Karl Berry <karl@freefriends.org> | 2016-01-14 23:38:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-01-14 23:38:48 +0000 |
commit | d15b1e7ca9e5168ae4c7ad4f7fc76195e9606a5d (patch) | |
tree | 46ed4135251a1eaaf37eb11eeeb80e4d6b9acb7f /Master/texmf-dist/source/latex | |
parent | 944e4fe47261a46746f151c97cdfd5fdceae4ae6 (diff) |
fithesis (14jan16)
git-svn-id: svn://tug.org/texlive/trunk@39388 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
8 files changed, 406 insertions, 336 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 8274c601e39..91e3b33c21c 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -52,15 +52,31 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/01/05 v0.3.30 fithesis3 MU thesis class} +\def\thesis@version{2016/01/13 v0.3.31 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \changes{v0.3.30}{2015/01/05}{The \cs{thesis@seasonYear} macro +% \changes{v0.3.31:3}{2016/01/13}{The +% \texttt{style/mu/fithesis-sci.sty} style file redefines +% \cs{thesis@blocks}\texttt{\discretionary{@}{@}{@}declaration} +% to include a formatted date and an author's signature field. +% The locale file \texttt{style/mu/sci/czech.def} contains a new +% string \cs{thesis@czech\discretionary{@}{@}{@}formattedDate}. +% [VN]} +% \changes{v0.3.31:2}{2016/01/07}{All trailing \%s were removed. +% Some of the inherited \textsf{fithesis2} code in the +% \texttt{fithesis-1*.clo} and \texttt{style/mu/fithesis-base.sty} +% files was refactored and reformatted. Alternative +% templates for the Faculty of Science at the Masaryk University +% in Brno are now mentioned in the respective user guide. [VN]} +% \changes{v0.3.31:1}{2016/01/07}{The redefinition of \cs{appendix} +% from the \texttt{fithesis-1*.clo}, which broke the hyperref +% links to the appendices, were removed. [VN]} +% \changes{v0.3.30} {2016/01/05}{The \cs{thesis@seasonYear} macro % has been added, which, unlike \cs{thesis@year} takes into % account the fact that January and Fabruary of the year $n$ -% still belong to the fall semester of the year $n-1$.} +% still belong to the fall semester of the year $n-1$. [VN]} % \changes{v0.3.29:3}{2015/12/09}{The \texttt{table} class option % for the style files of the Masaryk University in Brno now loads % all the required packages and changes the table measurements @@ -404,9 +420,9 @@ % \begin{macrocode} \def\thesis@basepath{fithesis/} \define@key{thesis}{basePath}{% - \ifx\thesis@empty#1\thesis@empty% + \ifx\thesis@empty#1\thesis@empty \def\thesis@basepath{}% - \else% + \else \def\thesis@basepath{#1/}% \fi} % \end{macrocode} @@ -474,7 +490,7 @@ \else% /<path> -> /<path>/ #1#2#3#4/% \fi - \else% + \else \if#1.% \ifx#2\empty% . -> ./ ./% @@ -500,7 +516,7 @@ \else \thesis@basepath#1#2#3#4/% \fi - \fi% + \fi \fi} % \end{macrocode} % \end{macro} @@ -541,10 +557,10 @@ \define@key{thesis}{gender}{% \def\thesis@male{m}% \def\thesis@arg{#1}% - \ifx\thesis@male\thesis@arg% - \thesis@womanfalse% - \else% - \thesis@womantrue% + \ifx\thesis@male\thesis@arg + \thesis@womanfalse + \else + \thesis@womantrue \fi} % \end{macrocode} % \end{macro} @@ -569,7 +585,7 @@ % \begin{macrocode} \def\thesis@parseAuthor#1{% \def\thesis@author{#1}% - \def\thesis@author@head{\expandafter\expandafter\expandafter% + \def\thesis@author@head{\expandafter\expandafter\expandafter \@gobble\thesis@head#1 \relax}% \def\thesis@author@tail{\thesis@tail#1 \relax}} \thesis@def{author}% @@ -823,7 +839,7 @@ % \begin{macrocode} \def\thesis@locale{% % Babel / polyglossia detection - \ifx\languagename\undefined% + \ifx\languagename\undefined english\else\languagename\fi} \define@key{thesis}{locale}{% \def\thesis@locale{#1}} @@ -838,15 +854,15 @@ % or not the current locale is English. % \begin{macrocode} \def\ifthesis@english{ - \expandafter\def\expandafter\@english\expandafter{\string% + \expandafter\def\expandafter\@english\expandafter{\string \english}% - \expandafter\expandafter\expandafter\def\expandafter% - \expandafter\expandafter\@locale\expandafter\expandafter% + \expandafter\expandafter\expandafter\def\expandafter + \expandafter\expandafter\@locale\expandafter\expandafter \expandafter{\expandafter\string\csname\thesis@locale\endcsname}% - \expandafter\csname\expandafter i\expandafter f\ifx\@locale% - \@english% + \expandafter\csname\expandafter i\expandafter f\ifx\@locale + \@english true% - \else% + \else false% \fi\endcsname} % \end{macrocode} @@ -881,16 +897,16 @@ % stands for day. The \textit{date} is parsed and stored using % the \DescribeMacro{\thesis@parseDate}|\thesis@parseDate| % macro within the following macros: +% \DescribeMacro{\thesis@date} +% \DescribeMacro{\thesis@year} +% \DescribeMacro{\thesis@month} +% \DescribeMacro{\thesis@day} % \begin{multicols}{2} % \begin{itemize} -% \item\DescribeMacro{\thesis@date}|\thesis@date| -- The entire -% \textit{date} -% \item\DescribeMacro{\thesis@year}|\thesis@year| -- The -% \texttt{YYYY} of \textit{date} -% \item\DescribeMacro{\thesis@month}|\thesis@month| -- The -% \texttt{MM} of \textit{date} -% \item\DescribeMacro{\thesis@day}|\thesis@day| -- The -% \texttt{DD} of \textit{date} +% \item|\thesis@date| -- The entire \textit{date} +% \item|\thesis@year| -- The \texttt{YYYY} of \textit{date} +% \item|\thesis@month| -- The \texttt{MM} of \textit{date} +% \item|\thesis@day| -- The \texttt{DD} of \textit{date} % \end{itemize} % \end{multicols} % \begin{itemize} @@ -1144,10 +1160,10 @@ \define@key{thesis}{autoLayout}[true]{% \def\@true{true}% \def\@arg{#1}% - \ifx\@true\@arg% - \thesis@autotrue% - \else% - \thesis@autofalse% + \ifx\@true\@arg + \thesis@autotrue + \else + \thesis@autofalse \fi} % \end{macrocode} % \end{macro} ^^A The nested \ifthesis@auto macro definition @@ -1216,9 +1232,9 @@ \newif\ifthesis@loaded\thesis@loadedfalse \AtEndPreamble{\thesis@load} \def\thesis@load{% - \ifthesis@loaded\else% + \ifthesis@loaded\else \thesis@loadedtrue - \makeatletter% + \makeatletter % \end{macrocode} % First, the name of the main locale file is fully expanded and % loaded using the |\thesis@requireLocale| macro. If the user @@ -1334,11 +1350,11 @@ % named package files within the \TeX\ directory structure. % \begin{macrocode} \def\thesis@requireStyle#1{% - \ifthesis@style@inheritance% + \ifthesis@style@inheritance \thesis@requireIfExists{\thesis@stylepath fithesis-base}% - \thesis@requireIfExists{\thesis@stylepath\thesis@university% + \thesis@requireIfExists{\thesis@stylepath\thesis@university /fithesis-base} - \fi% + \fi \thesis@requireIfExists{\thesis@stylepath#1}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@requireLocale} @@ -1369,11 +1385,11 @@ % \begin{macrocode} \def\thesis@requireLocale#1{% % Ignore redundant requests - \expandafter\ifx\csname thesis@#1@required\endcsname\relax% + \expandafter\ifx\csname thesis@#1@required\endcsname\relax \expandafter\def\csname thesis@#1@required\endcsname{}% \@ifpackageloaded{polyglossia}{\setotherlanguage{#1}}{} \thesis@input{\thesis@localepath fithesis-#1.def}% - \ifthesis@locale@inheritance% + \ifthesis@locale@inheritance \thesis@input{\thesis@localepath\thesis@university/% fithesis-#1.def}% \thesis@input{\thesis@localepath\thesis@university/% @@ -1409,13 +1425,13 @@ % active characters and command sequences. % \begin{macrocode} \def\thesis@lower#1{{% - \let\ea\expandafter% + \let\ea\expandafter \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\lowercase\ea\ea\ea \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% sis@#1\endcsname\endcsname}}} \def\thesis@upper#1{{% - \let\ea\expandafter% + \let\ea\expandafter \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\uppercase\ea\ea\ea \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% @@ -1441,16 +1457,16 @@ % \begin{macrocode} \def\thesis@head#1 #2{% \ifx\relax#2% - \expandafter\@gobbletwo% - \else% + \expandafter\@gobbletwo + \else \ #1% - \fi% + \fi \thesis@head#2}% \def\thesis@tail#1 #2{% \ifx\relax#2% #1% - \expandafter\@gobbletwo% - \fi% + \expandafter\@gobbletwo + \fi \thesis@tail#2}% % \end{macrocode} % \subsection{General purpose macros} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 9a34e2402cd..90bd93292f8 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/05] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/01/13] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -29,6 +29,12 @@ oficiálního podepsaného zadání práce.} \gdef\thesis@czech@declaration{Text prohlášení ...} +% Časové údaje +\gdef\thesis@czech@spring{jaro} +\gdef\thesis@czech@fall{podzim} +\gdef\thesis@czech@semester{% + \thesis@{czech@\thesis@season} \thesis@seasonYear} + % Různé \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} @@ -38,32 +44,28 @@ \gdef\thesis@czech@thanksTitle{Poděkování} \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} -\gdef\thesis@czech@spring{jaro} -\gdef\thesis@czech@fall{podzim} -\gdef\thesis@czech@semester{% - \thesis@{czech@\thesis@season} \thesis@seasonYear} \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářská práce% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomová práce% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práce% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózní práce% - \else% + \else <<Neznámý typ práce (\thesis@type)>>% \fi\fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářskou práci% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práci% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózní práci% - \else% + \else <<Neznámý typ práce (\thesis@type)>>% \fi\fi\fi\fi} % \end{macrocode}\iffalse @@ -229,7 +231,7 @@ % \iffalse %<*mu/phil> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-czech.def}[2016/01/07] % Zástupné texty \gdef\thesis@czech@facultyName{Filozofická fakulta} @@ -240,23 +242,23 @@ % Ostatní \gdef\thesis@czech@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalářská diplomová práce% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Magisterská diplomová práce% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práce% - \else% + \else <<Neznámý typ práce (\thesis@type)>>% \fi\fi\fi} \gdef\thesis@czech@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Diplomovou práci% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovou práci% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Disertační práci% - \else% + \else <<Neznámý typ práce (\thesis@type)>>% \fi\fi\fi} % \end{macrocode}\iffalse @@ -296,7 +298,7 @@ % \iffalse %<*mu/sci> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2016/01/12] % Zástupné texty \gdef\thesis@czech@facultyName{Přírodovědecká fakulta} @@ -308,6 +310,41 @@ 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 \gdef\thesis@czech@bib@title{Bibliografický záznam} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 15ffaadc04a..8effab18e32 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}[2015/01/05] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/01/13] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -18,6 +18,12 @@ % Csquotes style \gdef\thesis@english@csquotesStyle{english} +% Time strings +\gdef\thesis@english@spring{Spring} +\gdef\thesis@english@fall{Fall} +\gdef\thesis@english@semester{% + \thesis@{english@\thesis@season} \thesis@seasonYear} + % Miscellaneous \gdef\thesis@english@fieldTitle{Field of study} \gdef\thesis@english@advisorTitle{Advisor} @@ -27,20 +33,16 @@ \gdef\thesis@english@thanksTitle{Acknowledgement} \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} -\gdef\thesis@english@spring{Spring} -\gdef\thesis@english@fall{Fall} -\gdef\thesis@english@semester{% - \thesis@{english@\thesis@season} \thesis@seasonYear} \gdef\thesis@english@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bachelor's Thesis% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Master's Thesis% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Doctoral Thesis% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorous Thesis% - \else% + \else <<Unknown thesis type (\thesis@type)>>% \fi\fi\fi\fi} % \end{macrocode}\iffalse diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 5086ceead42..91d13745198 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}[2015/01/05] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/01/13] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -29,6 +29,12 @@ oficiálneho podpísaného zadania práce.} \gdef\thesis@slovak@declaration{Text prehlásenie ...} +% Časové údaje +\gdef\thesis@slovak@spring{jar} +\gdef\thesis@slovak@fall{jeseň} +\gdef\thesis@slovak@semester{% + \thesis@{slovak@\thesis@season} \thesis@seasonYear} + % Rôzne \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} @@ -38,32 +44,28 @@ \gdef\thesis@slovak@thanksTitle{Poďakovanie} \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} -\gdef\thesis@slovak@spring{jar} -\gdef\thesis@slovak@fall{jeseň} -\gdef\thesis@slovak@semester{% - \thesis@{slovak@\thesis@season} \thesis@seasonYear} \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalárska práca% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomová práca% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačná práca% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigorózna práca% - \else% + \else <<Neznámy typ práce (\thesis@type)>>% \fi\fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalársku prácu% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačnú prácu% - \else\ifx\thesis@type\thesis@rigorous% + \else\ifx\thesis@type\thesis@rigorous Rigoróznu prácu% - \else% + \else <<Neznámy typ práce (\thesis@type)>>% \fi\fi\fi\fi} % \end{macrocode}\iffalse @@ -231,7 +233,7 @@ % \iffalse %<*mu/phil> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/phil/fithesis-slovak.def}[2016/01/07] % Zástupné texty \gdef\thesis@slovak@facultyName{Filozofická fakulta} @@ -244,23 +246,23 @@ % Rôzne \gdef\thesis@slovak@typeName{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Bakalárska diplomová práca% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Magisterská diplomová práca% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačná práca% - \else% + \else <<Neznámy typ práce (\thesis@type)>>% \fi\fi\fi} \gdef\thesis@slovak@typeName@akuzativ{% - \ifx\thesis@type\thesis@bachelors% + \ifx\thesis@type\thesis@bachelors Diplomovú prácu% - \else\ifx\thesis@type\thesis@masters% + \else\ifx\thesis@type\thesis@masters Diplomovú prácu% - \else\ifx\thesis@type\thesis@doctoral% + \else\ifx\thesis@type\thesis@doctoral Dizertačnú prácu% - \else% + \else <<Neznámý typ práce (\thesis@type)>>% \fi\fi\fi} % \end{macrocode}\iffalse 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 5720d409c10..646be523ba4 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}[2015/12/09] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/01/07] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -328,9 +328,7 @@ % hyperlinks with an underline instead of a rectangular box. % \begin{macrocode} \thesis@require{hyperref} -\hypersetup{ - pdfborderstyle={/S/U/W 1}, % Less obtrusive borders - plainpages=false} % Multiple page numbering support +\hypersetup{pdfborderstyle={/S/U/W 1}} % Less obtrusive borders % \end{macrocode} % Clubs and widows are set to be infinitely bad. % \begin{macrocode} @@ -410,12 +408,12 @@ % double-sided typesetting is enabled. % \begin{macrocode} \def\thesis@blocks@clear{% - \ifthesis@twoside@% - \clearpage% + \ifthesis@twoside@ + \clearpage \thispagestyle{empty}% - \cleardoublepage% - \else% - \newpage% + \cleardoublepage + \else + \newpage \fi} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@clearRight} @@ -424,15 +422,15 @@ % when double-sided typesetting is enabled. % \begin{macrocode} \def\thesis@blocks@clearRight{% - \ifthesis@twoside@% - \clearpage% + \ifthesis@twoside@ + \clearpage \ifodd\value{page}% \thispagestyle{empty}% \hbox{}% - \newpage% - \fi% - \else% - \newpage% + \newpage + \fi + \else + \newpage \fi} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@facultyLogo@monochrome} @@ -456,7 +454,7 @@ % \begin{macrocode} \newcommand{\thesis@blocks@facultyLogo@color}[1]% [width=40mm]{{% - \edef\@path{\thesis@logopath\thesis@facultyLogo% + \edef\@path{\thesis@logopath\thesis@facultyLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} % \end{macrocode} @@ -482,7 +480,7 @@ % \begin{macrocode} \newcommand{\thesis@blocks@universityLogo@color}[1]% [width=40mm]{{% - \edef\@path{\thesis@logopath\thesis@universityLogo% + \edef\@path{\thesis@logopath\thesis@universityLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} % \end{macrocode} @@ -504,18 +502,18 @@ % certain parts of the cover page. % \begin{macrocode} \def\thesis@blocks@cover{% - \ifthesis@cover@% - \thesis@blocks@clear% + \ifthesis@cover@ + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \begin{center}% - \thesis@blocks@cover@header% + \thesis@blocks@cover@header \thesis@blocks@facultyLogo@monochrome\\[0.4in]% - \let\footnotesize\small% + \let\footnotesize\small \let\footnoterule\relax{}% - \thesis@blocks@cover@content% - \par\vfill% - \thesis@blocks@cover@footer% + \thesis@blocks@cover@content + \par\vfill + \thesis@blocks@cover@footer \end{center}% \end{alwayssingle}% \fi} @@ -555,14 +553,14 @@ \thesis@blocks@cover@field@false \def\thesis@blocks@cover@header{% - {\sc\ifthesis@blocks@cover@university@% + {\sc\ifthesis@blocks@cover@university@ \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@cover@faculty@% + \fi\ifthesis@blocks@cover@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@cover@department@% + \fi\ifthesis@blocks@cover@department@ \thesis@titlePage@large\thesis@department\\% \fi} - \ifthesis@blocks@cover@field@% + \ifthesis@blocks@cover@field@ {\thesis@titlePage@large\vskip 1em% {\bf\thesis@@{fieldTitle}:} \thesis@field}% \fi\vskip 2em} @@ -590,17 +588,17 @@ % certain parts of the title page. % \begin{macrocode} \def\thesis@blocks@titlePage{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \begin{center}% - \thesis@blocks@titlePage@header% + \thesis@blocks@titlePage@header \thesis@blocks@facultyLogo@color\\[0.4in]% - \let\footnotesize\small% + \let\footnotesize\small \let\footnoterule\relax{}% - \thesis@blocks@titlePage@content% - \par\vfill% - \thesis@blocks@titlePage@footer% + \thesis@blocks@titlePage@content + \par\vfill + \thesis@blocks@titlePage@footer \end{center}% \end{alwayssingle}} % \end{macrocode} @@ -643,14 +641,14 @@ \thesis@blocks@titlePage@field@false \def\thesis@blocks@titlePage@header{% - {\sc\ifthesis@blocks@titlePage@university@% + {\sc\ifthesis@blocks@titlePage@university@ \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@titlePage@faculty@% + \fi\ifthesis@blocks@titlePage@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@titlePage@department@% + \fi\ifthesis@blocks@titlePage@department@ \thesis@titlePage@large\thesis@department\\% \fi} - \ifthesis@blocks@titlePage@field@% + \ifthesis@blocks@titlePage@field@ {\thesis@titlePage@large\vskip 1em% {\bf\thesis@@{fieldTitle}:} \thesis@field}% \fi\vskip 2em} @@ -663,9 +661,9 @@ % |\listoffigures|. % \begin{macrocode} \def\thesis@blocks@tables{% - \thesis@blocks@clear% - \tableofcontents% - \thesis@blocks@lot% + \thesis@blocks@clear + \tableofcontents + \thesis@blocks@lot \thesis@blocks@lof} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@declaration} @@ -673,12 +671,12 @@ % declaration text. % \begin{macrocode} \def\thesis@blocks@declaration{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\thesis@@{declarationTitle}}% - \thesis@declaration% + \thesis@declaration \vskip 2cm% - \hfill\thesis@author% + \hfill\thesis@author \end{alwayssingle}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@thanks} @@ -687,11 +685,11 @@ % defined. Otherwise, the macro produces no output. % \begin{macrocode} \def\thesis@blocks@thanks{% - \ifx\thesis@thanks\undefined\else% - \thesis@blocks@clear% + \ifx\thesis@thanks\undefined\else + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\vspace*{\fill}\thesis@@{thanksTitle}}% - \thesis@thanks% + \thesis@thanks \end{alwayssingle}% \fi} % \end{macrocode} @@ -704,8 +702,8 @@ % Start the new chapter without clearing the right page {\def\cleardoublepage{} \chapter*{\thesis@@{abstractTitle}}}% - \noindent\thesis@abstract% - \par\vfil\null% + \noindent\thesis@abstract + \par\vfil\null \end{alwayssingle}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@abstractEn} @@ -714,14 +712,14 @@ % macro produces no output. % \begin{macrocode} \def\thesis@blocks@abstractEn{% - \ifthesis@english\else% + \ifthesis@english\else {\thesis@selectLocale{english}% \begin{alwayssingle}% % Start the new chapter without clearing the right page {\def\cleardoublepage{}% \chapter*{\thesis@english@abstractTitle}% \thesis@abstractEn}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}}% \fi} % \end{macrocode} @@ -735,7 +733,7 @@ {\def\cleardoublepage{}% \chapter*{\thesis@@{keywordsTitle}}% \noindent\thesis@TeXkeywords}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@keywordsEn} @@ -744,14 +742,14 @@ % macro produces no output. % \begin{macrocode} \def\thesis@blocks@keywordsEn{% - \ifthesis@english\else% + \ifthesis@english\else {\thesis@selectLocale{english}% \begin{alwayssingle}% % Start the new chapter without clearing the right page {\def\cleardoublepage{}% \chapter*{\thesis@english@keywordsTitle}% \thesis@TeXkeywordsEn}% - \par\vfil\null% + \par\vfil\null \end{alwayssingle}}% \fi} % \end{macrocode} @@ -779,30 +777,30 @@ \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true \def\thesis@blocks@assignment{% - \ifthesis@blocks@assignment@% - \ifx\thesis@assignmentFiles\undefined% + \ifthesis@blocks@assignment@ + \ifx\thesis@assignmentFiles\undefined % Typeset a placeholder page. - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \thispagestyle{empty}% \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}% \noindent\textit{\thesis@@{assignment}}% \end{alwayssingle}% - \else% + \else {\edef\@pdfList{\thesis@assignmentFiles}% \ifx\@pdfList\empty\else \let\ea\expandafter % Inject the specified PDF documents. \def\@inject##1,{\thesis@blocks@clear \def\@args{##1}\def\@relax{\relax}% - \ifx\@args\@relax\else% + \ifx\@args\@relax\else % Trim leading spaces. \edef\@trimmed{\romannumeral-`\.##1}% \includepdf[pages=-]\@trimmed \ea\@inject\fi}% \ea\@inject\@pdfList,\relax,% \fi}% - \fi% + \fi \fi} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@mainMatter} @@ -831,59 +829,57 @@ % Load the `fithesis-1*.clo` size option \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax +% Define the running heading style \def\ps@thesisheadings{% -\def\chaptermark##1{% -\markright{% -\ifnum\c@secnumdepth >\m@ne -\thechapter.\ % -\fi ##1}} -\let\@oddfoot\@empty -\let\@oddhead\@empty -\def\@oddhead{\vbox{\hbox to \textwidth{% -\hfil{\sc\rightmark}}\vskip 4pt\hrule}} -\if@twoside - \def\@evenhead{\vbox{\hbox to \textwidth{% - {\sc\rightmark}\hfil}\vskip 4pt\hrule}} -\else - \let\@evenhead\@oddhead -\fi -\def\@oddfoot{\hfil\PageFont\thepage} -\if@twoside - \def\@evenfoot{\PageFont\thepage\hfil}% -\else - \let\@evenfoot\@oddfoot -\fi -\let\@mkboth\markboth -} + \def\chaptermark##1{% + \markright{% + \ifnum\c@secnumdepth >\m@ne + \thechapter.\ % + \fi ##1}} + \let\@oddfoot\@empty + \let\@oddhead\@empty + \def\@oddhead{% + \vbox{% + \hbox to \textwidth{% + \hfil{\sc\rightmark}}% + \vskip 4pt\hrule}} + \if@twoside + \def\@evenhead{% + \vbox{% + \hbox to \textwidth{% + {\sc\rightmark}% + \hfil} + \vskip 4pt\hrule}} + \else + \let\@evenhead\@oddhead + \fi + \def\@oddfoot{\hfil\PageFont\thepage} + \if@twoside + \def\@evenfoot{\PageFont\thepage\hfil}% + \else + \let\@evenfoot\@oddfoot + \fi + \let\@mkboth\markboth} -% Redefines the style of the chapter headings +% Redefine the style of the chapter headings \renewcommand*\chapter{% -\if@twoside - \clearpage - \thispagestyle{empty} - \cleardoublepage -\else - \clearpage -\fi -\thispagestyle{plain}% -\global\@topnum\z@ -\@afterindentfalse -\secdef\@chapter\@schapter} + \thesis@blocks@clear + \thispagestyle{plain}% + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} -% Redefines the style of part headings +% Redefine the style of part headings \renewcommand*\part{% -\clearpage -\thispagestyle{empty} -\cleardoublepage -\thispagestyle{empty}% -\if@twocolumn% - \onecolumn - \@tempswatrue -\else - \@tempswafalse -\fi -\hbox{}\vfil -\secdef\@part\@spart} + \thesis@blocks@clear + \if@twocolumn + \onecolumn + \@tempswatrue + \else + \@tempswafalse + \fi + \hbox{}\vfil + \secdef\@part\@spart} \newif\if@restonecol \def\alwayssingle{% @@ -936,16 +932,16 @@ % \begin{macrocode} %<*opt> %<*10pt> -\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2016/01/07] -\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont% +\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ \belowdisplayshortskip 6\p@ plus3\p@ minus3\p@ \let\@listi\@listI} -\renewcommand{\small}{\fontsize\@ixpt{11}\selectfont% +\renewcommand{\small}{\fontsize\@ixpt{11}\selectfont \abovedisplayskip 8.5\p@ plus3\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus2\p@ @@ -954,7 +950,7 @@ \topsep 4\p@ plus2\p@ minus2\p@\parsep 2\p@ plus\p@ minus\p@ \itemsep \parsep}} -\renewcommand{\footnotesize}{\fontsize\@viiipt{9.5}\selectfont% +\renewcommand{\footnotesize}{\fontsize\@viiipt{9.5}\selectfont \abovedisplayskip 6\p@ plus2\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus\p@ @@ -979,16 +975,16 @@ % match the type size of 11 points. % \begin{macrocode} %<*11pt> -\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2016/01/07] -\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont% +\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ -%\abovedisplayshortskip \z@ plus3\@p +% \abovedisplayshortskip \z@ plus3\@p \let\@listi\@listI} -\renewcommand{\small}{\fontsize\@xpt{12}\selectfont% +\renewcommand{\small}{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -997,7 +993,7 @@ \topsep 6\p@ plus2\p@ minus2\p@\parsep 3\p@ plus2\p@ minus\p@ \itemsep \parsep}} -\renewcommand{\footnotesize}{\fontsize\@ixpt{11}\selectfont% +\renewcommand{\footnotesize}{\fontsize\@ixpt{11}\selectfont \abovedisplayskip 8\p@ plus2\p@ minus4\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus\p@ @@ -1048,7 +1044,7 @@ % should remain constant regardless of the font size setting. % \begin{macrocode} %<*12pt> -\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2015/06/23] +\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2016/01/07] %</12pt> \def\thesis@titlePage@normalsize{\fontsize\@xiipt{14.5}% @@ -1058,7 +1054,7 @@ \belowdisplayshortskip 6.5\p@ plus3.5\p@ minus3\p@ \let\@listi\@listI} -\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont% +\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -1068,7 +1064,7 @@ \itemsep \parsep \topsep 9\p@ plus3\p@ minus5\p@}} -\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont% +\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ \belowdisplayskip \abovedisplayskip \abovedisplayshortskip \z@ plus3\p@ @@ -1208,38 +1204,31 @@ \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\def\@makechapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \ifnum - \c@secnumdepth >\m@ne - \par\nobreak - \vskip 10\p@ - \fi - \Large \ChapFont \thechapter{} \space #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makechapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \ifnum + \c@secnumdepth >\m@ne + \par\nobreak + \vskip 10\p@ + \fi + \Large \ChapFont \thechapter{} \space #1\par + \nobreak + \vskip 20\p@}} -\def\@makeschapterhead#1{% - {% - \setlength\parindent{\z@}% - \setlength\parskip {\z@}% - \Large \ChapFont #1\par - \nobreak - \vskip 20\p@ - }% -} +\def\@makeschapterhead#1{{% + \setlength\parindent{\z@}% + \setlength\parskip {\z@}% + \Large \ChapFont #1\par + \nobreak + \vskip 20\p@}} \def\chapter{% - \clearpage - \thispagestyle{plain} - \global\@topnum\z@ - \@afterindentfalse - \secdef\@chapter\@schapter - } + \clearpage + \thispagestyle{plain} + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth @@ -1248,7 +1237,7 @@ \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}{\protect \numberline{\thechapter}\bfseries #1} - \else% + \else \addcontentsline{toc}{chapter}{\bfseries #1} \fi \chaptermark{#1}% @@ -1264,32 +1253,24 @@ \fi } -%\def\@schapter#1{\if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% -% \else \@makeschapterhead{#1}% -% \markright{#1} -% \@afterheading\fi} - -\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus - -.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}} -\def\subsection{\@startsection{subsection}{2}{\z@}{-3.25ex plus-1ex - minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize\bfseries}} -\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{-3.25ex plus - -1ex minus-.2ex}{1.5ex plus.2ex}{\reset@font\normalsize}} -\def\paragraph{\@startsection - {paragraph}{4}{\z@}{3.25ex plus1ex minus.2ex}{-1em}{\reset@font - \normalsize\bfseries}} -\def\subparagraph{\@startsection - {subparagraph}{4}{\parindent}{3.25ex plus1ex minus - .2ex}{-1em}{\reset@font\normalsize\bfseries}} +\def\section{\@startsection{section}{1}{\z@}{% + -3.5ex plus-1ex minus-.2ex}{2.3ex plus.2ex}{% + \reset@font\large\bfseries}} +\def\subsection{\@startsection{subsection}{2}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize\bfseries}} +\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{% + -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% + \reset@font\normalsize}} +\def\paragraph{\@startsection{paragraph}{4}{\z@}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} +\def\subparagraph{\@startsection{subparagraph}{4}{\parindent}{% + 3.25ex plus1ex minus.2ex}{-1em}{% + \reset@font\normalsize\bfseries}} \setcounter{secnumdepth}{2} -\def\appendix{\par - \setcounter{chapter}{0}% - \setcounter{section}{0}% - \def\@chapapp{\appendixname}% - \def\thechapter{\Alph{chapter}}} - \leftmargini 2.5em \leftmarginii 2.2em % > \labelsep + width of '(m)' \leftmarginiii 1.87em % > \labelsep + width of 'vii.' @@ -1302,7 +1283,7 @@ \labelwidth\leftmargini\advance\labelwidth-\labelsep %<*10pt> -\def\@listI{\leftmargin\leftmargini \parsep 4\p@ plus2\p@ minus\p@% +\def\@listI{\leftmargin\leftmargini \parsep 4\p@ plus2\p@ minus\p@ \topsep 8\p@ plus2\p@ minus4\p@ \itemsep 4\p@ plus2\p@ minus\p@} @@ -1310,25 +1291,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 4\p@ plus2\p@ minus\p@ - \parsep 2\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 4\p@ plus2\p@ minus\p@ + \parsep 2\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep\p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep\p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} %</10pt> % %<*11pt> @@ -1340,25 +1321,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 4.5\p@ plus2\p@ minus\p@ - \parsep 2\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 4.5\p@ plus2\p@ minus\p@ + \parsep 2\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep \p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep \p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} %</11pt> % %<*12pt> @@ -1370,25 +1351,25 @@ \@listi \def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep 5\p@ plus2.5\p@ minus\p@ - \parsep 2.5\p@ plus\p@ minus\p@ - \itemsep \parsep} + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep 5\p@ plus2.5\p@ minus\p@ + \parsep 2.5\p@ plus\p@ minus\p@ + \itemsep \parsep} \def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep 2.5\p@ plus\p@ minus\p@ - \parsep \z@ \partopsep \p@ plus\z@ minus\p@ - \itemsep \topsep} + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep 2.5\p@ plus\p@ minus\p@ + \parsep \z@ \partopsep \p@ plus\z@ minus\p@ + \itemsep \topsep} \def\@listiv{\leftmargin\leftmarginiv - \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginiv\advance\labelwidth-\labelsep} \def\@listv{\leftmargin\leftmarginv - \labelwidth\leftmarginv\advance\labelwidth-\labelsep} + \labelwidth\leftmarginv\advance\labelwidth-\labelsep} \def\@listvi{\leftmargin\leftmarginvi - \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} + \labelwidth\leftmarginvi\advance\labelwidth-\labelsep} %</12pt> %</opt> % \end{macrocode} 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 b261d35aba3..f41f6fa10cd 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -121,7 +121,7 @@ % contents. % \begin{macrocode} \def\thesis@blocks@toc{% - \thesis@blocks@clear% + \thesis@blocks@clear \tableofcontents} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@tables} @@ -129,8 +129,8 @@ % |\listoftables| and |\listoffigures|. % \begin{macrocode} \def\thesis@blocks@tables{% - \thesis@blocks@clear% - \thesis@blocks@lot% + \thesis@blocks@clear + \thesis@blocks@lot \thesis@blocks@lof} % \end{macrocode} % \end{macro} 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 d372ecebf55..c107b8311d9 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx @@ -6,7 +6,7 @@ % \url{http://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2016/01/07] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -43,7 +43,7 @@ {\thesis@titlePage@Large\bf\thesis@author} % If this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous {\thesis@titlePage@large\\[0.3in] {\bf\thesis@@{advisorTitle}:} \thesis@advisor} \fi}% @@ -51,7 +51,7 @@ {\thesis@titlePage@large\thesis@place, \thesis@@{semester} % If this is a rigorous thesis, create space for the advisor's % signature - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous \let\@A\relax\newlength{\@A} \settowidth{\@A}{\thesis@@{advisorSignature}} \setlength{\@A}{\@A+1cm} @@ -69,15 +69,15 @@ % typesets the advisor's name at the bottom of the page. % \begin{macrocode} \def\thesis@blocks@declaration{% - \thesis@blocks@clear% + \thesis@blocks@clear \begin{alwayssingle}% \chapter*{\thesis@@{declarationTitle}}% - \thesis@declaration% + \thesis@declaration \vskip 2cm% - \hfill\thesis@author% - \par\vfill\noindent% - \textbf{\thesis@@{advisorTitle}:} \thesis@advisor% - \par\vfil% + \hfill\thesis@author + \par\vfill\noindent + \textbf{\thesis@@{advisorTitle}:} \thesis@advisor + \par\vfil \end{alwayssingle}} % \end{macrocode} % \end{macro} 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 97caf149c91..da28f49e77c 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}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/01/12] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -89,11 +89,11 @@ % Unless this is a rigorous thesis, we will be typesetting the % name of the thesis advisor. \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous \setlength{\@E}{0pt}% - \else% + \else \settowidth{\@E}{{\bf\thesis@czech@bib@advisor:}} - \fi% + \fi \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% \bf\thesis@czech@bib@academicYear:}} \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% @@ -124,7 +124,7 @@ & \thesis@field \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% + \ifx\thesis@type\thesis@rigorous\else \textbf{\thesis@czech@bib@advisor:} & \thesis@advisor \\ \fi @@ -189,11 +189,11 @@ % Unless this is a rigorous thesis, we will be typesetting % the name of the thesis advisor. \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous% + \ifx\thesis@type\thesis@rigorous \setlength{\@E}{0pt}% - \else% + \else \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} - \fi% + \fi \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% \bf\thesis@english@bib@academicYear:}} \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% @@ -224,7 +224,7 @@ & \thesis@fieldEn \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% + \ifx\thesis@type\thesis@rigorous\else \textbf{\thesis@english@bib@advisor:} & \thesis@advisor \\ \fi @@ -307,15 +307,47 @@ {\bf\thesis@titlePage@LARGE\thesis@author\\} \vfill\noindent % The bottom of the page - {\bf\thesis@titlePage@normalsize% + {\bf\thesis@titlePage@normalsize % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else% - \thesis@czech@advisorTitle: \thesis@advisor\hfill% - \fi% + \ifx\thesis@type\thesis@rigorous\else + \thesis@czech@advisorTitle: \thesis@advisor\hfill + \fi \thesis@place\ \thesis@year} \end{alwayssingle}} % \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\DescribeMacro{\thesis@czech@bib@title} +% |\thesis@czech@authorSignature| -- The label of the author's +% signature field +% |\thesis@czech@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@czech@formattedDate\hfill + \begin{minipage}[t]{\@A}% + \centering\rule{\@A}{1pt}\\ + \thesis@@{authorSignature}\par + \end{minipage}} + \end{alwayssingle}} +% \end{macrocode} % \end{macro} % All blocks within the autolayout postamble that are not defined % within this file are defined in the |