diff options
| author | Karl Berry <karl@freefriends.org> | 2015-11-19 22:40:04 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-11-19 22:40:04 +0000 |
| commit | c97eafc789593a5348cff6033c58c3bfb0beab19 (patch) | |
| tree | 82eff5de594cf23b8184ae8791391bb1bfb861c1 | |
| parent | 52b5b5df295683036612072db256172356408bf9 (diff) | |
fithesis (19nov15)
git-svn-id: svn://tug.org/texlive/trunk@38893 c570f23f-e606-0410-a88d-b1316a301751
49 files changed, 284 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf Binary files differindex 7617ecdcec1..f168bffbb62 100644 --- a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf Binary files differindex ca34a75f90c..f07d4b40311 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf Binary files differindex dab8c381f10..994dcc1170c 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf Binary files differindex 6312a53dd77..c7a4c87089c 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf Binary files differindex cebeb0b8fef..63405e74f35 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf Binary files differindex edde1fa1cd7..538d1cbf3c3 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf Binary files differindex df4f61d4cc8..2de30fcaefd 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf Binary files differindex 763f13e29fb..79908440094 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf Binary files differindex ce436e98209..70278db1982 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf Binary files differindex e0a9eb8e586..22f3b71f598 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 7655b94d4b0..ad5fc26dec9 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -14,6 +14,8 @@ \usepackage[T1]{fontenc} % use 8bit fonts \emergencystretch 2dd \usepackage{hypdoc} +\usepackage{microtype} +\usepackage{ragged2e} % Making paragraphs numbered \makeatletter @@ -38,6 +40,7 @@ \RecordChanges \DocInput{fithesis.dtx} \PrintIndex + \RaggedRight \PrintChanges \end{document} @@ -46,11 +49,28 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/10/14 v0.3.23 fithesis3 MU thesis class} +\def\thesis@version{2015/11/17 v0.3.24 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.24} {2015/11/17}{Added the \cs{thesis@backend} +% tunable. The hyphenation pattern switching now uses +% \textsf{polyglossia} instead of crude \cs{language} switching +% wherenever possible. Added the opt-out \texttt{microtype} +% class option, which loads the microtypographic extension. The +% \cs{thesis@}\textit{locale}\texttt{@summer} and +% \texttt{@winter} locale macros were renamed to \texttt{@spring} +% and \texttt{@fall}. The \cs{thesis@parseDate} now uses more +% realistic month ranges to set \cs{thesis@season} and +% \cs{thesis@academicYear}. Removed the extraneous indent in the +% \cs{thesis@blocks@declaration} macro definition within the +% \texttt{style/mu/fithesis-fi.sty} style file. \cs{paragraph}s +% are not included in the table of contents by default. The +% \texttt{table} class option now supports the \texttt{tabu} +% environment. The list of tables and the list of figures now +% have an entry in the table of contents for the +% \texttt{style/mu/fithesis-econ.sty} style file. [VN]} % \changes{v0.3.23} {2015/10/14}{Fixed a typo in the Slovak % locale. [VN]} % \changes{v0.3.22} {2015/10/09}{Updated the link colors in the @@ -165,7 +185,7 @@ % Restructured the code to make it more amenable to literal programming. % Added support for \cs{CodelineIndex} typesetting. Added information about % the usage of \textsf{fithesis1} and \textsf{fithesis2} on the FI unix -% machines. (backport of v0.2.16) [VN]\\Minor changes throughout the text, +% machines. (backport of v0.2.16) [VN] Minor changes throughout the text, % added a link to the the fithesis forums [PS] (backport of v0.2.15@r14:15)} % \changes{v0.3.04} {2015/01/14}{Import the url package to allow for the use of % \cs{url} within the documentation. (backport of v0.2.15@r13) [VN]} @@ -238,12 +258,28 @@ % \tableofcontents % % \section{Required classes and packages} -% The class loads the \texttt{rapport3} base class and the -% following packages: \begin{itemize} +% \begin{macro}{\thesis@backend} +% The class requires the class specified in |\thesis@backend|, +% whose default value is |[a4paper]{rapport3}|. If a different +% base class is desired, it can be specified by redefining +% |\thesis@backend| prior to loading the \textsf{fithesis3} class. +% \begin{macrocode} +\ProvidesClass{fithesis3}[\thesis@version] +\ifx\thesis@backend\undefined + \def\thesis@backend{[a4paper]{rapport3}} +\fi\expandafter\LoadClass\thesis@backend +% \end{macrocode} +% \end{macro} +% The class also requires the following packages: +% \begin{itemize} % \item\textsf{keyval} -- Adds support for parsing % comma-delimited lists of key-value pairs. % \item\textsf{etoolbox} -- Adds support for expanding % code after the preamble using the |\AtPreamble| hook. +% \item\textsf{ltxcmds} -- Implements several commands from +% the \LaTeX\ kernel. Used for the |\ltx@ifpackageloaded| +% command, which -- unlike its |\@ifpackageloaded| counterpart +% -- can be used outside the preamble. % \item\textsf{ifxetex} -- Used to detect the \Hologo{XeTeX} % engine. % \item\textsf{ifluatex} -- Used to detect the \Hologo{LuaTeX} @@ -257,10 +293,9 @@ % \ref{sec:thesis@load}). Other packages may be required by the % style files (see Section \ref{sec:style-files}) you are using. % \begin{macrocode} -\ProvidesClass{fithesis3}[\thesis@version] -\LoadClass[a4paper]{rapport3} \RequirePackage{keyval} \RequirePackage{etoolbox} +\RequirePackage{ltxcmds} \RequirePackage{ifxetex} \RequirePackage{ifluatex} \ifxetex\else\ifluatex\else @@ -273,7 +308,9 @@ % Any \oarg{options} passed to the class will be handed down to the % loaded style files. The supported options are therefore documented % in the subsections of Section \ref{sec:style-files} dedicated to -% the respective style files. +% the respective style files. At the moment, all options are +% processed by the \texttt{style/mu/fithesis-base.sty} style file +% documented in Section \ref{sec:fithesis-mu-base}. % % \subsection{The \cs{thesissetup} macro} % \begin{macro}{\thesissetup} @@ -772,7 +809,7 @@ % \end{macro} % \subsubsection{The \texttt{date} key} % The \marg{\texttt{date}=date} pair sets the date of the thesis -% defence to \textit{date}, where \textit{date} is a string +% submission to \textit{date}, where \textit{date} is a string % in the \texttt{YYYY/MM/DD} format, where \texttt{YYYY} stands % for full year, \texttt{MM} stands for month and \texttt{DD} % stands for day. The \textit{date} is parsed and stored using @@ -790,40 +827,43 @@ % \item\DescribeMacro{\thesis@season}|\thesis@season| -- Expands % to either: % \begin{itemize} -% \item\texttt{winter} if \texttt{MM} $<7$. -% \item\texttt{summer} if \texttt{MM} $\geq7$. +% \item\texttt{spring} if $2>{}$\texttt{MM}${}<9$, +% \item\texttt{fall} if $2\leq{}$\texttt{MM}${}\geq9$. % \end{itemize} % \item\DescribeMacro{\thesis@academicYear}|\thesis@academicYear| % -- The academic year of the given semester: % \begin{itemize} -% \item\texttt{YYYY/YYYY}$+1$ in case of a summer semester -% \item\texttt{YYYY}$-1$\texttt{/YYYY} in case of a winter -% semester +% \item\texttt{YYYY}${}-1$\texttt{/YYYY} if \texttt{MM}${}<9$. +% \item\texttt{YYYY/YYYY}${}+1$ if \texttt{MM}${}\geq9$ % \end{itemize} % \end{itemize} % To set up the default values, the |\thesis@parseDate| macro is % called with the fully expanded |\the\year/\the\month/\the\day| -% string. +% string, which equals the current date. % \begin{macrocode} \def\thesis@parseDate#1/#2/#3|{{ - % Basic info + % Set the basic macros \gdef\thesis@date{#1/#2/#3}% \gdef\thesis@year{#1}% \gdef\thesis@month{#2}% \gdef\thesis@day{#3}% - % Season and academic year - \newcount\@year \expandafter\@year \thesis@year \relax% - \newcount\@month\expandafter\@month\thesis@month\relax% - \ifnum\@month<7% - \gdef\thesis@season{winter}% - \advance\@year-1\edef\@yearA{\the\@year}% - \advance\@year 1\edef\@yearB{\the\@year}% - \else% - \gdef\thesis@season{summer}% + % Set the season + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month>8\gdef\thesis@season{fall} + \else\ifnum\@month<3\gdef\thesis@season{fall} + \else \gdef\thesis@season{spring} + \fi\fi + + % Set the academic year + \newcount\@year\expandafter\@year\thesis@year\relax + \ifnum\@month>8% \edef\@yearA{\the\@year}% \advance\@year 1\edef\@yearB{\the\@year}% - \fi% + \else + \advance\@year-1\edef\@yearA{\the\@year}% + \advance\@year 1\edef\@yearB{\the\@year}% + \fi \global\edef\thesis@academicYear{\@yearA/\@yearB}}} \edef\thesis@date{\the\year/\the\month/\the\day}% @@ -1067,13 +1107,17 @@ \makeatletter% % \end{macrocode} % First, the main locale is selected and its files are loaded using -% the |\thesis@selectLocale| macro. +% the |\thesis@selectLocale| macro. If the user specified an +% explicit empty string as the value of |\thesis@locale|, do +% nothing. % \begin{macrocode} \ifx\thesis@locale\empty\else + \thesis@requireLocale{\thesis@locale} \thesis@selectLocale{\thesis@locale} \fi % \end{macrocode} -% Consequently, the style files are loaded. +% Consequently, the style files are loaded. If the user specified an +% explicit empty string as the value of |\thesis@style|, do nothing. % \begin{macrocode} \ifx\thesis@style\empty\else \thesis@requireStyle{\thesis@style} @@ -1176,7 +1220,7 @@ % \end{macrocode} % \end{macro}\begin{macro}{\thesis@requireLocale} % If inheritance is enabled for style files, then the -% |\thesis@requireStyle|\marg{locale} macro sequentially +% |\thesis@requireLocale|\marg{locale} macro sequentially % loads each of the following locale files, provided they exist: % \begin{enumerate} % \item|\thesis@localepath fithesis-|\textit{locale}|.def| @@ -1194,19 +1238,24 @@ % The macro can be used within both locale and style files, % although the usage within locale files is strongly discouraged to % prevent circular dependencies. +% +% If the \textsf{polyglossia} package is being used, its +% definitions for the respective locale get loaded as well. As a +% consequence, this command may not be used within the document, +% but only in the preamble. % \begin{macrocode} \def\thesis@requireLocale#1{% % Ignore redundant requests \expandafter\ifx\csname thesis@#1@required\endcsname\relax% \expandafter\def\csname thesis@#1@required\endcsname{}% - {\makeatletter % Enable requiring from within the document - \thesis@input{\thesis@localepath fithesis-#1.def}% - \ifthesis@locale@inheritance% - \thesis@input{\thesis@localepath\thesis@university/% - fithesis-#1.def}% - \thesis@input{\thesis@localepath\thesis@university/% - \thesis@faculty/fithesis-#1.def}% - \fi} + \@ifpackageloaded{polyglossia}{\setotherlanguage{#1}}{} + \thesis@input{\thesis@localepath fithesis-#1.def}% + \ifthesis@locale@inheritance% + \thesis@input{\thesis@localepath\thesis@university/% + fithesis-#1.def}% + \thesis@input{\thesis@localepath\thesis@university/% + \thesis@faculty/fithesis-#1.def}% + \fi \fi} % \end{macrocode}\end{macro} % \subsection{String manipulation macros} @@ -1291,13 +1340,21 @@ % \end{macrocode} % \DescribeMacro{\thesis@selectLocale}|\thesis@selectLocale|\marg{locale} % macro redefines the |\thesis@locale| macro to \textit{locale}, -% loads the locale files of \textit{locale} and switches to the -% hyphenation patterns of \textit{locale}. +% and switches to the hyphenation patterns of \textit{locale}. The +% respective locale files and polyglossia locale definitions should +% be loaded beforehand using the |\thesis@requireLocale| macro. +% +% This macro should always be used within a group, so that the +% locale settings and the hyphenation return back to what the user +% has specified after the localized block of typographic material. % \begin{macrocode} \def\thesis@selectLocale#1{% \edef\thesis@locale{#1}% - \thesis@requireLocale{\thesis@locale}% - \expandafter\language\csname l@\thesis@locale\endcsname} + \ltx@ifpackageloaded{polyglossia}{% + \selectlanguage{\thesis@locale} + }{% + \language\csname l@\thesis@locale\endcsname + }} % \end{macrocode} % \iffalse %</class> @@ -1380,10 +1437,10 @@ % of the declaration section % \item|\thesis@|\textit{locale}|@idTitle| -- The title of the % thesis author's identifier field -% \item|\thesis@|\textit{locale}|@winter| -- The name of the -% winter semester -% \item|\thesis@|\textit{locale}|@summer| -- The name of the -% summer semester +% \item|\thesis@|\textit{locale}|@spring| -- The name of the +% spring semester +% \item|\thesis@|\textit{locale}|@fall| -- The name of the +% fall semester % \item|\thesis@|\textit{locale}|@semester| -- The full name of % the current semester % \item|\thesis@|\textit{locale}|@typeName| -- The name of the diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 05264cd3494..6dae2d77ec9 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -10,7 +10,7 @@ % \end{macro}\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/11/17] % Pomocná makra \gdef\thesis@czech@gender@koncovka{% @@ -32,8 +32,8 @@ \gdef\thesis@czech@thanksTitle{Poděkování} \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} -\gdef\thesis@czech@winter{Jaro} -\gdef\thesis@czech@summer{Podzim} +\gdef\thesis@czech@spring{jaro} +\gdef\thesis@czech@fall{podzim} \gdef\thesis@czech@semester{% \thesis@{czech@\thesis@season} \thesis@year} \gdef\thesis@czech@typeName{% @@ -70,10 +70,10 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/11/17] % Zástupné texty -\gdef\thesis@czech@universityName{Masarykova Univerzita} +\gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} zpracoval% \thesis@czech@gender@koncovka\ samostatně a diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 44453fb4031..527488417b6 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -4,7 +4,7 @@ % \iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/10] % Placeholders \gdef\thesis@english@universityName{University name} @@ -22,8 +22,8 @@ \gdef\thesis@english@thanksTitle{Acknowledgement} \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} -\gdef\thesis@english@winter{Spring} -\gdef\thesis@english@summer{Fall} +\gdef\thesis@english@spring{Spring} +\gdef\thesis@english@fall{Fall} \gdef\thesis@english@semester{% \thesis@{english@\thesis@season} \thesis@year} \gdef\thesis@english@typeName{% diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 974093f24ab..05fb8c8f42e 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -10,7 +10,7 @@ % \end{macro}\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/11/17] % Pomocná makrá \gdef\thesis@slovak@gender@koncovka{% @@ -32,8 +32,8 @@ \gdef\thesis@slovak@thanksTitle{Poďakovanie} \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} -\gdef\thesis@slovak@winter{Jar} -\gdef\thesis@slovak@summer{Jeseň} +\gdef\thesis@slovak@spring{jar} +\gdef\thesis@slovak@fall{jeseň} \gdef\thesis@slovak@semester{% \thesis@{slovak@\thesis@season} \thesis@year} \gdef\thesis@slovak@typeName{% @@ -70,10 +70,10 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/11/17] % Zástupné texty -\gdef\thesis@slovak@universityName{Masarykova Univerzita} +\gdef\thesis@slovak@universityName{Masarykova univerzita} \gdef\thesis@slovak@declaration{% Prehlasujem, že som predloženú \thesis@lower{% slovak@typeName@akuzativ} vypracoval% 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 e0153aa90ab..6ab1060ec2d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -1,13 +1,13 @@ % \iffalse %<*base> -% \fi\file{style/mu/fithesis-base.sty} +% \fi\file{style/mu/fithesis-base.sty}\label{sec:fithesis-mu-base} % This is the base style file for theses written at the Masaryk % University in Brno. When inheritance is enabled for style files, % this file is always the second style file to be loaded right % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/08/26] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/11/17] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -30,9 +30,9 @@ % or aren't marked within the document, respectively, and % graphics either aren't or are inserted into the document, % respectively. -% \item\texttt{palatino}, \texttt{nopalatino} -- The default -% roman and math font family is going to be either set to -% Palatino or left untouched, respectively. The +% \item\texttt{palatino}, \texttt{nopalatino} -- The roman +% text font family and the math font family is going to be +% either set to Palatino or left untouched, respectively. The % \DescribeMacro{\ifthesis@palatino@}|\ifthesis@|^^A % \discretionary{}{}{}|palatino@| conditional is set to either % \texttt{true} or \texttt{false}, respectively. The @@ -44,13 +44,21 @@ % \DescribeMacro{\ifthesis@color@}|\ifthesis@color@| % conditional is set to either \texttt{true} or \texttt{false}, % respectively. +% \item\texttt{microtype}, \texttt{nomicrotype} -- The +% microtypographic extension of modern \TeX\ engines -- such as +% \hologo{pdfTeX}, \Hologo{XeTeX}, or \Hologo{LuaTeX} -- is or isn't +% going to be enabled, respectively. The +% \DescribeMacro{\ifthesis@microtype@}|\ifthesis@microtype@| +% conditional is set to either \texttt{true} or \texttt{false}, +% respectively. % \item\texttt{table}, \texttt{oldtable} -- If the % |\ifthesis@color@| conditional is \texttt{true}, then the -% definition of the \texttt{tabular} and \texttt{tabularx} -% commands either are or aren't going to be altered to better -% match the style, respectively. The \DescribeMacro% -% {\ifthesis@newtable@}|\ifthesis@newtable@| conditional is set -% to either \texttt{true} or \texttt{false}, respectively. +% definitions of the \texttt{tabular}, \texttt{tabularx}, and +% \texttt{tabu} commands either are or aren't going to be +% altered to better match the style, respectively. The +% \DescribeMacro{\ifthesis@newtable@}|\ifthesis@newtable@| +% conditional is set to either \texttt{true} or \texttt{false}, +% respectively. % % The choice of the option name is deliberate -- the % redefinition of the table environments depends on the @@ -97,6 +105,9 @@ \newif\ifthesis@color@ \DeclareOption{monochrome}{\thesis@color@false} \DeclareOption{color}{\thesis@color@true} +\newif\ifthesis@microtype@ +\DeclareOption{microtype}{\thesis@microtype@true} +\DeclareOption{nomicrotype}{\thesis@microtype@false} \newif\ifthesis@palatino@ \DeclareOption{palatino}{\thesis@palatino@true} \DeclareOption{nopalatino}{\thesis@palatino@false} @@ -113,10 +124,14 @@ % \end{macrocode} % These are the default options: % \begin{macrocode} -\ExecuteOptions{12pt,twoside,final,monochrome,palatino, - oldtable,lot,lof,nocover} +\ExecuteOptions{12pt,twoside,final,monochrome,microtype,% + palatino,oldtable,lot,lof,nocover} \ProcessOptions % \end{macrocode} +% The file uses English locale strings within the macros. +% \begin{macrocode} +\thesis@requireLocale{english} +% \end{macrocode} % The file loads the following packages: \begin{itemize} % \item\textsf{xcolor} -- Adds support for color manipulation. % \item\textsf{ifxetex} -- Used to detect the \Hologo{XeTeX} @@ -141,6 +156,13 @@ \thesis@require{ifxetex} \thesis@require{ifluatex} % \end{macrocode} +% If the |\thesis@microtype@| is set to true, then the +% \textsf{microtype} package gets loaded. +% \begin{macrocode} +\ifthesis@microtype@ + \thesis@require{microtype} +\fi +% \end{macrocode} % Using the |\ifxetex| and |\ifluatex| conditionals, a compound % \DescribeMacro{\ifthesis@xeluatex}|\ifthesis@xeluatex| % conditional was constructed. This conditional can be used by @@ -204,25 +226,38 @@ \fi % \end{macrocode} % If the |\thesis@newtable@| and |\thesis@color@| conditionals are -% \texttt{true}, then the following package gets loaded: +% \texttt{true}, then the following packages get loaded: % \begin{itemize} % \item\textsf{tabularx} -- Provides the \texttt{tabularx} % environment, which enables the typesetting of tables with % flexible-width columns. +% \item\textsf{tabu} -- Provides the \texttt{tabu} environment, +% which enables the typesetting of complex tables. +% \item\textsf{booktabs} -- A package, which allows the creation +% of publication-quality tables in \LaTeX. % \end{itemize} % Subsequently, the \texttt{tabular} and \texttt{tabularx} % environments are redefined to better match the style of the given % faculty. % -% The |\thesis@newtable@old| and |\endthesis@newtable@old| macros -% containing the original definition of the |tabular| environment -% are always defined and are available for subsequently loaded -% styles in case the typesetting of unaltered tables is required. +% The \DescribeMacro{\thesis@newtable@old}|\thesis@newtable@old| +% and \DescribeMacro{\endthesis@newtable@old} +% |\endthesis@newtable@old| macros containing the original +% definition of the |tabular| environment are always defined and +% are available for subsequently loaded styles in case the +% typesetting of unaltered tables is required. Similarly, the +% \DescribeMacro{\thesis@newtable@oldx}|\thesis@newtable@oldx| and +% \DescribeMacro{\endthesis@newtable@oldx}|\endthesis@newtable@oldx| +% macros are defined for the |tabularx| environment and the +% \DescribeMacro{\thesis@newtable@oldtabu}|\thesis@newtable@oldtabu| +% and \DescribeMacro{\endthesis@newtable@oldtabu} +% |\endthesis@newtable@oldtabu| for the |tabu| environment. % \begin{macrocode} \let\thesis@newtable@old\tabular \let\endthesis@newtable@old\endtabular \ifthesis@newtable@\ifthesis@color@ \thesis@require{tabularx} + \thesis@require{tabu} \thesis@require{booktabs} % The redefinition of `tabular` \renewenvironment{tabular}% @@ -238,6 +273,14 @@ {thesis@color@tableEven}% \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}% + \thesis@newtable@oldtabu}% + {\endthesis@newtable@oldtabu} % Adjust the measurements \setlength{\aboverulesep}{0pt} \setlength{\belowrulesep}{0pt} @@ -737,7 +780,7 @@ % \begin{macrocode} % Table of contents will contain sectioning commands up to % \subsubsection -\setcounter{tocdepth}{4} +\setcounter{tocdepth}{3} % Load the `fithesis-1*.clo` size option \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax 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 5718501d90b..1ea9c568bef 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -7,7 +7,7 @@ % 363/Smernice2014-9.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/11/17] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -134,6 +134,26 @@ \thesis@blocks@lof} % \end{macrocode} % \end{macro} +% If the |nolot| and |nolof| options haven't been specified, the +% |\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 + \def\thesis@blocks@lot{% + \thesis@blocks@clear + \phantomsection + \addcontentsline{toc}{chapter}{\listtablename}% + \listoftables} +\fi + +\ifx\thesis@blocks@lof\empty\else + \def\thesis@blocks@lof{% + \thesis@blocks@clear + \phantomsection + \addcontentsline{toc}{chapter}{\listfigurename}% + \listoffigures} +\fi +% \end{macrocode} % All blocks within the autolayout preamble that are not defined % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. 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 0f3ca4af74f..302202b2c5c 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx @@ -75,7 +75,7 @@ \thesis@declaration% \vskip 2cm% \hfill\thesis@author% - \par\vfill% + \par\vfill\noindent% \textbf{\thesis@@{advisorTitle}:} \thesis@advisor% \par\vfil% \end{alwayssingle}} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx index 617c89c10dd..bdae8861df1 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx @@ -6,7 +6,7 @@ % muni.cz/~korvas/pokyny_k_zaverecne_praci.doc}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2015/11/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{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 2a9d03e4dd4..112de934182 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -16,7 +16,7 @@ tableOdd={HTML}{EDF7F1}, tableEven={HTML}{CCEDD8}} % \end{macrocode} -% The file freely uses Czech locale strings within the macros. +% The file uses Czech locale strings within the macros. % \begin{macrocode} \thesis@requireLocale{czech} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 438517bbb6e..57189e68349 100644 --- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls +++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls @@ -50,13 +50,16 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\def\thesis@version{2015/10/14 v0.3.23 fithesis3 MU thesis class} +\def\thesis@version{2015/11/17 v0.3.24 fithesis3 MU thesis class} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] -\LoadClass[a4paper]{rapport3} +\ifx\thesis@backend\undefined + \def\thesis@backend{[a4paper]{rapport3}} +\fi\expandafter\LoadClass\thesis@backend \RequirePackage{keyval} \RequirePackage{etoolbox} +\RequirePackage{ltxcmds} \RequirePackage{ifxetex} \RequirePackage{ifluatex} \ifxetex\else\ifluatex\else @@ -228,24 +231,28 @@ \endgroup\thesis@locale@inheritancefalse \fi} \def\thesis@parseDate#1/#2/#3|{{ - % Basic info + % Set the basic macros \gdef\thesis@date{#1/#2/#3}% \gdef\thesis@year{#1}% \gdef\thesis@month{#2}% \gdef\thesis@day{#3}% - % Season and academic year - \newcount\@year \expandafter\@year \thesis@year \relax% - \newcount\@month\expandafter\@month\thesis@month\relax% - \ifnum\@month<7% - \gdef\thesis@season{winter}% - \advance\@year-1\edef\@yearA{\the\@year}% - \advance\@year 1\edef\@yearB{\the\@year}% - \else% - \gdef\thesis@season{summer}% + % Set the season + \newcount\@month\expandafter\@month\thesis@month\relax + \ifnum\@month>8\gdef\thesis@season{fall} + \else\ifnum\@month<3\gdef\thesis@season{fall} + \else \gdef\thesis@season{spring} + \fi\fi + + % Set the academic year + \newcount\@year\expandafter\@year\thesis@year\relax + \ifnum\@month>8% \edef\@yearA{\the\@year}% \advance\@year 1\edef\@yearB{\the\@year}% - \fi% + \else + \advance\@year-1\edef\@yearA{\the\@year}% + \advance\@year 1\edef\@yearB{\the\@year}% + \fi \global\edef\thesis@academicYear{\@yearA/\@yearB}}} \edef\thesis@date{\the\year/\the\month/\the\day}% @@ -313,6 +320,7 @@ \thesis@loadedtrue \makeatletter% \ifx\thesis@locale\empty\else + \thesis@requireLocale{\thesis@locale} \thesis@selectLocale{\thesis@locale} \fi \ifx\thesis@style\empty\else @@ -355,14 +363,14 @@ % Ignore redundant requests \expandafter\ifx\csname thesis@#1@required\endcsname\relax% \expandafter\def\csname thesis@#1@required\endcsname{}% - {\makeatletter % Enable requiring from within the document - \thesis@input{\thesis@localepath fithesis-#1.def}% - \ifthesis@locale@inheritance% - \thesis@input{\thesis@localepath\thesis@university/% - fithesis-#1.def}% - \thesis@input{\thesis@localepath\thesis@university/% - \thesis@faculty/fithesis-#1.def}% - \fi} + \@ifpackageloaded{polyglossia}{\setotherlanguage{#1}}{} + \thesis@input{\thesis@localepath fithesis-#1.def}% + \ifthesis@locale@inheritance% + \thesis@input{\thesis@localepath\thesis@university/% + fithesis-#1.def}% + \thesis@input{\thesis@localepath\thesis@university/% + \thesis@faculty/fithesis-#1.def}% + \fi \fi} \def\thesis@#1{\csname thesis@#1\endcsname} \def\thesis@@#1{\thesis@{\thesis@locale @#1}} @@ -396,8 +404,11 @@ \ifx\thesis@pages\undefined\def\thesis@pages{??}\fi \def\thesis@selectLocale#1{% \edef\thesis@locale{#1}% - \thesis@requireLocale{\thesis@locale}% - \expandafter\language\csname l@\thesis@locale\endcsname} + \ltx@ifpackageloaded{polyglossia}{% + \selectlanguage{\thesis@locale} + }{% + \language\csname l@\thesis@locale\endcsname + }} \endinput %% %% End of file `fithesis3.cls'. 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 def5d45a025..78f5dfd4f97 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}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/11/17] \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} @@ -68,8 +68,8 @@ \gdef\thesis@czech@thanksTitle{Poděkování} \gdef\thesis@czech@declarationTitle{Prohlášení} \gdef\thesis@czech@idTitle{ID} -\gdef\thesis@czech@winter{Jaro} -\gdef\thesis@czech@summer{Podzim} +\gdef\thesis@czech@spring{jaro} +\gdef\thesis@czech@fall{podzim} \gdef\thesis@czech@semester{% \thesis@{czech@\thesis@season} \thesis@year} \gdef\thesis@czech@typeName{% 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 c8dc577dd69..ca558327840 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/10] \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} @@ -65,8 +65,8 @@ \gdef\thesis@english@thanksTitle{Acknowledgement} \gdef\thesis@english@declarationTitle{Declaration} \gdef\thesis@english@idTitle{ID} -\gdef\thesis@english@winter{Spring} -\gdef\thesis@english@summer{Fall} +\gdef\thesis@english@spring{Spring} +\gdef\thesis@english@fall{Fall} \gdef\thesis@english@semester{% \thesis@{english@\thesis@season} \thesis@year} \gdef\thesis@english@typeName{% 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 a3550700ea9..446c19398f2 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/11/17] \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} @@ -68,8 +68,8 @@ \gdef\thesis@slovak@thanksTitle{Poďakovanie} \gdef\thesis@slovak@declarationTitle{Prehlásenie} \gdef\thesis@slovak@idTitle{ID} -\gdef\thesis@slovak@winter{Jar} -\gdef\thesis@slovak@summer{Jeseň} +\gdef\thesis@slovak@spring{jar} +\gdef\thesis@slovak@fall{jeseň} \gdef\thesis@slovak@semester{% \thesis@{slovak@\thesis@season} \thesis@year} \gdef\thesis@slovak@typeName{% 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 c97c75cb495..5ef32a7ab48 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,9 +49,9 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2015/11/17] -\gdef\thesis@czech@universityName{Masarykova Univerzita} +\gdef\thesis@czech@universityName{Masarykova univerzita} \gdef\thesis@czech@declaration{Prohlašuji, že jsem \thesis@lower{czech@typeName@akuzativ} zpracoval% \thesis@czech@gender@koncovka\ samostatně a 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 4f160ce15b9..967160a57b0 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,9 +49,9 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2015/11/17] -\gdef\thesis@slovak@universityName{Masarykova Univerzita} +\gdef\thesis@slovak@universityName{Masarykova univerzita} \gdef\thesis@slovak@declaration{% Prehlasujem, že som predloženú \thesis@lower{% slovak@typeName@akuzativ} vypracoval% 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 Binary files differindex 1d35a929a28..22454a1e0cc 100644 --- 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 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 Binary files differindex a29893cc8ca..6f2aec3823e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf 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 Binary files differindex 74565f09b44..422d68d770b 100644 --- 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 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 Binary files differindex edf27534c2e..9328ab26f7a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf 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 Binary files differindex 2493aa8d61b..f1f6783cfea 100644 --- 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 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 Binary files differindex 39448ae6204..08edbd5727f 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf 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 Binary files differindex a0dad0fefa7..d5c0f625ad3 100644 --- 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 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 Binary files differindex 7b899a5d53e..0c64d100887 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf 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 Binary files differindex 6fdf92035b2..09f1b199398 100644 --- 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 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 Binary files differindex f7f759cb3b1..1d62421c3f4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf 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 Binary files differindex d4a2dc49323..1639bab1c0f 100644 --- 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 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 Binary files differindex b9509c550a9..c3d8f76270f 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf 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 Binary files differindex ebbca7c66ad..7528e732f4e 100644 --- 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 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 Binary files differindex 17e71fdeac3..0b267790c60 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf 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 Binary files differindex 77876624165..e5153a6a3b2 100644 --- 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 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 Binary files differindex 520b574153e..e4c188b2024 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf 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 Binary files differindex ff363e84c95..cb31cd8c9e5 100644 --- 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 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 Binary files differindex 85aa4912a45..25ab16dfe15 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf 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 Binary files differindex e06ac67dbd9..280562cf5ef 100644 --- 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 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 Binary files differindex 7ab5a72fa42..2956cfcbf86 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf 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 edafe421ecc..8fcf5a164c9 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/08/26] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/11/17] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -66,6 +66,9 @@ \newif\ifthesis@color@ \DeclareOption{monochrome}{\thesis@color@false} \DeclareOption{color}{\thesis@color@true} +\newif\ifthesis@microtype@ +\DeclareOption{microtype}{\thesis@microtype@true} +\DeclareOption{nomicrotype}{\thesis@microtype@false} \newif\ifthesis@palatino@ \DeclareOption{palatino}{\thesis@palatino@true} \DeclareOption{nopalatino}{\thesis@palatino@false} @@ -79,15 +82,19 @@ \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} \DeclareOption{cover}{\thesis@cover@true} -\ExecuteOptions{12pt,twoside,final,monochrome,palatino, - oldtable,lot,lof,nocover} +\ExecuteOptions{12pt,twoside,final,monochrome,microtype,% + palatino,oldtable,lot,lof,nocover} \ProcessOptions +\thesis@requireLocale{english} \thesis@require{xcolor} \thesis@require{graphicx} \thesis@require{pdfpages} \thesis@require{keyval} \thesis@require{ifxetex} \thesis@require{ifluatex} +\ifthesis@microtype@ + \thesis@require{microtype} +\fi {\let\x\expandafter \x\global\x\let\x\ifthesis@xeluatex\csname if% \ifxetex true\else @@ -116,6 +123,7 @@ \let\endthesis@newtable@old\endtabular \ifthesis@newtable@\ifthesis@color@ \thesis@require{tabularx} + \thesis@require{tabu} \thesis@require{booktabs} % The redefinition of `tabular` \renewenvironment{tabular}% @@ -131,6 +139,14 @@ {thesis@color@tableEven}% \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}% + \thesis@newtable@oldtabu}% + {\endthesis@newtable@oldtabu} % Adjust the measurements \setlength{\aboverulesep}{0pt} \setlength{\belowrulesep}{0pt} @@ -370,7 +386,7 @@ \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em\relax} -\setcounter{tocdepth}{4} +\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 d61cd277ef0..54075a330fe 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 @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/11/17] \thesis@color@setup{ links={HTML}{F27995}, tableEmph={HTML}{E8B88B}, @@ -121,6 +121,21 @@ \thesis@blocks@clear% \thesis@blocks@lot% \thesis@blocks@lof} +\ifx\thesis@blocks@lot\empty\else + \def\thesis@blocks@lot{% + \thesis@blocks@clear + \phantomsection + \addcontentsline{toc}{chapter}{\listtablename}% + \listoftables} +\fi + +\ifx\thesis@blocks@lof\empty\else + \def\thesis@blocks@lof{% + \thesis@blocks@clear + \phantomsection + \addcontentsline{toc}{chapter}{\listfigurename}% + \listoffigures} +\fi \def\thesis@preamble{% \thesis@blocks@cover% \thesis@blocks@frontMatter% diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty index fac1ed2a82a..4f554d26117 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fi.sty @@ -91,7 +91,7 @@ \thesis@declaration% \vskip 2cm% \hfill\thesis@author% - \par\vfill% + \par\vfill\noindent% \textbf{\thesis@@{advisorTitle}:} \thesis@advisor% \par\vfil% \end{alwayssingle}} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty index ed8271708da..eed3d68170b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2015/11/08] \thesis@color@setup{ links={HTML}{93BCF5}, tableEmph={HTML}{A8BDE3}, |