fithesis (13apr16)

git-svn-id: svn://tug.org/texlive/trunk@40487 c570f23f-e606-0410-a88d-b1316a301751

25 files changed, 32 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
index e0b04a8b49a..26c0c6dc8b3 100644
--- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
+++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
@@ -54,7 +54,7 @@
   \gdef\thesis@version@number{#1}
   \gdef\thesis@version@date{#2}
   \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
-\thesis@versiondef{v0.3.36}{2016/03/30}}
+\thesis@versiondef{v0.3.37}{2016/04/12}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ProvidesClass{fithesis3}[\thesis@version]
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
index 54f439e2c01..ab29f55ba88 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
index 0e737cd1fef..4e596ba8687 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
index 30c93c3902f..3c795574e59 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
index 45a7cfc4a9f..ab56953db52 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
index aa4720ca287..2f3fc1e721b 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
index 379cc2a96e2..8ddfeebd45f 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
index 9938eb6d764..74f0accbb91 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
index 85ef6020b19..dc6003efcd0 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
index 1a3598a80f7..dfbce6ee081 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
index 8d42feb69d3..ae7e31dd576 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
index 1dd0eaf9d99..fc5797d3881 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
index e9a6d679132..895252b2ddd 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
index 25039966212..ff6939fdf9e 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
index 5af185151b2..3853afe54ce 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
index 1ed85bd4026..88c9617df78 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
index 29552295989..14e71c0da14 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
index 72da5105fa2..194a0d0f3da 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
index e0eee1eb483..d99192755e2 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
index c8cf1d67e85..6ad65dd3234 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
index 4224bbd4d7c..4a0e95b57f0 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-10.clo b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-10.clo
index 5958cf180f4..68367fbca65 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
@@ -237,8 +237,6 @@
   3.25ex plus1ex minus.2ex}{-1em}{%
   \reset@font\normalsize\bfseries}}
 
-\setcounter{secnumdepth}{2}
-
 \leftmargini 2.5em
 \leftmarginii 2.2em     % > \labelsep + width of '(m)'
 \leftmarginiii 1.87em   % > \labelsep + width of 'vii.'
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 2729e25b08c..73a189b5c89 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
@@ -236,8 +236,6 @@
   3.25ex plus1ex minus.2ex}{-1em}{%
   \reset@font\normalsize\bfseries}}
 
-\setcounter{secnumdepth}{2}
-
 \leftmargini 2.5em
 \leftmarginii 2.2em     % > \labelsep + width of '(m)'
 \leftmarginiii 1.87em   % > \labelsep + width of 'vii.'
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 9f60a1004f4..7537c363ff5 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
@@ -213,8 +213,6 @@
   3.25ex plus1ex minus.2ex}{-1em}{%
   \reset@font\normalsize\bfseries}}
 
-\setcounter{secnumdepth}{2}
-
 \leftmargini 2.5em
 \leftmarginii 2.2em     % > \labelsep + width of '(m)'
 \leftmarginiii 1.87em   % > \labelsep + width of 'vii.'
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 33a2bac9fc5..7204eb72455 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/03/22]
+\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/04/12]
 \NeedsTeXFormat{LaTeX2e}
 \DeclareOption{10pt}{\def\thesis@ptsize{0}}
 \DeclareOption{11pt}{\def\thesis@ptsize{1}}
@@ -405,7 +405,9 @@
   \thesis@pages\ \thesis@@{bib@pages}.
   \thesis@@{advisorTitle}: \thesis@advisor
   \thesis@blocks@clearRight}
-\setcounter{tocdepth}{3}
+\setcounter{tocdepth}{2}
+
+\setcounter{secnumdepth}{2}
 
 \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax
 
@@ -463,10 +465,27 @@
   \@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn\fi}
 \def\endalwayssingle{\if@restonecol\twocolumn\fi}
 
+\pdfstringdefDisableCommands{%
+  \let\MakeUppercase\relax}
+
+\renewcommand*\toc@font[1]{%
+  \ifcase #1\relax
+    \bfseries % \chapter (0)
+  \or
+    \slshape  % \section (1)
+\else
+    \rmfamily % \subsection (2), \subsubsection (3)
+              % \paragraph, \subparagraph (4)
+  \fi}
+
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
-    \addvspace{0.5em \@plus\p@}%
+    \ifnum \c@tocdepth >0\relax
+      \addvspace{2.25em \@plus\p@}%
+    \else
+      \addvspace{1.0em \@plus\p@}%
+    \fi
     \begingroup
       \setlength\@tempdima{3em}%
       \parindent \z@ \rightskip \@pnumwidth
@@ -477,13 +496,12 @@
          \global\@nobreaktrue
          \everypar{\global\@nobreakfalse\everypar{}}%
     \endgroup
-    \addvspace{0.2em \@plus\p@}%
   \fi}
 
 \renewcommand*\l@chapter[2]{%
-  \ifnum \c@tocdepth >\m@ne
+  \ifnum \c@tocdepth >0\relax
     \addpenalty{-\@highpenalty}%
-    \vskip 1.0em \@plus\p@
+    \addvspace{1.0em \@plus\p@}%
     \setlength\@tempdima{1.5em}%
     \begingroup
       \parindent \z@ \rightskip \@pnumwidth
@@ -494,12 +512,15 @@
       #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
       \penalty\@highpenalty
     \endgroup
+  \else
+    \@dottedtocline{0}{0em}{1.5em}{#1}{#2}
   \fi}
 
-\renewcommand*\l@chapter{\@dottedtocline{1}{0em}{1.5em}}
-\renewcommand*\l@section{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l@subsection{\@dottedtocline{3}{3.8em}{3.2em}}
-\renewcommand*\l@subsubsection{\@dottedtocline{4}{7.0em}{3.8em}}
+\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}}
+\renewcommand*\l@paragraph{\@dottedtocline{4}{10.0em}{5.0em}}
+\renewcommand*\l@subparagraph{\@dottedtocline{4}{12.0em}{6.0em}}
 \endinput
 %%
 %% End of file `fithesis-base.sty'.