diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-13 21:49:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-13 21:49:58 +0000 |
commit | e42f335965a6717fd00e14fa46c29291bc34761a (patch) | |
tree | 839a0b3a59e6236053eeb570f8da37f72e5a8d73 /Master/texmf-dist/source/latex/fithesis | |
parent | 26a7a8feca4cf7697c7aa08fd139ecbb069bb71a (diff) |
fithesis (13apr16)
git-svn-id: svn://tug.org/texlive/trunk@40487 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fithesis')
-rw-r--r-- | Master/texmf-dist/source/latex/fithesis/fithesis.dtx | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx | 58 |
2 files changed, 47 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 573ef0ef44e..8bda3d900a5 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,11 +56,16 @@ \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}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.37} {2016/04/12}{The \cs{tableofcontents} in the +% style files of the Masaryk University in Brno now correctly +% handles all tocdepth values. The expansion of \cs{part} also no +% longer results in a \textsf{hyperref}-related error in the +% style files of the Masaryk University in Brno.} % \changes{v0.3.36} {2016/03/26}{The \cs{thesis@load} macro has % been lifted to the public API as \cs{thesisload}.} % \changes{v0.3.35:3}{2016/03/23}{Fixed \cs{l@}\textit{locale} 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 1af3d32430d..908d82e5656 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -7,7 +7,7 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/03/22] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/04/12] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -867,13 +867,16 @@ % loaded from the |\thesis@stylepath| |mu| directory, respectively. % \begin{macrocode} % Table of contents will contain sectioning commands up to -% \subsubsection -\setcounter{tocdepth}{3} +% \subsection. +\setcounter{tocdepth}{2} -% Load the `fithesis-1*.clo` size option +% Sections up to \subsection will be numbered. +\setcounter{secnumdepth}{2} + +% Load the `fithesis-1*.clo` size option. \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax -% Define the running heading style +% Define the running heading style. \def\ps@thesisheadings{% \def\chaptermark##1{% \markright{% @@ -905,7 +908,7 @@ \fi \let\@mkboth\markboth} -% Redefine the style of the chapter headings +% Redefine the style of the chapter headings. \renewcommand*\chapter{% \thesis@blocks@clear \thispagestyle{plain}% @@ -913,7 +916,7 @@ \@afterindentfalse \secdef\@chapter\@schapter} -% Redefine the style of part headings +% Redefine the style of part headings. \renewcommand*\part{% \thesis@blocks@clear \if@twocolumn @@ -925,15 +928,36 @@ \hbox{}\vfil \secdef\@part\@spart} +% A macro for temporary multicol -> singlecol switching. \newif\if@restonecol \def\alwayssingle{% \@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn\fi} \def\endalwayssingle{\if@restonecol\twocolumn\fi} +% Disable uppercasing in PDF strings. +\pdfstringdefDisableCommands{% + \let\MakeUppercase\relax} + +% Set up the ToC entries appearance. +\renewcommand*\toc@font[1]{% + \ifcase #1\relax + \bfseries % \chapter (0) + \or + \slshape % \section (1) + \else + \rmfamily % \subsection (2), \subsubsection (3) + % \paragraph, \subparagraph (4) + \fi} + +% Set up the table of contents entries for sectioning commands. \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 @@ -944,13 +968,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 @@ -961,12 +984,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}} % \end{macrocode}\iffalse %</base> % \fi\file{style/mu/fithesis-10.clo} @@ -1313,8 +1339,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.' |