summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/suftesi
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-11 03:01:36 +0000
committerNorbert Preining <norbert@preining.info>2020-02-11 03:01:36 +0000
commita2dd5021cc27056722b5f2159abdcff8d4f75399 (patch)
treeecca57b0139c3a4cdec8c9e23b138d5ad7efeeda /macros/latex/contrib/suftesi
parent3e399d8526bd786d65f34c90728b33d02814da00 (diff)
CTAN sync 202002110301
Diffstat (limited to 'macros/latex/contrib/suftesi')
-rw-r--r--macros/latex/contrib/suftesi/suftesi.dtx196
-rw-r--r--macros/latex/contrib/suftesi/suftesi.pdfbin1109701 -> 1111668 bytes
2 files changed, 141 insertions, 55 deletions
diff --git a/macros/latex/contrib/suftesi/suftesi.dtx b/macros/latex/contrib/suftesi/suftesi.dtx
index 5a37ee830e..fa9f24e68a 100644
--- a/macros/latex/contrib/suftesi/suftesi.dtx
+++ b/macros/latex/contrib/suftesi/suftesi.dtx
@@ -67,7 +67,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2020/02/04 v2.9.5 A class for typesetting theses, books and articles]
+ [2020/02/10 v2.9.6 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -175,7 +175,7 @@
%</driver>
% \fi
%
-% \CheckSum{5108}
+% \CheckSum{5283}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -193,7 +193,8 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}.}
+% \changes{v2.9.6}{2020/02/10}{New option \opt{compacttoc}. The appendix page title is printed in the font of the chapters by default. Removed \cmd{apepndicesname} command.}
+% \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}. New mechanism for the appendices through the \sty{appendix} package.}
% \changes{v2.9.4}{2020/01/01}{Updated documentation.}
% \changes{v2.9.3}{2020/01/29}{Updated documentation.}
% \changes{v2.9.2}{2019/10/26}{Added \cmd{protect} to \cmd{SUF@thechapter} and \cmd{SUF@thesection} in the definitions of \cmd{chaptermark} and \cmd{sectionmark} to correct a bug when loading \texttt{greek} option with \sty{babel}}
@@ -594,6 +595,26 @@
%\end{tikzpicture}
%\caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
%\end{figure}
+
+%
+% \subsection{The cover page}
+% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
+%\begin{latexcode}
+ %\begin{verbatim}
+ %\Cauthor{Bruce Lee}
+ %\Ctitle{The Art of Kicking}
+ %\Csubtitle{How to survive in the modern societies}
+ %\Ceditor{edited by\\ Walker Texas Ranger}
+ %\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+ %\Cpagecolor{white!90!black}
+ %\Ctextcolor{white}
+ %\Cfootcolor{black}
+ %
+ %\makecover[ball color=DarkBlue,draw=none]
+ %\end{verbatim}
+ %\end{latexcode}
+%
+%To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
%
% \subsection{The frontispiece} \enlargethispage{\baselineskip}
%
@@ -634,27 +655,7 @@
%
%^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
%
-% \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
-%\begin{latexcode}
-%\begin{verbatim}
-%\Cauthor{Bruce Lee}
-%\Ctitle{The Art of Kicking}
-%\Csubtitle{How to survive in the modern societies}
-%\Ceditor{edited by\\ Walker Texas Ranger}
-%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
-%\Cpagecolor{white!90!black}
-%\Ctextcolor{white}
-%\Cfootcolor{black}
-%
-%\makecover[ball color=DarkBlue,draw=none]
-%\end{verbatim}
-%\end{latexcode}
-%
-%To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
-%
-%
-% \subsection{Appendices}
+% \subsection{The appendices}
% Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment.
%\begin{latexcode}
%\begin{verbatim}
@@ -846,6 +847,13 @@
% \item[leftpage] Prints a table of contents with page numbers
% on the left margin.
% \end{valuelist}
+% \optitem[sec]{compacttoc}{\opt{sec}, \opt{subsec},
+% \opt{subsubsec}}
+% \begin{valuelist}
+% \item[sec] Prints the sections, subsections and sub-subsections in a single paragraph. Note that in this case the option \opt{tocstyle=dotted} in uneffective as the dots are not printed for chapter entries.
+% \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
+% \item[subsubsec] Prints the sub-subsections in a single paragraph.
+% \end{valuelist}
% \optitem[roman]{toc\meta{level}font}{\opt{roman}, \opt{italic},
% \opt{smallcaps}}
% \begin{valuelist}
@@ -969,7 +977,7 @@
% \end{optionlist}
%
%
-% \subsection{Miscellaneous}
+% \subsection{Miscellaneous}\label{sec:miscellaneous}
%
%\begin{optionlist}
% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
@@ -1239,26 +1247,23 @@
% The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on.
%
%\begin{ltxsyntax}
-% \cmditem{<level>font}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}font}{definition}\hfill(default=\texttt{empty})
%
-% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
+% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
%
%\begin{latexcode}
%\begin{verbatim}
-% \chapfont{\bfseries\sffamily\scshape\Huge}
-% \secfont{\sffamily\fontsize{15.5}{17.5}}
+%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
%\end{verbatim}
%\end{latexcode}
+% \cmditem*{\meta{level}numfont}{definition}\hfill(default=\texttt{empty})
%
-% \cmditem{<level>numfont}{definition}\hfill(default=\texttt{empty})
-%
-% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
+% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
%
%\begin{latexcode}
%\begin{verbatim}
-%\chapnumfont{%
%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-%\color{gray}\arabic{chapter}\hskip-15cm}
+% \color{gray}\arabic{chapter}\hskip-15cm}
%\end{verbatim}
%\end{latexcode}
% Combining these commands you can get something like this (or something worse/better):
@@ -1267,6 +1272,8 @@
%\documentclass[pagelayout=periodicalaureo,11pt,
%version=cscreen,chapstyle=parright]{suftesi}
%
+%\usepackage{xcolor,lipsum}
+%
%\chapfont{\bfseries\sffamily\scshape\LARGE}
%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
%
@@ -1343,11 +1350,15 @@
%
% \cmditem{appendixpage}
%
-% Prints a page with the argument of \cmd{appendicesname} (default=\texttt{Appendici}) at the center. Particularly useful if you have two or more appendices.
-%
-% \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
-%
-% Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
+% Prints a page with the title provided by \cmd{appendixpagename} (default=\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
+%\begin{latexcode}
+%\begin{verbatim}
+% \renewcommand{\appendixpagename}{Appendices}
+%\end{verbatim}
+%\end{latexcode}%
+%^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
+%^^A
+%^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
%
%\end{ltxsyntax}
%
@@ -1762,6 +1773,9 @@
\newif\ifsuftesi@twocolumnlot
\newif\ifsuftesi@reverseauthortitle
\newif\ifsuftesi@collection
+\newif\ifsuftesi@toccompactsec
+\newif\ifsuftesi@toccompactsubsec
+\newif\ifsuftesi@toccompactsubsubsec
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -1818,6 +1832,7 @@
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
supercompactaureo,periodicalaureo}[standard]{%
\ifcase\nr\relax
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1832,6 +1847,7 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1847,6 +1863,7 @@
marginparsep= 12pt}
\or
\suftesi@periodicaltrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1863,6 +1880,7 @@
marginparsep= 10pt}
\or
\suftesi@compacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1879,6 +1897,7 @@
marginparsep= 9pt}
\or
\suftesi@compactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1895,6 +1914,7 @@
marginparsep= 9pt}
\or
\suftesi@supercompacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1911,6 +1931,7 @@
marginparsep= 8pt}
\or
\suftesi@supercompactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -1927,6 +1948,7 @@
marginparsep= 7pt}
\or
\suftesi@periodicalaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -2472,18 +2494,16 @@ dotarabic,dotroman,dotRoman}[arabic]{%
% \subsubsection*{Captions}
% \begin{macrocode}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define@choicekey{}{captionstyle}[\val\nr]
{standard,sanserif,italic,smallcaps}[standard]{%
\ifcase\nr\relax
- \captionsetup{labelsep=period,font=small}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=sf}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=it}
\or
- \captionsetup{labelsep=period,font=small,labelfont=sc}
+ \captionsetup{labelfont=sc}
\fi
}
% \end{macrocode}
@@ -2514,6 +2534,30 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\or
\suftesi@pagelefttoctrue
\fi}
+\define@choicekey{}{compacttoc}[\val\nr]{%
+ sec,subsec,subsubsec}[sec]{%
+ \ifcase\nr\relax
+ \suftesi@toccompactsectrue
+ \suftesi@toccompactsubsectrue
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\hskip.5em}
+ \def\suf@ssscorrect{\hskip.5em}
+ \def\suf@ctocdotsec{.}
+ \def\suf@ctocdotssec{}
+ \def\suf@ctocdotsssec{}
+ \or
+ \suftesi@toccompactsubsectrue
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\hskip.5em}
+ \def\suf@ctocdotssec{.}
+ \def\suf@ctocdotsssec{}
+ \or
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\relax}
+ \def\suf@ctocdotsssec{.}
+ \fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -3352,7 +3396,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\SUF@CHAP@StyleSwitch}
\fi
\ifsuftesi@numparchap
- \setlength{\SUF@ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF@ADJnumparchap}{-6ex}
\else
\setlength{\SUF@ADJnumparchap}{0pt}
\fi}
@@ -3444,7 +3488,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\SUF@default@CHAPTER
\SUF@default@SECTIONS
\ifsuftesi@periodical
- \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@periodicalaureo
@@ -3513,13 +3557,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\fi
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -3530,13 +3574,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
% \begin{macrocode}
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -4213,13 +4257,21 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
% \end{macrocode}
% \subsection*{Appendix}
% \begin{macrocode}
-% \changes{v2.9.5}{2020/02/04}{New mechanism for the appendices through the \sty{appendix} package.}
\RequirePackage{appendix}
\renewcommand{\appendixpagename}{Appendici}
\renewcommand{\appendixtocname}{Appendici}
\renewcommand{\appendixname}{Appendice}
\noappendicestocpagenum
-\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+%^^A Bug using defaultfont=none,libertine,standard,compatibility
+%^^A \AtBeginEnvironment{appendices}{\appendix\mainmatter}
+\def\appendicesname{%
+ \ClassError{suftesi}%
+ {Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead. See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
+ {Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead. See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
%^^A\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
%^^A \appendicesname{Appendici}
%^^A \newcommand{\appendixpage}{\SUF@appendixpage}
@@ -4261,7 +4313,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\centering
\interlinepenalty \@M
\normalfont
- \SUF@chaptersize\appendixpagename\par}%
+ \SUF@chapsize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
\if@dotoc@pp
\addappheadtotoc
\fi
@@ -4284,7 +4337,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\parindent \z@ \raggedright
\interlinepenalty \@M
\normalfont
- \SUF@chaptersize\appendixpagename%
+ \SUF@chapsize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
\markboth{}{}\par}%
\if@dotoc@pp
\addappheadtotoc
@@ -4298,14 +4352,16 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\setcounter{section}{0}%
\setcounter{subsection}{0}%
\gdef\SUF@thesection{\@Alph\c@section}%
- \gdef\SUF@HEAD@thesection{\@Alph\c@section}}
+ \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+ \renewcommand{\thesection}{\@Alph\c@section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
\gdef\SUF@thechapter{\@Alph\c@chapter}%
- \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}}
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
% \end{macrocode}
% \subsection*{Headings}
@@ -4754,6 +4810,10 @@ Janusz M. Nowacki.
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tochang@chap]{}{%
+ \SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tochang@sec]
{}
@@ -4768,6 +4828,11 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
\SUF@tocSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
+ \SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
{}
@@ -4779,6 +4844,11 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
\SUF@tocSUBSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
+ \SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
{}
@@ -4790,6 +4860,7 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
\SUF@tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF@tochang@par]
{}
@@ -4885,6 +4956,10 @@ Janusz M. Nowacki.
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tocindent@chap]{}{%
+ \SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tocindent@sec]
{}
@@ -4898,6 +4973,11 @@ Janusz M. Nowacki.
\SUF@tocSEC@font}
{\ifsuftesi@article\SUF@chaptitlerule%
\else\SUF@titlerule\fi\contentspage}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
+ \SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
{}
@@ -4907,6 +4987,11 @@ Janusz M. Nowacki.
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
\SUF@tocSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
+ \SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
{}
@@ -4916,6 +5001,7 @@ Janusz M. Nowacki.
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF@tocindent@par]
{}
diff --git a/macros/latex/contrib/suftesi/suftesi.pdf b/macros/latex/contrib/suftesi/suftesi.pdf
index 14b155c2f6..ec6728bc91 100644
--- a/macros/latex/contrib/suftesi/suftesi.pdf
+++ b/macros/latex/contrib/suftesi/suftesi.pdf
Binary files differ