diff options
author | Karl Berry <karl@freefriends.org> | 2015-12-01 22:53:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-12-01 22:53:36 +0000 |
commit | 661ff07b6383ac3bfb1773691050eb5ff5e19d24 (patch) | |
tree | 9396a92cc17c6eb0a5fde4b0e42ecf97226f3986 /Master/texmf-dist/source/latex/fithesis | |
parent | b9e437e9bfed776213b65bdbf349eb6fcd96e116 (diff) |
fithesis (1dec15)
git-svn-id: svn://tug.org/texlive/trunk@38994 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fithesis')
14 files changed, 294 insertions, 206 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 17e843f5a26..a021a9f62a9 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -16,6 +16,7 @@ \usepackage{hypdoc} \usepackage{microtype} \usepackage{ragged2e} +\usepackage{paralist} % Making paragraphs numbered \makeatletter @@ -33,7 +34,8 @@ \EnableCrossrefs \DoNotIndex{} \makeatletter -\c@IndexColumns=2 + \c@IndexColumns=2 + \c@GlossaryColumns=2 \makeatother \begin{document} @@ -49,11 +51,38 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/11/21 v0.3.26 fithesis3 MU thesis class} +\def\thesis@version{2015/11/30 v0.3.27 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% +% +% \changes{v0.3.27:5}{2015/11/30}{The PDF bookmarks are no longer +% garbled, when the \Hologo{LuaTeX} engine is used. [VN]} +% \changes{v0.3.27:4}{2015/11/30}{\cs{thesis@english@declaration} +% now uses the correct idiom (by one's own $\to$ on +% one's own). [VN]} +% \changes{v0.3.27:3}{2015/11/29}{As a preparation for the future +% inclusion of bibliography support, the \textsf{csquotes} +% package is loaded, \texttt{@csquotesStyle} is a new part of +% the locale interface that sets the \textsf{csquotes} style +% of a locale, and \cs{thesis@selectLocale} now switches the +% \textsf{csquotes} style. [VN]} +% \changes{v0.3.27:2}{2015/11/29}{\cs{thesis@selectLocale} is no +% longer performed globally for the entire document during +% \cs{thesis@load} (effectively overriding the user's hyphenation +% settings, if Babel's or Polyglossia's \cs{languagename} +% differs from \cs{thesis@locale}). Instead, \cs{thesis@preamble} +% and \texttt{@postamble} now locally switch the locale and +% expand \cs{thesis@blocks@preamble} and \texttt{@postamble}, +% which are the new redefinables. Since this breaks the behaviour +% of \cs{thesis@blocks@mainMatter}, whose effects would also be +% local, \texttt{@mainMatter} is now executed directly by +% \cs{thesis@preamble} after closing the group and becomes a new +% part of the interface between the class and the style files. +% [VN]} +% \changes{v0.3.27:1}{2015/11/29}{Fixed a typo in the guide. +% Added a compatibility layer for \cs{title}, \cs{author}, and +% \cs{maketitle}. Minor changes of the documentation. [VN]} % \changes{v0.3.26} {2015/11/21}{Updated the example documents and % the user guide. Fixed a typo in the description of % \cs{thesis@season}. [VN]} @@ -177,7 +206,7 @@ % was decomposed into a base class, locale files and style files. [VN]} % \changes{v0.3.08} {2015/03/04}{Fixed a non-terminated \cs{if} condition. % [VN] (backport of v0.2.18)\\Fixed mostly documentation errors reported -% at the new fithesis discussion forum (-ti, eco$\rightarrow$econ, implicit +% at the new fithesis discussion forum (-ti, eco$\to$econ, implicit % twocolumn, example extended (font setup), etc.). [PS] (backport of v0.2.17)} % \changes{v0.3.07} {2015/02/03}{Replaced the \cs{thesiswoman} command with % \cs{thesisgender}. [VN]} @@ -228,13 +257,13 @@ % \changes{v0.2.01} {2004/05/11}{add subsubsection to toc [JP]} % \changes{v0.2.00} {2004/05/03}{add sk lang [JP, Peter Cerensky] % set default cls class to \textsf{rapport3} [JP]} -% \changes{v0.1g} {2004/04/01}{change of default size (12pt$\rightarrow$11pt) [JP]} +% \changes{v0.1g} {2004/04/01}{change of default size (12pt$\to$11pt) [JP]} % \changes{v0.1f} {2004/01/24}{add documentation for hyperref [JP]} % \changes{v0.1e} {2004/01/07}{add Brno to MU title [JP]} % \changes{v0.1d} {2003/03/24}{removed def schapter from fit1*.clo [JP]} % \changes{v0.1c} {2003/02/21}{default values of \cs{facultyname} and % \\\cs{@thesissubtitle} set for backward compatibility) [PS]} -% \changes{v0.1b} {2003/02/14}{change of default size (11pt$\rightarrow$12pt) [JP]} +% \changes{v0.1b} {2003/02/14}{change of default size (11pt$\to$12pt) [JP]} % \changes{v0.1a} {2003/02/12}{minor documentation changes (CZ only, % sorry) [PS]} % \changes{v0.1} {2003/02/11}{new release, documentation editing (CZ only, @@ -508,6 +537,8 @@ % -- The full name without the first space-delimited part of % the name. This corresponds to the author's surname. % \end{itemize} +% The standard \LaTeX\ \DescribeMacro{\author}|\author| macro also +% sets this key. % \begin{macrocode} \def\thesis@parseAuthor#1{% \def\thesis@author{#1}% @@ -519,6 +550,7 @@ \thesis@def[author]{author@tail}% \define@key{thesis}{author}{% \thesis@parseAuthor{#1}} +\let\author\thesis@parseAuthor % \end{macrocode} % \end{macro} % \begin{macro}{\thesis@id} @@ -896,11 +928,19 @@ % \subsubsection{The \texttt{title} key} % The \marg{\texttt{title}=title} pair sets the title of the % thesis to \textit{title}. The \textit{title} is stored within the -% |\thesis@title| macro. +% |\thesis@title| macro. The standard \LaTeX\ +% \DescribeMacro{\title}|\title| macro also sets this key. % \begin{macrocode} \thesis@def{title} \define@key{thesis}{title}{% \def\thesis@title{#1}} +\def\title#1{\def\thesis@title{#1}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\maketitle} +% The standard \LaTeX\ |\maketitle| macro is defined, but disabled. +% \begin{macrocode} +\let\maketitle\relax % \end{macrocode} % \end{macro} % \begin{macro}{\thesis@TeXtitle} @@ -1068,13 +1108,36 @@ % \end{macrocode} % \end{macro} ^^A The nested \ifthesis@auto macro definition % \end{macro} ^^A The \thesissetup macro definition -% The \DescribeMacro{\thesis@preamble}|\thesis@postamble| -% and \DescribeMacro{\thesis@postamble}|\thesis@preamble| -% macros are defined as empty token strings by default and -% are subject to redefinition by the style files. -% \begin{macrocode} -\def\thesis@preamble{} -\def\thesis@postamble{} +% The \DescribeMacro{\thesis@preamble}|\thesis@preamble| +% and \DescribeMacro{\thesis@postamble}|\thesis@postamble| +% macros temporarily switch to the hyphenation patterns and the +% \textsf{csquotes} style of the main locale and typeset the +% contents of the +% \DescribeMacro{\thesis@blocks@preamble}|\thesis@blocks@preamble| +% or +% \DescribeMacro{\thesis@blocks@postamble}|\thesis@blocks@postamble| +% macros, respectively. +% +% Before leaving the group, the |\thesis@preamble| macro clears the +% page. After leaving the group, the |\thesis@preamble| macro sets +% up the style of the main matter by expanding the +% \DescribeMacro{\thesis@blocks@mainMatter}|\thesis@blocks@mainMatter| +% macro. All the aforementioned |@block@| macros are defined as +% |\relax| and are subject to redefinition by the loaded style +% files. +% \begin{macrocode} +\def\thesis@preamble{% + {\thesis@selectLocale{\thesis@locale}% + \thesis@blocks@preamble\clearpage} + \thesis@blocks@mainMatter} + +\def\thesis@postamble{{% + \thesis@selectLocale{\thesis@locale}% + \thesis@blocks@postamble}} + +\let\thesis@blocks@preamble\relax +\let\thesis@blocks@postamble\relax +\let\thesis@blocks@mainMatter\relax % \end{macrocode} % \subsection{The \cs{thesislong} macro}\label{sec:thesislong} % \begin{macro}{\thesislong} @@ -1083,12 +1146,12 @@ % used as an alternative to the |\thesissetup| public macro, which % only permits a single paragraph as the \textit{value}, for the % following \textit{key}s: -% \begin{itemize} +% \begin{compactitem} % \item\texttt{abstract} % \item\texttt{abstractEn} % \item\texttt{thanks} % \item\texttt{declaration} -% \end{itemize} +% \end{compactitem} % \begin{macrocode} \long\def\thesislong#1#2{% \csname KV@thesis@#1\endcsname{#2}} @@ -1113,14 +1176,12 @@ \thesis@loadedtrue \makeatletter% % \end{macrocode} -% First, the main locale is selected and its files are loaded using -% the |\thesis@selectLocale| macro. If the user specified an -% explicit empty string as the value of |\thesis@locale|, do -% nothing. +% First, the main locale file is loaded using the +% |\thesis@requireLocale| 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. If the user specified an @@ -1141,32 +1202,24 @@ % \item\texttt{Creator} is set to \texttt{\thesis@version}. % \end{itemize} % \begin{macrocode} - \thesis@require{hyperref}% - {\hypersetup{unicode, - pdftitle={\thesis@title},% - pdfauthor={\thesis@author},% - pdfkeywords={\thesis@keywords},% - pdfcreator={\thesis@version},% - }}% + \thesis@require{hyperref} + \hypersetup{ + unicode=true, + pdfencoding=auto, + pdftitle=\thesis@title, + pdfauthor=\thesis@author, + pdfkeywords=\thesis@keywords, + pdfcreator=\thesis@version} % \end{macrocode} % If autolayout is enabled, the |\thesis@preamble| and % |\thesis@postamble| macros are scheduled for expansion at the % beginning and at the end of the document, respectively. % \begin{macrocode} - \ifthesis@auto% - \AtBeginDocument{\thesis@preamble}% - \AtEndDocument{\thesis@postamble}% - \fi% -% \end{macrocode} -% Lastly, the \DescribeMacro{\thesis@pages}|\thesis@pages| -% macro definition containing the length of the document is -% scheduled to be included in the auxiliary file. -% \begin{macrocode} - \AtEndDocument{% - % Define \thesis@pages for the next run - \write\@auxout{\noexpand\gdef\noexpand% - \thesis@pages{\thepage}}} - \makeatother% + \ifthesis@auto + \AtBeginDocument{\thesis@preamble} + \AtEndDocument{\thesis@postamble} + \fi + \makeatother \fi} % \end{macrocode} % \end{macro} @@ -1320,8 +1373,8 @@ % \end{macrocode} % The \DescribeMacro{\thesis@head}|\thesis@head| % and \DescribeMacro{\thesis@tail}|\thesis@tail| -% macros are used for retrieving a head or a tail of -% space-separated token sequences, which end with |\relax|. +% macros are used for retrieving the head or the tail of +% space-separated token sequences that end with |\relax|. % \begin{macrocode} \def\thesis@head#1 #2{% \ifx\relax#2% @@ -1338,25 +1391,33 @@ \thesis@tail#2}% % \end{macrocode} % \subsection{General purpose macros} -% The \DescribeMacro{\thesis@pages}|\thesis@pages| macro is defined -% at the beginning of the second \LaTeX\ run as a part of the main -% routine (see Section \ref{sec:thesis@load}). During the first -% run, the macro expands to \texttt{??}. +% The \DescribeMacro{\thesis@pages}|\thesis@pages| macro contains +% the total number of pages within the document. During the first +% \TeX\ compilation, the macro expands to \texttt{??}. % \begin{macrocode} +\AtEndDocument{\write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \ifx\thesis@pages\undefined\def\thesis@pages{??}\fi % \end{macrocode} % \DescribeMacro{\thesis@selectLocale}|\thesis@selectLocale|\marg{locale} % macro redefines the |\thesis@locale| macro to \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. +% switches to the hyphenation patterns of \textit{locale}, and +% starts using the |\thesis@|\textit{locale}|@csquotesStyle| style +% of the \textsf{csquotes} package. 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. +% locale, \textsf{csquotes}, and hyphenation settings return back to +% what the user has specified after the localized blocks of +% typographic material. +% +% If not loaded by the user, the \textsf{csquotes} package gets +% loaded at the end of the preamble. % \begin{macrocode} +\AtEndPreamble{\thesis@require{csquotes}} \def\thesis@selectLocale#1{% \edef\thesis@locale{#1}% + \csq@setstyle{\thesis@@{csquotesStyle}}% \ltx@ifpackageloaded{polyglossia}{% \selectlanguage{\thesis@locale} }{% @@ -1420,6 +1481,9 @@ % in Section \ref{sec:reflection}) needs to globally define the % following macros: % \begin{itemize} +% \item|\thesis@|\textit{locale}|@csquotesStyle| -- The name of +% the style of the \textsf{csquotes} package that matches this +% locale % \item|\thesis@|\textit{locale}|@universityName| -- The name of % the university % \item|\thesis@|\textit{locale}|@facultyName| -- The name of the @@ -1485,14 +1549,17 @@ % Section \ref{sec:reflection}) should globally define at least one % of the following macros: % \begin{itemize} -% \item\DescribeMacro{\thesis@preamble} -% |\thesis@preamble| -- If autolayout is -% enabled, then this macro is expanded at the -% very beginning of the document. -% \item\DescribeMacro{\thesis@postamble} -% |\thesis@postamble| -- If autolayout is -% enabled, then this macro is expanded at the -% very end of the document. +% \item\DescribeMacro{\thesis@blocks@preamble}^^A +% |\thesis@blocks@preamble| -- If autolayout is enabled, then +% this macro is expanded at the very beginning of the document. +% \item\DescribeMacro{\thesis@blocks@postamble}^^A +% |\thesis@blocks@postamble| -- If autolayout is enabled, then +% this macro is expanded at the very end of the document. +% \item\DescribeMacro{\thesis@blocks@mainMatter}^^A +% |\thesis@blocks@mainMatter| -- If autolayout is enabled, then +% this macro is expanded at the beginning of the document right +% after |\thesis@blocks@preamble|. This macro sets the style of +% the main matter of the thesis. % \end{itemize} % % \subsubsection{Base style files} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 6dae2d77ec9..6a7c5f4a1a8 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -1,21 +1,27 @@ % \file{locale/fithesis-czech.def} -% This is the base file of the Czech locale. It defines all the -% private macros mandated by the locale file interface. +% This is the base file of the Czech locale.\iffalse +%<*base> +% \fi\begin{macrocode} +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/11/29] +% \end{macrocode} +% The locale file defines all the private macros mandated by the +% locale file interface. % \begin{macro}{\thesis@czech@gender@koncovka} % The locale file also defines the |\thesis@czech@gender@koncovka| % macro, which expands to the correct verb ending based on the % value of the |\thesis@ifwoman| macro and the +% \end{macro}\begin{macro}{\thesis@czech@typeName@akuzativ} % |\thesis@czech@typeName@akuzativ| containing the accusative case % of the thesis type name. -% \end{macro}\iffalse -%<*base> -% \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/11/17] +% \end{macro}\begin{macrocode} % Pomocná makra \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} +% Csquotes styl +\gdef\thesis@czech@csquotesStyle{german} + % Zástupné texty \gdef\thesis@czech@universityName{Název univerzity} \gdef\thesis@czech@facultyName{Název fakulty} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 527488417b6..d2ba335c242 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -1,10 +1,12 @@ % \file{locale/fithesis-english.def} -% This is the base file of the English locale. It defines all the -% private macros mandated by the locale file interface. -% \iffalse +% This is the base file of the English locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/10] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/29] +% \end{macrocode} +% The locale file defines all the private macros mandated by the +% locale file interface. +% \begin{macrocode} % Placeholders \gdef\thesis@english@universityName{University name} @@ -13,6 +15,9 @@ of the official signed thesis assignment.} \gdef\thesis@english@declaration{Declaration text ...} +% Csquotes style +\gdef\thesis@english@csquotesStyle{english} + % Miscellaneous \gdef\thesis@english@fieldTitle{Field of study} \gdef\thesis@english@advisorTitle{Advisor} @@ -48,11 +53,11 @@ % \iffalse %<*mu> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2015/11/30] \gdef\thesis@english@universityName{Masaryk University} \gdef\thesis@english@declaration{% Hereby I declare that this paper is my original authorial work, - which I have worked out by my own. All sources, references and + which I have worked out on my own. All sources, references, and literature used or excerpted during elaboration of this work are properly cited and listed in complete reference to the due source.} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 05fb8c8f42e..601affce036 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -1,21 +1,27 @@ % \file{locale/fithesis-slovak.def} -% This is the base file of the Slovak locale. It defines all the -% private macros mandated by the locale file interface. +% This is the base file of the Slovak locale.\iffalse +%<*base> +% \fi\begin{macrocode} +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/11/29] +% \end{macrocode} +% The locale file defines all the private macros mandated by the +% locale file interface. % \begin{macro}{\thesis@slovak@gender@koncovka} % The locale file also defines the |\thesis@slovak@gender@koncovka| % macro, which expands to the correct verb ending based on the % value of the |\thesis@ifwoman| macro and the +% \end{macro}\begin{macro}{\thesis@slovak@typeName@akuzativ} % |\thesis@slovak@typeName@akuzativ| containing the accusative case % of the thesis type name. -% \end{macro}\iffalse -%<*base> -% \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/11/17] +% \end{macro}\begin{macrocode} % Pomocná makrá \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} +% Csquotes štýl +\gdef\thesis@slovak@csquotesStyle{german} + % Zástupné texty \gdef\thesis@slovak@universityName{Názov univerzity} \gdef\thesis@slovak@facultyName{Názov fakulty} 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 6ab1060ec2d..244ef9c683b 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -344,8 +344,8 @@ \definecolor{thesis@color@tableEmph}#1} % \end{macrocode} % The file defines several blocks to be used in the redefinitions -% of the |\thesis@preamble| and |\thesis@postable| macros -% by the subsequently loaded style files. +% of the |\thesis@blocks@preamble| and |\thesis@blocks@postamble| +% macros by the subsequently loaded style files. % % \begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style @@ -998,7 +998,7 @@ % \item\DescribeMacro{\thesis@titlePage@Huge}% % |\thesis@titlePage@Huge| -- Equivalent to |\Huge| % \end{itemize} -% These macros can be used to typeset elements, whose size +% These macros can be used to typeset elements whose size % should remain constant regardless of the font size setting. % \begin{macrocode} %<*12pt> 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 1ea9c568bef..e06b98b3234 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/11/17] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -158,26 +158,25 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@frontMatter% - \thesis@blocks@titlePage% - \thesis@blocks@assignment% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@keywords% - \thesis@blocks@keywordsEn% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@toc% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \thesis@blocks@assignment + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@toc} % \end{macrocode} % The style file defines the autolayout postamble as the list of % tables and the list of figures. All blocks are defined in the % \texttt{style/mu/base.sty} file, although some are redefined in % this file. % \begin{macrocode} -\def\thesis@postamble{% +\def\thesis@blocks@postamble{% \thesis@blocks@tables} % \end{macrocode} 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 302202b2c5c..6c862e834ec 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/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -85,16 +85,15 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@assignment% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@keywords% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@assignment + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@keywords + \thesis@blocks@tables} % \end{macrocode} 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 bdae8861df1..b2713c7fee5 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-fsps}[2015/11/08] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -25,12 +25,11 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx index 612639532a5..91d65ecc3f1 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx @@ -16,7 +16,7 @@ % department and will require modification by the user. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -41,18 +41,17 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@keywords% - \thesis@blocks@keywordsEn% - \thesis@blocks@assignment% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \thesis@blocks@assignment + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx index f93c0928dbc..d4bc961f1d3 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx @@ -6,7 +6,7 @@ % o/law/ud/predp/smer/S-07-2012.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -58,24 +58,23 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@declaration% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@keywords% - \thesis@blocks@keywordsEn% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@declaration + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} % All blocks within the autolayout postamble that are not defined % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@postamble{% +\def\thesis@blocks@postamble{% \thesis@blocks@assignment} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx index 5d7ee581b5c..b6cbadcd645 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx @@ -7,7 +7,7 @@ % ZITOSTI_ZAVERECNE_PRACE.doc}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -107,6 +107,19 @@ \setcounter{page}{1} \pagenumbering{arabic}} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@mainMatter} +% The |\thesis@blocks@mainMatter| macro sets up the style +% of the main matter of the thesis. The leading is adjusted in +% accordance with the requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@mainMatter{% + \thesis@blocks@clear + \setcounter{page}{1} + \pagenumbering{arabic} + \pagestyle{thesisheadings} + \parindent 1.5em + \onehalfspacing} +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@bibEntry} % The |\thesis@blocks@bibEntry| macro typesets a % bibliographical entry. Along with the macros required by the @@ -132,19 +145,18 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@frontMatter% - \thesis@blocks@titlePage% - \onehalfspacing% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@keywords% - \thesis@blocks@keywordsEn% - \thesis@blocks@bibEntry% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \onehalfspacing + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \thesis@blocks@bibEntry + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx index 28e3ac5da4d..b36a36d2352 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx @@ -6,7 +6,7 @@ % do/ped/VPAN/pokdek/Pokyn_dekana_c._1-2010__2_.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -54,18 +54,17 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@bibEntry% - \thesis@blocks@clearRight% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@keywords% - \thesis@blocks@keywordsEn% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@bibEntry + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx index 62b6d2040b4..7f9e3ffb319 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx @@ -6,7 +6,7 @@ % 1421/4581421/Vzor_bakalarske_prace.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -26,12 +26,11 @@ % within this file are defined in the % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} -\def\thesis@preamble{% - \thesis@blocks@cover% - \thesis@blocks@titlePage% - \thesis@blocks@frontMatter% - \thesis@blocks@declaration% - \thesis@blocks@thanks% - \thesis@blocks@tables% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{% + \thesis@blocks@cover + \thesis@blocks@titlePage + \thesis@blocks@frontMatter + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@tables} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx index 112de934182..79cd01472d2 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/06/27] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2015/11/29] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -323,19 +323,18 @@ % entire front matter is typeset as though the locale were Czech in % accordance with the formal requirements of the faculty. % \begin{macrocode} -\def\thesis@preamble{% - {\thesis@selectLocale{czech}% - \thesis@blocks@cover% - \thesis@blocks@frontMatter% - \thesis@blocks@titlePage% - \thesis@blocks@clearRight% - \thesis@blocks@bibEntry% - \thesis@blocks@bibEntryEn% - \thesis@blocks@abstract% - \thesis@blocks@abstractEn% - \thesis@blocks@assignment% - \thesis@blocks@thanks% - \thesis@blocks@declaration% - \thesis@blocks@tables}% - \thesis@blocks@mainMatter} +\def\thesis@blocks@preamble{{% + \thesis@selectLocale{czech} + \thesis@blocks@cover + \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \thesis@blocks@clearRight + \thesis@blocks@bibEntry + \thesis@blocks@bibEntryEn + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@assignment + \thesis@blocks@thanks + \thesis@blocks@declaration + \thesis@blocks@tables}} % \end{macrocode} |