From 42b5dc8926c658550a5847ef7ea42373a6fb4726 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Dec 2015 23:17:05 +0000 Subject: fithesis (11dec15) git-svn-id: svn://tug.org/texlive/trunk@39079 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/fithesis/fithesis.dtx | 18 +- .../source/latex/fithesis/style/mu/base.dtx | 206 +++++++++++++-------- .../source/latex/fithesis/style/mu/econ.dtx | 5 +- .../source/latex/fithesis/style/mu/fi.dtx | 7 +- .../source/latex/fithesis/style/mu/fsps.dtx | 7 +- .../source/latex/fithesis/style/mu/fss.dtx | 7 +- .../source/latex/fithesis/style/mu/law.dtx | 7 +- .../source/latex/fithesis/style/mu/med.dtx | 7 +- .../source/latex/fithesis/style/mu/ped.dtx | 7 +- .../source/latex/fithesis/style/mu/phil.dtx | 7 +- .../source/latex/fithesis/style/mu/sci.dtx | 7 +- 11 files changed, 176 insertions(+), 109 deletions(-) (limited to 'Master/texmf-dist/source/latex/fithesis') diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index a43090d1a51..794685f35d7 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -51,11 +51,23 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/12/03 v0.3.28 fithesis3 MU thesis class} +\def\thesis@version{2015/12/09 v0.3.29 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \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 +% even when the \texttt{color} option is not specified. [VN]} +% \changes{v0.3.29:2}{2015/12/09}{The \texttt{printed} and +% \texttt{digital} class options, which set all the options +% appropriate for either the printed or the digital versions of a +% document, are now available for the style files of the Masaryk +% University in Brno. [VN]} +% \changes{v0.3.29:1}{2015/12/08}{The initial pages of the styles +% of the Masaryk University in Brno are no longer page-numbered, +% so that hyperref links work correctly. [VN]} % \changes{v0.3.28:2}{2015/12/03}{If the thesis locale and the % document locale is the same (the default behaviour), the % \cs{thesis@selectLocale} macro is applied globally at the @@ -64,8 +76,8 @@ % \changes{v0.3.28:1}{2015/12/02}{The \texttt{draft} option has no % longer an effect on the \textsf{microtype} package. The % \cs{thesis@require} command now also takes an optional -% argument and the \cs{thesis@requireWithOption} command has -% become \cs{thesis@requireIfExists}. [VN]} +% argument and the \cs{thesis@require\-WithOption} command has +% become \cs{thesis@require\-IfExists}. [VN]} % \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} 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 2ed2a361ebf..5720d409c10 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -7,29 +7,49 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/11/17] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2015/12/09] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} % \item\texttt{10pt}, \texttt{11pt}, \texttt{12pt} -- Sets the -% type size to 10, 11 or 12 points respectively. +% type size to 10, 11 or 12 points respectively. +% \begin{macrocode} +\DeclareOption{10pt}{\def\thesis@ptsize{0}} +\DeclareOption{11pt}{\def\thesis@ptsize{1}} +\DeclareOption{12pt}{\def\thesis@ptsize{2}} +% \end{macrocode} % \item\texttt{oneside}, \texttt{twoside} -- The document is -% going to be either single- or double-sided, respectively. In a -% double-sided document, headers, page numbering, margin notes -% and several other elements will be arranged based on the parity -% of the page. Blank pages will also be inserted prior the -% beginning of each chapter to ensure that it starts on a -% right-hand (odd-numbered) page. The -% \DescribeMacro{\ifthesis@twoside@}|\ifthesis@twoside@| -% conditional is set to either \texttt{false} or \texttt{true}, -% respectively. +% going to be either single- or double-sided, respectively. In +% a double-sided document, headers, page numbering, margin +% notes and several other elements will be arranged based on +% the parity of the page. Blank pages will also be inserted +% prior the beginning of each chapter to ensure that it starts +% on a right-hand (odd-numbered) page. The +% \DescribeMacro{\ifthesis@twoside@}|\ifthesis@twoside@| +% conditional is set to either \texttt{false} or \texttt{true}, +% respectively. +% \begin{macrocode} +\newif\ifthesis@twoside@ +\DeclareOption{oneside}{% + \thesis@twoside@false\@twosidefalse\@mparswitchfalse} +\DeclareOption{twoside}{% + \thesis@twoside@true \@twosidetrue \@mparswitchtrue} +% \end{macrocode} % \item\texttt{onecolumn}, \texttt{twocolumn} -- The document % is going to be set in either a single column or in two % columns, respectively. +% \begin{macrocode} +\DeclareOption{onecolumn}{\@twocolumnfalse} +\DeclareOption{twocolumn}{\@twocolumntrue} +% \end{macrocode} % \item\texttt{draft}, \texttt{final} -- Overful lines either are % or aren't marked within the document, respectively, and % graphics either aren't or are inserted into the document, % respectively. +% \begin{macrocode} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} +% \end{macrocode} % \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 @@ -38,12 +58,22 @@ % \texttt{true} or \texttt{false}, respectively. The % Palatino font is a part of the visual identity of the Faculty % of Informatics at which the document class was created. +% \begin{macrocode} +\newif\ifthesis@palatino@ +\DeclareOption{palatino}{\thesis@palatino@true} +\DeclareOption{nopalatino}{\thesis@palatino@false} +% \end{macrocode} % \item\texttt{color}, \texttt{monochrome} -- Certain % typographical elements either are or aren't going to be % typeset in color, respectively. The % \DescribeMacro{\ifthesis@color@}|\ifthesis@color@| % conditional is set to either \texttt{true} or \texttt{false}, % respectively. +% \begin{macrocode} +\newif\ifthesis@color@ +\DeclareOption{monochrome}{\thesis@color@false} +\DeclareOption{color}{\thesis@color@true} +% \end{macrocode} % \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 @@ -51,6 +81,11 @@ % \DescribeMacro{\ifthesis@microtype@}|\ifthesis@microtype@| % conditional is set to either \texttt{true} or \texttt{false}, % respectively. +% \begin{macrocode} +\newif\ifthesis@microtype@ +\DeclareOption{microtype}{\thesis@microtype@true} +\DeclareOption{nomicrotype}{\thesis@microtype@false} +% \end{macrocode} % \item\texttt{table}, \texttt{oldtable} -- If the % |\ifthesis@color@| conditional is \texttt{true}, then the % definitions of the \texttt{tabular}, \texttt{tabularx}, and @@ -60,6 +95,12 @@ % conditional is set to either \texttt{true} or \texttt{false}, % respectively. % +% \begin{macrocode} +\newif\ifthesis@newtable@ +\DeclareOption{table}{\thesis@newtable@true} +\DeclareOption{oldtable}{\thesis@newtable@false} +% \end{macrocode} +% % The choice of the option name is deliberate -- the % redefinition of the table environments depends on the % \textsf{xcolor} package, which needs to be loaded with the @@ -77,10 +118,18 @@ % or isn't going to be included in the % \DescribeMacro{\thesis@blocks@tables}|\thesis@|^^A % \discretionary{}{}{}|blocks@tables| block, respectively. +% \begin{macrocode} +\DeclareOption{nolot}{\def\thesis@blocks@lot{}} +\DeclareOption{lot}{\let\thesis@blocks@lot\listoftables} +% \end{macrocode} % \item\texttt{lof}, \texttt{nolof} -- |\listoffigures| is or % isn't going to be included in the % \DescribeMacro{\thesis@blocks@tables}|\thesis@|^^A % \discretionary{}{}{}|blocks@tables| block, respectively. +% \begin{macrocode} +\DeclareOption{nolof}{\def\thesis@blocks@lof{}} +\DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures} +% \end{macrocode} % \item\texttt{cover}, \texttt{nocover} -- The % \DescribeMacro{\thesis@blocks@cover}|\thesis@blocks@cover| % either is going to expand to either the thesis cover or @@ -88,45 +137,24 @@ % \DescribeMacro{\ifthesis@cover@}|\ifthesis@cover@| % conditional is set to \texttt{false} or \texttt{true}, % respectively. -% \end{itemize} % \begin{macrocode} -\DeclareOption{10pt}{\def\thesis@ptsize{0}} -\DeclareOption{11pt}{\def\thesis@ptsize{1}} -\DeclareOption{12pt}{\def\thesis@ptsize{2}} -\newif\ifthesis@twoside@ -\DeclareOption{oneside}{% - \thesis@twoside@false\@twosidefalse\@mparswitchfalse} -\DeclareOption{twoside}{% - \thesis@twoside@true \@twosidetrue \@mparswitchtrue} -\DeclareOption{onecolumn}{\@twocolumnfalse} -\DeclareOption{twocolumn}{\@twocolumntrue} -\DeclareOption{draft}{\setlength\overfullrule{5pt}} -\DeclareOption{final}{\setlength\overfullrule{0pt}} -\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} -\newif\ifthesis@newtable@ -\DeclareOption{table}{\thesis@newtable@true} -\DeclareOption{oldtable}{\thesis@newtable@false} -\DeclareOption{nolot}{\def\thesis@blocks@lot{}} -\DeclareOption{lot}{\let\thesis@blocks@lot\listoftables} -\DeclareOption{nolof}{\def\thesis@blocks@lof{}} -\DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures} \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} \DeclareOption{cover}{\thesis@cover@true} % \end{macrocode} +% \item\texttt{digital}, \texttt{printed} -- These macrooptions +% set the options that are appropriate for either the printed or +% for the digital version of the document, respectively. +% \begin{macrocode} +\DeclareOption{digital}{\ExecuteOptions{color,cover}} +\DeclareOption{printed}{\ExecuteOptions{monochrome,nocover}} +% \end{macrocode} +% \end{itemize} % These are the default options: % \begin{macrocode} -\ExecuteOptions{12pt,twoside,final,monochrome,microtype,% - palatino,oldtable,lot,lof,nocover} -\ProcessOptions +\ExecuteOptions{% + printed,12pt,twoside,final,microtype,palatino,oldtable,lot,lof} +\ProcessOptions* % \end{macrocode} % The file uses English locale strings within the macros. % \begin{macrocode} @@ -225,8 +253,10 @@ \fi \fi % \end{macrocode} -% If the |\thesis@newtable@| and |\thesis@color@| conditionals are -% \texttt{true}, then the following packages get loaded: +% If the |\thesis@newtable@| conditional is \texttt{true}, then +% some of the dimensions associated with tables are modified in +% preparation for the coloring of the table cells. The following +% packages are also loaded: % \begin{itemize} % \item\textsf{tabularx} -- Provides the \texttt{tabularx} % environment, which enables the typesetting of tables with @@ -236,7 +266,21 @@ % \item\textsf{booktabs} -- A package, which allows the creation % of publication-quality tables in \LaTeX. % \end{itemize} -% Subsequently, the \texttt{tabular} and \texttt{tabularx} +% \begin{macrocode} +\let\thesis@newtable@old\tabular +\let\endthesis@newtable@old\endtabular +\ifthesis@newtable@ + % Load the packages. + \thesis@require{tabularx} + \thesis@require{tabu} + \thesis@require{booktabs} + % Adjust the measurements. + \setlength{\aboverulesep}{0pt} + \setlength{\belowrulesep}{0pt} + \setlength{\extrarowheight}{.75ex} +% \end{macrocode} +% When both the |\thesis@newtable@| and |\thesis@color@| conditionals are +% \texttt{true}, then the \texttt{tabular} and \texttt{tabularx} % environments are redefined to better match the style of the given % faculty. % @@ -253,39 +297,31 @@ % 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}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% - \thesis@newtable@old}% - {\endthesis@newtable@old} - % The redefinition of `tabularx` - \let\thesis@newtable@oldx\tabularx - \let\endthesis@newtable@oldx\endtabularx - \renewenvironment{tabularx}% - {\rowcolors{1}{thesis@color@tableOdd}% - {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} - \setlength{\extrarowheight}{.75ex} -\fi\fi + \ifthesis@color@ + % The redefinition of `tabular` + \renewenvironment{tabular}% + {\rowcolors{1}{thesis@color@tableOdd}% + {thesis@color@tableEven}% + \thesis@newtable@old}% + {\endthesis@newtable@old} + % The redefinition of `tabularx` + \let\thesis@newtable@oldx\tabularx + \let\endthesis@newtable@oldx\endtabularx + \renewenvironment{tabularx}% + {\rowcolors{1}{thesis@color@tableOdd}% + {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} + \fi +\fi % \end{macrocode} % The \textsf{hyperref} package is configured to support both roman % and arabic page numbering in one document and to decorate @@ -347,7 +383,17 @@ % of the |\thesis@blocks@preamble| and |\thesis@blocks@postamble| % macros by the subsequently loaded style files. % -% \begin{macro}{\thesis@blocks@frontMatter} +% \begin{macro}{\thesis@blocks@coverMatter} +% The |\thesis@blocks@coverMatter| macro sets up the style +% of the cover and the title page of the thesis. This amounts +% to disabling the page numbering, so that hyperref links do not +% point to the cover page and the title page instead of the +% initial pages of the main matter. +% \begin{macrocode} +\def\thesis@blocks@coverMatter{% + \pagenumbering{gobble}} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style % of the front matter of the thesis. % \begin{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 e06b98b3234..b261d35aba3 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/29] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -159,7 +159,8 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover + \thesis@blocks@coverMatter + \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@assignment 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 6c862e834ec..d372ecebf55 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -86,8 +86,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@assignment \thesis@blocks@declaration 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 b2713c7fee5..7b69d376c70 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/29] +\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -26,8 +26,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@declaration \thesis@blocks@thanks 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 91d65ecc3f1..2da22a5adb7 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -42,8 +42,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@clearRight \thesis@blocks@abstract 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 d4bc961f1d3..d511c4cb87f 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -59,8 +59,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@declaration \thesis@blocks@clearRight 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 b6cbadcd645..a1620d99e2e 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -105,7 +105,7 @@ \fi\pagestyle{empty} \parindent 1.5em \setcounter{page}{1} - \pagenumbering{arabic}} + \pagenumbering{roman}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@mainMatter} % The |\thesis@blocks@mainMatter| macro sets up the style @@ -146,7 +146,8 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover + \thesis@blocks@coverMatter + \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage \onehalfspacing 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 b36a36d2352..e3491504715 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -55,8 +55,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@bibEntry \thesis@blocks@clearRight 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 7f9e3ffb319..b2541f43f99 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -27,8 +27,9 @@ % \texttt{style/mu/fithesis-base.sty} file. % \begin{macrocode} \def\thesis@blocks@preamble{% - \thesis@blocks@cover - \thesis@blocks@titlePage + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@declaration \thesis@blocks@thanks 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 79cd01472d2..97caf149c91 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/11/29] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2015/12/08] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -324,8 +324,9 @@ % accordance with the formal requirements of the faculty. % \begin{macrocode} \def\thesis@blocks@preamble{{% - \thesis@selectLocale{czech} - \thesis@blocks@cover + \thesis@selectLocale{czech}% + \thesis@blocks@coverMatter + \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@clearRight -- cgit v1.2.3