diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:33:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:33:28 +0000 |
commit | bd56ba4e78930d918f50e0ca082dea03bc614938 (patch) | |
tree | 84df73201b80141037c0ad9ac86b6f7c8683e632 /Master/texmf-dist/tex/latex/fithesis/style | |
parent | e02235dda0e68d2131b9cf111af5448fa125ad58 (diff) |
fithesis (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fithesis/style')
14 files changed, 53 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/fithesis-base.sty index 05bdee4e70a..c3cf69fb59e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/fithesis-base.sty @@ -6,7 +6,7 @@ %% %% base.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo index 619e6e77a7d..58032a7aa5b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `opt,10pt') %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo index 86cc7c2384d..a3f205604cd 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-11.clo @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `opt,11pt') %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo index 57504b72174..8b6c6477d85 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-12.clo @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `opt,12pt') %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 4d73c932634..aeffa54c25d 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 @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `base') %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) @@ -114,8 +114,7 @@ \thesis@require{fontspec} \thesis@require{unicode-math} \setmainfont[Ligatures=TeX]{TeX Gyre Pagella} - \setmathfont[math-style=ISO,bold-style=ISO,vargreek-shape=TeX]% - {texgyrepagella-math.otf} + \setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf} \fi \else \ifthesis@palatino@ 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 1b40789e92a..7cfa25d43dd 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 @@ -6,7 +6,7 @@ %% %% econ.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 53da5cce13c..82607403721 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 @@ -6,7 +6,7 @@ %% %% fi.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) @@ -60,34 +60,43 @@ style=iso-numeric, sorting=none} \thesis@bibliography@load -\ifx\thesis@type\thesis@bachelors\else -\ifx\thesis@type\thesis@masters\else +\ifx\thesis@type\thesis@rigorous + \thesis@blocks@assignment@false +\else\ifx\thesis@type\thesis@doctoral \thesis@blocks@assignment@false \fi\fi +\def\thesis@blocks@advisor{% + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} \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 rigorous thesis, typeset the name of the - % thesis advisor. + % If this is a rigorous thesis or a PhD thesis proposal, + % typeset the name of the thesis advisor. \ifx\thesis@type\thesis@rigorous - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor} - \fi}% + \thesis@blocks@advisor + \else\ifx\thesis@type\thesis@proposal + \thesis@blocks@advisor + \fi\fi}% +\def\thesis@blocks@advisorSignature{% + \let\@A\relax\newlength{\@A} + \settowidth{\@A}{\thesis@@{advisorSignature}} + \setlength{\@A}{\@A+1cm} + \hfill\raisebox{-0.5em}{\parbox{\@A}{ + \centering + \rule{\@A}{1pt}\\ + \thesis@@{advisorSignature} + }}}% \def\thesis@blocks@titlePage@footer{% {\thesis@titlePage@large\thesis@place, \thesis@@{semester} - % If this is a rigorous thesis, create space for the advisor's - % signature + % If this is a rigorous thesis or a PhD thesis proposal, + % create space for the advisor's signature. \ifx\thesis@type\thesis@rigorous - \let\@A\relax\newlength{\@A} - \settowidth{\@A}{\thesis@@{advisorSignature}} - \setlength{\@A}{\@A+1cm} - \hfill\raisebox{-0.5em}{\parbox{\@A}{ - \centering - \rule{\@A}{1pt}\\ - \thesis@@{advisorSignature} - }} - \fi}} + \thesis@blocks@advisorSignature + \else\ifx\thesis@type\thesis@proposal + \thesis@blocks@advisorSignature + \fi\fi}} \def\thesis@blocks@declaration{% \thesis@blocks@clear \begin{alwayssingle}% @@ -104,13 +113,17 @@ \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} + \ifx\thesis@type\thesis@proposal + \thesis@blocks@toc + \else + \thesis@blocks@assignment + \thesis@blocks@declaration + \thesis@blocks@thanks + \thesis@blocks@clearRight + \thesis@blocks@abstract + \thesis@blocks@keywords + \thesis@blocks@tables + \fi} \def\thesis@blocks@postamble{% \thesis@blocks@bibliography} \endinput 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 8dc6b3cfb2c..a46ea20fb28 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 @@ -6,7 +6,7 @@ %% %% fsps.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fss.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fss.sty index b2f11892d10..46585b9038e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fss.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fss.sty @@ -6,7 +6,7 @@ %% %% fss.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 ca2af1cb923..73a6c529d24 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 @@ -6,7 +6,7 @@ %% %% law.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 cb38188ef9e..95a6e41eb3e 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 @@ -6,7 +6,7 @@ %% %% med.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 e2bd590e696..d6e88fab8c0 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 @@ -6,7 +6,7 @@ %% %% ped.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 0290a2027f3..b84e08d7816 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 @@ -6,7 +6,7 @@ %% %% phil.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) 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 3b3fefce043..53d383b639f 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 @@ -6,7 +6,7 @@ %% %% sci.dtx %% -%% Copyright 1998--2016 Daniel Marek (DM), Jan Pavlovič (JP), +%% Copyright 1998--2017 Daniel Marek (DM), Jan Pavlovič (JP), %% Vít Novotný (VN), Petr Sojka (PS) %% http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) |