diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-25 22:03:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-25 22:03:32 +0000 |
commit | 0cf37a0dcbc1de449eda38e14e357dd7b19dc5dd (patch) | |
tree | 9394f621e87c16283d233797f157bceac15c84a0 /Master/texmf-dist/tex/latex/fithesis/style/mu | |
parent | 358ce4b1b01044dab13881520b11ab7f4f40ebcd (diff) |
fithesis (25mar16)
git-svn-id: svn://tug.org/texlive/trunk@40137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fithesis/style/mu')
7 files changed, 81 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty index 87f2473b9b8..7b48fb729a6 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/01/07] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/03/22] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -75,9 +75,9 @@ \newif\ifthesis@newtable@ \DeclareOption{table}{\thesis@newtable@true} \DeclareOption{oldtable}{\thesis@newtable@false} -\DeclareOption{nolot}{\def\thesis@blocks@lot{}} +\DeclareOption{nolot}{\let\thesis@blocks@lot\relax} \DeclareOption{lot}{\let\thesis@blocks@lot\listoftables} -\DeclareOption{nolof}{\def\thesis@blocks@lof{}} +\DeclareOption{nolof}{\let\thesis@blocks@lof\relax} \DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures} \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} @@ -143,16 +143,16 @@ \let\thesis@newtable@oldx\tabularx \let\endthesis@newtable@oldx\endtabularx \renewenvironment{tabularx}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldx}% {\endthesis@newtable@oldx} % The redefinition of `tabu` \let\thesis@newtable@oldtabu\tabu \let\endthesis@newtable@oldtabu\endtabu \renewenvironment{tabu}% - {\rowcolors{1}{thesis@color@tableOdd}% - {thesis@color@tableEven}% + {\rowcolors{1}{thesis@color@tableEven}% + {thesis@color@tableOdd}% \thesis@newtable@oldtabu}% {\endthesis@newtable@oldtabu} \fi @@ -217,6 +217,10 @@ \edef\@path{\thesis@logopath\thesis@universityLogo \ifthesis@color@-color\fi}% \includegraphics[#1]{\@path}}} +\let\thesis@department@name\thesis@department +\let\thesis@departmentEn@name\thesis@departmentEn +\let\thesis@field@name\thesis@field +\let\thesis@fieldEn@name\thesis@fieldEn \def\thesis@blocks@cover{% \ifthesis@cover@ \thesis@blocks@clear @@ -248,11 +252,11 @@ \fi\ifthesis@blocks@cover@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@cover@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@cover@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \def\thesis@blocks@cover@content{% {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}% @@ -290,17 +294,19 @@ \fi\ifthesis@blocks@titlePage@faculty@ \thesis@titlePage@Large\thesis@@{facultyName}\\% \fi\ifthesis@blocks@titlePage@department@ - \thesis@titlePage@large\thesis@department\\% + \thesis@titlePage@large\thesis@department@name\\% \fi} \ifthesis@blocks@titlePage@field@ {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field}% + {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% \fi\vskip 2em} \let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content \let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer -\def\thesis@blocks@tables{% +\def\thesis@blocks@toc{% \thesis@blocks@clear - \tableofcontents + \tableofcontents} +\def\thesis@blocks@tables{% + \thesis@blocks@toc \thesis@blocks@lot \thesis@blocks@lof} \def\thesis@blocks@declaration{% @@ -391,6 +397,14 @@ \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em\relax} +\def\thesis@blocks@bibEntry{% + \chapter*{\thesis@@{bib@title}} + \noindent\thesis@upper{author@tail}, \thesis@author@head. + \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, + \thesis@@{facultyName}, \thesis@department@name, \thesis@year. + \thesis@pages\ \thesis@@{bib@pages}. + \thesis@@{advisorTitle}: \thesis@advisor + \thesis@blocks@clearRight} \setcounter{tocdepth}{3} \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty index a4c96c43cf7..833e6e76536 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty @@ -118,14 +118,10 @@ right=15mm, includeheadfoot} \fi\pagestyle{thesisheadings} \parindent 1.5em\relax} -\def\thesis@blocks@toc{% - \thesis@blocks@clear - \tableofcontents} \def\thesis@blocks@tables{% - \thesis@blocks@clear \thesis@blocks@lot \thesis@blocks@lof} -\ifx\thesis@blocks@lot\empty\else +\ifx\thesis@blocks@lot\relax\else \def\thesis@blocks@lot{% \thesis@blocks@clear \phantomsection @@ -133,7 +129,7 @@ \listoftables} \fi -\ifx\thesis@blocks@lof\empty\else +\ifx\thesis@blocks@lof\relax\else \def\thesis@blocks@lof{% \thesis@blocks@clear \phantomsection diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty index b23caa1af61..3248ec6e448 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/03/22] \thesis@color@setup{ links={HTML}{CF86EB}, tableEmph={HTML}{D39BE8}, @@ -58,7 +58,7 @@ tableEven={HTML}{E5CCED}} \def\thesis@blocks@cover@header{% {\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\% - \thesis@titlePage@large\thesis@department\\\vskip 2em}} + \thesis@titlePage@large\thesis@department@name\\\vskip 2em}} \let\thesis@blocks@titlePage@header=\thesis@blocks@cover@header \def\thesis@blocks@frontMatter{% \thesis@blocks@clear diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty index 97cadd1de78..7db6e208364 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/02/18] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/03/22] \thesis@color@setup{ links={HTML}{F58E76}, tableEmph={HTML}{FF9D85}, @@ -90,7 +90,7 @@ \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} \let\@E\relax\newlength{\@E}\settowidth{\@E}{{% \bf\thesis@@{fieldTitle}:}} - \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field@name} \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% max(\@A,\@B)} \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% @@ -100,7 +100,7 @@ {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor \end{minipage}\hfill\begin{minipage}[t]{\@right} {\bf\thesis@@{authorTitle}:}\\\thesis@author - \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field + \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field@name \end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear @@ -123,13 +123,6 @@ \pagestyle{thesisheadings} \parindent 1.5em \onehalfspacing} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty index 560e9cead1b..23edc45a399 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-ped.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/03/22] \thesis@color@setup{ links={HTML}{FFA02F}, tableEmph={HTML}{FFBB6B}, @@ -64,24 +64,16 @@ % Typeset the name of the thesis advisor. {\thesis@titlePage@large\\[0.3in] {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} -\def\thesis@blocks@bibEntry{% - \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@titlePage \thesis@blocks@frontMatter \thesis@blocks@bibEntry - \thesis@blocks@clearRight - \thesis@blocks@abstract - \thesis@blocks@abstractEn - \thesis@blocks@keywords - \thesis@blocks@keywordsEn + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@tables} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty index 8d39b72dca5..ca0beddd487 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2015/12/08] +\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/03/22] \thesis@color@setup{ links={HTML}{6FCEF2}, tableEmph={HTML}{78CEF0}, @@ -58,14 +58,47 @@ tableEven={HTML}{D0EBF5}} \thesis@blocks@titlePage@department@true \thesis@blocks@titlePage@field@true +\def\thesis@departments@kisk{kisk} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@department@name{\thesis@@{departmentName}} + \def\thesis@departmentEn@name{\thesis@english@departmentName} +\fi +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@titlePage@content{% + {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in + {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} + {\thesis@titlePage@Large\bf\thesis@author} + % If this is a KISK thesis, typeset the name of the thesis + % advisor. + \ifx\thesis@department\thesis@departments@kisk + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor} + \fi}% +\fi \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@titlePage \thesis@blocks@frontMatter + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@abstractEn + \thesis@blocks@keywords + \thesis@blocks@keywordsEn + \fi \thesis@blocks@declaration \thesis@blocks@thanks - \thesis@blocks@tables} + \ifx\thesis@department\thesis@departments@kisk + \thesis@blocks@toc + \else + \thesis@blocks@tables + \fi} +\ifx\thesis@department\thesis@departments@kisk + \def\thesis@blocks@postamble{% + \thesis@blocks@lot + \thesis@blocks@lof} +\fi \endinput %% %% End of file `fithesis-phil.sty'. diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty index da898d86a11..8ae9fe28e11 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/01/12] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/03/22] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -105,14 +105,14 @@ \thesis@author\\ \thesis@czech@facultyName, \thesis@czech@universityName\\ - \thesis@department + \thesis@department@name }\\ \textbf{\thesis@czech@bib@thesisTitle:} & \thesis@title \\ \textbf{\thesis@czech@bib@programme:} & \thesis@programme \\ \textbf{\thesis@czech@bib@field:} - & \thesis@field \\ + & \thesis@field@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -170,14 +170,14 @@ \thesis@author\\ \thesis@english@facultyName, \thesis@english@universityName\\ - \thesis@departmentEn + \thesis@departmentEn@name }\\ \textbf{\thesis@english@bib@thesisTitle:} & \thesis@titleEn \\ \textbf{\thesis@english@bib@programme:} & \thesis@programmeEn \\ \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn \\ + & \thesis@fieldEn@name \\ % Unless this is a rigorous thesis, typeset the name of the % thesis advisor. \ifx\thesis@type\thesis@rigorous\else @@ -206,7 +206,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@large\thesis@department} + \thesis@titlePage@large\thesis@department@name} \vfill {\bf\thesis@titlePage@Huge\thesis@czech@typeName} \vfill @@ -227,7 +227,7 @@ \begin{center} {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@department} + \thesis@titlePage@normalsize\thesis@department@name} \rule{\textwidth}{2pt}\vspace*{2mm} \end{center} \end{minipage}\begin{minipage}{30mm} |