texlive[59334] Master/texmf-dist: suftesi (24may21)

commits+karl at tug.org commits+karl at tug.org
Mon May 24 22:19:55 CEST 2021


Revision: 59334
          http://tug.org/svn/texlive?view=revision&revision=59334
Author:   karl
Date:     2021-05-24 22:19:55 +0200 (Mon, 24 May 2021)
Log Message:
-----------
suftesi (24may21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
    trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
    trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
    trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls

Modified: trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx	2021-05-24 20:19:37 UTC (rev 59333)
+++ trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx	2021-05-24 20:19:55 UTC (rev 59334)
@@ -56,7 +56,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2021/05/20 v3.1.0 A class for typesetting theses, books and articles]
+    [2021/05/23 v3.1.1 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass[12pt]{ltxdoc}
@@ -109,7 +109,6 @@
 % LAYOUT
 %--------------------------------------------------------
 \usepackage[skip=1.5ex]{parskip}
-\setcounter{tocdepth}{3}
 \usepackage{geometry}
 \geometry{
   a4paper,
@@ -127,8 +126,8 @@
 \addbibresource{suftesi.bib}
 \DeclareBibliographyCategory{pkgs-loaded}
 \addtocategory{pkgs-loaded}{appendix,caption,color,crop,enumitem,emptypage,
-fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,
-iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,
+fancyhdr,fixltxhyph,fontsize,mathalpha,libertinust1math,newtx,geometry,
+iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,
 substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,
 cochineal,mathpazo,bera,amsthm}
 \usepackage{array}
@@ -254,7 +253,7 @@
 % --------------------------------------------------------
 % OTHER THUMBNAILS
 % --------------------------------------------------------
-\def\shortlipsum{Sed feugiat. Cum sociis natoque penatibus et magnis dis parturient.}
+\def\shortlipsum{The phenomena should only be used as a canon for our understanding. }
 \newcommand{\fakechapter}[1]{%
   \noindent
   \begin{minipage}{.31\textwidth}
@@ -274,7 +273,7 @@
     \begin{tikzpicture}
       \draw[pframe] (0,0) rectangle (\textwidth,4.9);
       \node[pnode] at (0.5,4.6)
-        {\shortlipsum\shortlipsum\shortlipsum\shortlipsum
+        {\shortlipsum\shortlipsum\shortlipsum\shortlipsum%
         \footnote{\scriptsize\shortlipsum\shortlipsum\par}};
     \end{tikzpicture}%
   \end{minipage}
@@ -286,11 +285,11 @@
     \begin{tikzpicture}
       \draw[pframe] (0,0) rectangle (\textwidth,3.3);
       \node[pnode] at (0.3,3.2) 
-        {\shortlipsum%
+        {\shortlipsum:%
         \begin{list}{\color{gray}\textbullet}{\leftmargin=#1\itemsep=0pt}
-        \item first item
-        \item second item
-        \item third item
+        \item immagination
+        \item experience
+        \item emotions
         \end{list}};
     \end{tikzpicture}%
   \end{minipage}
@@ -298,14 +297,14 @@
 \newcommand{\fakequotation}[1]{%
   \noindent
   \begin{minipage}{.31\textwidth}
-    \footnotesize%
+    \fontsize{9}{10.5}\selectfont%
     \begin{tikzpicture}
         \draw[pframe] (0,0) rectangle (\textwidth,7);
          \node[pnode] at (0.25,6.8) 
-         {\hskip1em\shortlipsum\shortlipsum
+         {\hskip1em\shortlipsum\shortlipsum\smallskip
          \begin{list}{}{#1}
-          \item \tiny\shortlipsum\shortlipsum\shortlipsum\shortlipsum
-         \end{list}
+          \item \fontsize{7}{8.5}\selectfont\shortlipsum\shortlipsum\shortlipsum\shortlipsum
+         \end{list}\smallskip
          \hskip1em\shortlipsum\shortlipsum};
     \end{tikzpicture}%
   \end{minipage}
@@ -339,7 +338,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{5722}
+% \CheckSum{5685}
 %
 % \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
@@ -357,6 +356,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+%  \changes{v3.1.1}{2021/05/23}{Redefined some boolean options. Renamed some private commands. Corrected a bug in headers numbering (\cmd{protect} removed). Disabled automatic partial ToC functionality. Improved \opt{fewfootnotes} option via \sty{zref}. Updated documentation.}
 % \changes{v3.1.0}{2021/05/20}{Replaced \cmd{val}\cmd{nr} with \cmd{suftesi at val}\cmd{suftesi at nr}. Corrected a bug with \cmd{maketitle} in \opt{collection} structure. New options \opt{partialtoc} and \opt{maketitlestyle}. New commands for customizing the partial ToC. New value \opt{justify} for \opt{quotestyle} option. Improved \opt{quotesize} option. Renamed the \opt{revauthortitle} option to \opt{reverseauthortitle}. The options \opt{titlefont}, \opt{authorfont}, \opt{reverseauthortitle} now work for every structure. Renewed documentation}
 % \changes{v3.0.2}{2021/02/06}{Improved \opt{subsecstyle} and \opt{subsubsecstyle} options.}
 % \changes{v3.0.1}{2021/01/27}{Maintenance release.}
@@ -456,7 +456,7 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
-%\nocite{appendix,caption,color,crop,enumitem,emptypage,fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,cochineal,mathpazo,bera,amsthm}
+%\nocite{appendix,caption,color,crop,enumitem,emptypage,fancyhdr,fixltxhyph,fontsize,mathalpha,libertinust1math,newtx,geometry,iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,cochineal,mathpazo,bera,amsthm,zref}
 %
 % \thispagestyle{empty}
 %
@@ -607,17 +607,30 @@
 % \centering 
 % \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
 % \toprule
-%               &  \textrm{Global}           &   appendix, caption, color, crop, enumitem, emptypage, 
-%                               fancyhdr, fixltxhyph, fontenc, fontsize, geometry, iftex,
-%                               microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses)            \\\midrule
-%               &  \textrm{\hologo{pdfLaTeX} only} &  fontenc, substitutefont                                   \\\midrule
-%               &  \textrm{\hologo{LuaLaTeX} only} &  luatex85                                                  \\\midrule
-% defaultfont~=                              &  ~standard                                   &  lmodern    \\
-%               &  ~palatino                 &  textcomp, newpxtext, biolinum, inconsolata, newpxmath     \\
-%               &  ~libertine                &  textcomp, libertine, biolinum, inconsolata, newtxmath, libertinust1math     \\
-%               &  ~cochineal                &  textcomp, cochineal, biolinum, inconsolata, newtxmath     \\
-%               &  ~compatibility            &  mathpazo, beramono                                        \\\midrule
-% mathfont~=    &  ~extended                 &  amsthm, mathalpha                                          \\\bottomrule
+% \multicolumn{2}{c}{\textbf{Context}}            & \multicolumn{1}{c}{\textbf{Packages}}                    \\
+% \midrule
+%               & \textrm{Global}                 & appendix, caption, color, crop, enumitem, emptypage, 
+%                                                   fancyhdr, fixltxhyph, fontenc, fontsize, geometry, iftex,
+%                                                   microtype, multicol, titlesec, titletoc, 
+%                                                   xkeyval, cclicenses*, zref**                             \\
+% \midrule
+%               & \textrm{\hologo{pdfLaTeX} only} & fontenc, substitutefont                                  \\
+% \midrule
+%               & \textrm{\hologo{LuaLaTeX} only} & luatex85                                                 \\
+% \midrule
+% defaultfont~=                                   & ~standard                                  
+%                                                 & lmodern                                                  \\
+%               & ~palatino                       & textcomp, newpxtext, biolinum, inconsolata, newpxmath    \\
+%               & ~libertine                      & textcomp, libertine, biolinum, inconsolata, newtxmath, 
+%                                                   libertinust1math                                         \\
+%               & ~cochineal                      & textcomp, cochineal, biolinum, inconsolata, newtxmath    \\
+%               & ~compatibility                  & mathpazo, beramono                                       \\
+% \midrule
+% mathfont~=    & ~extended                       & amsthm, mathalpha                                        \\
+% \bottomrule\\[-1.5ex]
+% && \parbox{9.6cm}{\footnotesize
+% * only with \opt{FSPL} styles.\quad ** only with \opt{fewfootnotes} option.
+% }              
 % \end{tabular}
 % \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
 % \end{table}
@@ -648,9 +661,9 @@
 % templates are also available online on the CTAN’s website at 
 % \textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
 %
-% The class loads the packages listed in  table \ref{tab:pkgloaded} and
+% \alert The class loads the packages listed in  table \ref{tab:pkgloaded} and
 % since version 2.9.5 relies on \sty{appendix} package to manage 
-% the appendices \parencite[see][]{appendix}. To get the correct label 
+% the appendices \parencite{appendix}. To get the correct label 
 % in titles, headings and table of 
 % contents, you should use the \env{appendices} environment. 
 %
@@ -685,7 +698,7 @@
 % ^^A
 % ^^A ----------------------------------------------------------------
 %
-% The class provides eleven page layouts (table \ref{fig:layouts} and figure  
+% The class provides eleven page layouts (figure \ref{fig:layouts} and table  
 % \ref{tab:layouts}). The \opt{standard} 
 % layout (default) or \opt{standardaureo} layout are aimed to typeset 
 % A4 documents, while the other nine layouts are particularly suitable 
@@ -785,6 +798,42 @@
 %     $\SI{90}{cm} \times \SI{150}{cm}$.
 %   \end{valuelist}
 %
+% You can define your own layouts through the \cmd{geometry} command
+% of the \sty{geometry} package 
+% \parencite{geometry} and you can change the value of \cmd{baselineskip} 
+% too, possibly through \sty{fontsize} \parencite{fontsize}.
+%
+% \alert If you change the line spacing with 
+% the \cmd{linespread} command, you need to add \cmd{normalsize}. 
+%
+% ^^A\begin{minipage}{.4\textwidth}
+%\begin{latexcode}
+%\begin{verbatim}
+%\linespread{0.956}\normalsize
+%\geometry{...}
+%\end{verbatim}
+% \end{latexcode}
+% ^^A \geometry{
+% ^^A  ignoreall,
+% ^^A  paperwidth  = 140mm,
+% ^^A  paperheight = 210mm,
+% ^^A  textheight  = 165mm,
+% ^^A  textwidth   = 100mm,
+% ^^A  marginratio = 1:1,
+% ^^A  top         = 2.07cm,
+% ^^A  headsep     = 5.5mm,
+% ^^A  heightrounded}
+% ^^A\end{minipage}
+% ^^A\hfill
+% ^^A\begin{minipage}{.555\textwidth}
+% ^^A\begin{tikzpicture}[scale=2.81]
+% ^^A\draw (0,0) rectangle (1.40cm,2.10cm);
+% ^^A\draw[xshift=2mm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+% ^^A\draw[xshift=1.6cm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+% ^^A\draw[xshift=1.40cm] (0,0) rectangle (1.40cm,2.10cm);
+% ^^A\end{tikzpicture}
+% ^^A\end{minipage}
+%
 %\begin{figure}
 % \vspace*{-1cm}
 %\def\sufsetlengths{\sufsetlengthsA}
@@ -828,10 +877,15 @@
 %     \item[final] Prints the output on a A4 paper, hiding the crop marks. 
 %     Useless with \opt{standard} and \opt{standardaureo} layouts.
 %   \end{valuelist}
+%
+% \begin{footnotesize}
+%
 % Sometimes it is not desirable to have the crop marks on every page. 
 % In such a case you can use the \cmd{crop}|[off]| command 
 % after the first page of the document.
 %
+% \end{footnotesize}
+%
 % \optitem[\cmd{baselineskip}]{parindent}{\meta{dimen}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
 %   
@@ -838,56 +892,12 @@
 % Sets the indentation of the first line of each paragraph except those following a section title. You can use any unit recognized by \TeX{} (for example: \opt{1em}\OR\opt{1cm}\OR\opt{17pt}, \ldots).
 %
 %\begin{footnotesize}
-%Note that some packages may set the value of \cmd{parindent} inside the \cmd{AtBeginDocument} hook. In these cases the \opt{parindent} option is ineffective and if you want to change the indentation you have to call \cmd{parindent=}\meta{dimen} after |\begin{document}|.\par
+%
+%Note that some packages may set the value of \cmd{parindent} inside the \cmd{AtBeginDocument} hook. In these cases the \opt{parindent} option is ineffective and if you want to change the indentation you have to call \cmd{parindent=}\meta{dimen} after |\begin{document}|.
+%
 %\end{footnotesize}
 % \end{optionlist*}
 % 
-% \subsubsection{Layout customizations}
-%
-% You can define your own layouts through the \cmd{geometry} command
-% and you can change the value of \cmd{baselineskip} too. For example 
-% you can resize the typeblock of the \texttt{supercompactaureo} layout 
-% to fit particular needs, or simply because the font used requires 
-% a smaller line width. As you can see 
-% in the following example, you can change many aspects of the layout, 
-% using the parameters available for the \cmd{geometry} command. 
-% Here we have 
-% modified also the margin ratio, the  value of the upper margin and the 
-% distance between the head and the beginning of the text. For the other parameters
-% sees the documentation of the \sty{geometry} package \parencite{geometry}.
-%
-% \alert Remember that if you change the line spacing with 
-% the \cmd{linespread} command, you need to add \cmd{normalsize}. 
-%
-% ^^A\begin{minipage}{.4\textwidth}
-%\begin{latexcode}
-%\begin{verbatim}
-%\linespread{0.956}
-%\normalsize
-%\geometry{...}
-%\end{verbatim}
-% \end{latexcode}
-% ^^A \geometry{
-% ^^A  ignoreall,
-% ^^A  paperwidth  = 140mm,
-% ^^A  paperheight = 210mm,
-% ^^A  textheight  = 165mm,
-% ^^A  textwidth   = 100mm,
-% ^^A  marginratio = 1:1,
-% ^^A  top         = 2.07cm,
-% ^^A  headsep     = 5.5mm,
-% ^^A  heightrounded}
-% ^^A\end{minipage}
-% ^^A\hfill
-% ^^A\begin{minipage}{.555\textwidth}
-% ^^A\begin{tikzpicture}[scale=2.81]
-% ^^A\draw (0,0) rectangle (1.40cm,2.10cm);
-% ^^A\draw[xshift=2mm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
-% ^^A\draw[xshift=1.6cm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
-% ^^A\draw[xshift=1.40cm] (0,0) rectangle (1.40cm,2.10cm);
-% ^^A\end{tikzpicture}
-% ^^A\end{minipage}
-%
 % ^^A ----------------------------------------------------------------
 % ^^A
 %        \subsection{Font}\label{sec:fonts}
@@ -926,7 +936,7 @@
 %
 % ^^A ----------------------------------------------------------------
 % ^^A
-%        \subsubsection{General settings}\label{sec:fonts:options:general}
+%        \subsubsection{General options}\label{sec:fonts:options:general}
 % ^^A
 % ^^A ----------------------------------------------------------------
 % 
@@ -947,12 +957,11 @@
 %     \item[upper] Prints spaced \textsc{\lsstyle Small Capitals} with uppercase initials.
 %   \end{valuelist}
 %
-% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
-% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}\OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
 %   \begin{valuelist}
-%     \item[none] Does not load any font. Use this option 
-%    if you want full control over the font selection. This is the default with 
-%    \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+%     \item[none] Does not load any font (default with 
+%    \hologo{XeLaTeX} or \hologo{LuaLaTeX}). Use this option 
+%    if you want full control over the font selection
 %     \item[cochineal] Loads the Cochineal serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
 %     \item[libertine] Loads the Linux Libertine serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
 %     \item[palatino] Loads the New PX serif, the Linux Biolinum sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisia} option offers a very good solution.
@@ -985,9 +994,11 @@
 % 
 % Effective only with Cochineal, Libertine and New PX fonts.
 %   \begin{valuelist}
-%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}. This is the default with 
-%    \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
-%     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine) or \sty{newpxmath} (for PX Fonts).
+%     \item[none] Do not load any mathematical support (default with 
+%     \hologo{XeLaTeX} or \hologo{LuaLaTeX}). Use this option if you need 
+%     some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+%     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine) 
+%     or \sty{newpxmath} (for PX Fonts).
 %     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages. 
 %   \end{valuelist}
 % \end{optionlist*}
@@ -1064,8 +1075,8 @@
 % Actually useless  with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
-%     \item[none] Does not load any Greek font. This is the default with 
-%    \hologo{XeLaTeX} or \hologo{LuaLaTeX}. 
+%     \item[none] Does not load any Greek font (default with 
+%     \hologo{XeLaTeX} or \hologo{LuaLaTeX}).
 %     \item[artemisia] Loads the Artemisia font by the Greek Font Society.
 %     \item[porson] Loads the Porson font by the Greek Font Society.
 %     \item[bodoni] Loads the Bodoni font by the Greek Font Society.
@@ -1117,10 +1128,10 @@
 % ^^A
 % ^^A ----------------------------------------------------------------
 %
-% Figure \ref{fig:fakechapter} shows some combinations of the following options.
+% In the following option \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+% \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}. You can see some
+% combinations of these options in figure \ref{fig:fakechapter}.
 %
-%   In the following option \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-%   \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}.
 % \begin{optionlist*}
 % \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR 
 % \opt{smallcaps}}
@@ -1130,10 +1141,7 @@
 %     \item[smallcaps] Prints the \meta{level} title 
 %      in \textsc{\lsstyle spaced small caps}
 %   \end{valuelist}
-% \end{optionlist*}
-%   In the following options \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-%   \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}.
-% \begin{optionlist*}
+%
 % \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR 
 % \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR 
 % \opt{parright}}
@@ -1145,7 +1153,7 @@
 %     \item[parcenter] As \opt{center} but with the title below the number.
 %     \item[parright] As \opt{right} but with the title below the number.
 %   \end{valuelist}
-% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR 
+% \optitem[arabic/Roman {\rmfamily(part)}]{\meta{level}numstyle}{\opt{arabic}\OR 
 % \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
 % \opt{dotRoman}}
 %   \begin{valuelist}
@@ -1228,23 +1236,17 @@
 %
 % \begin{ltxsyntax}
 % \cmditem{breakintoc}
-%
-% A manual break which is active for the table of contents but not in the text or in the headers.
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\section{This title will be break here \breakintoc inside the contents}
-%\end{verbatim}
-% \end{latexcode}
 % \cmditem{breakinbody}
 % \cmditem{breakinbodyleft}
 %
-% Manual breaks which are active in the body text but not in the headers
-% and in the table of contents. The difference between the two
-% commands is that the former executes |\\| while the latter uses \cmd{newline}. The second one should be used with the \opt{\meta{level}style=left} options to avoid bad line alignments.
+% Manual breaks which are active in the the table of contents 
+% and in the body text respectivley.
+% The last one replaces \cmd{breakinbody} to avoid bad line alignments 
+% when the \opt{\meta{level}style=left} options are used.
 %
 % \begin{latexcode}
 %\begin{verbatim}
+%\section{This title will be break here \breakintoc inside the contents}
 %\section{This title will be break here \breakinbody inside the body text}
 %\section{This title will be break here \breakinbodyleft inside the body text}
 %\end{verbatim}
@@ -1323,12 +1325,15 @@
 %    and the list of tables in two columns.
 %    \item[all] Prints all the contents lists in two columns.
 %  \end{valuelist}
+%
 % \optitem[false]{partialtoc}{\opt{true}\OR\opt{false}}
-% This option is effective only with the \opt{structure=book} option.
 %  \begin{valuelist}
-%    \item[true] Prints a partial ToC at the beginning of every chapter.
-%    \item[false] Does not print any partial ToC.
+%    \item[true] Enable the \cmd{printpartialtoc} command to get a 
+%     partial ToC after the title of chapters 
+%     (\opt{book} structure) or sections (\opt{article} structure).
+%    \item[false] Disables \cmd{printpartialtoc} command.
 %  \end{valuelist}
+%
 % \end{optionlist*}
 %
 % ^^A ----------------------------------------------------------------
@@ -1337,6 +1342,12 @@
 % ^^A
 % ^^A ----------------------------------------------------------------
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \paragraph{General commands}\label{sec:toc:commands:general}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
 % \begin{ltxsyntax}
 % \cmditem*{toc\meta{level}font}{definition}
 %
@@ -1372,10 +1383,23 @@
 % \end{latexcode}
 % Note that in both cases the definition must be enclosed in a group 
 % to prevent it from changing what follows (i.e. the part number and the part title).
+% \end{ltxsyntax}
 %
-% The following commands allow you to modify some features of the partial ToC
-% printed at the beginning of each chapter when the \opt{partialtoc} option is used.
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \paragraph{Partial ToCs}\label{sec:toc:partialtoc}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% To use the command in this seciton load the \opt{partialtoc} option.
+%
+% \begin{ltxsyntax}
+% \cmditem{printpartialtoc}
+%
+% A command to print a partial ToC to be used after the \cmd{chapter}  
+% and \cmd{section} commands, respectively in \opt{book} and \opt{article} structures.
+%
 % \cmditem*{partialtoc\meta{level}font}{definition}
 % \cmditem*{partialtoc\meta{level}labelfont}{definition} 
 %
@@ -1411,7 +1435,8 @@
 %\partialtocsecfont{\bfseries\itshape}
 %\partialtocsubsecfont{\itshape}
 %\partialtocseclabel{\bfseries}
-%\partialtocbeforecode{\textbf{Contents of this chapter}\smallskip}
+%\partialtocbeforecode{\hrule\smallskip\textbf{Contents}\smallskip}
+%\partialtocaftercode{\smallskip\hrule}
 %\end{verbatim}
 % \end{latexcode}
 % which gives this very questionable result:
@@ -1418,9 +1443,13 @@
 %
 % \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]
 % \footnotesize
-% \textbf{Contents of this chapter}\vskip-.5ex
+% \null\medskip
 %
-% \textbf{\itshape 1.1 Lorem ipsum dolor sit amet, consectetuer adipiscing elit}, 1. 
+% \hrule
+%
+% \textbf{Contents}\vskip-.5ex
+%
+% \textbf{1.1 \itshape Lorem ipsum dolor sit amet, consectetuer adipiscing elit}, 1. 
 % 1.1.1 \textit{Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis}, 15. 
 % 1.1.1.1 Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna, 17. 
 % 1.1.1.2 Donec vehicula augue eu neque, 21. 
@@ -1427,11 +1456,14 @@
 % 1.1.2 \textit{Cras viverra metus rhoncus sem}, 26. 
 % 1.1.2.1 Nulla et lectus vestibulum urna fringilla ultrices, 29.
 % 1.1.2.2 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas, 34.
-% \textbf{\itshape 1.2 Nulla et lectus vestibulum urna fringilla ultrices}, 35. 
+% \textbf{1.2 \itshape Nulla et lectus vestibulum urna fringilla ultrices}, 35. 
 % 1.2.1 \textit{Cras viverra metus rhoncus sem}, 39. 
 % 1.2.1.1 Donec vehicula augue eu neque, 40.
 % 1.2.1.2 Phasellus eu tellus sit amet tortor gravida placerat, 45.
 % 1.2.2 \textit{Mauris ut leo}, 49.
+% \smallskip
+%
+% \hrule
 % \end{mdframed}
 %
 % For more radical changes you can of course define your own partial ToC with your
@@ -1480,30 +1512,6 @@
 % -- 1.3.3 Nonummy eget, consectetuer id, 63.
 % \end{mdframed}
 %
-% The last four commands described at the beginning of this section
-% can also be used inside a group to 
-% adjust the vertical spacing only for specific chapters. This is useful, for example,
-% for those chapters starting with special quotations or \textit{epigraphs}:
-% \begin{latexcode}
-%\begin{verbatim}
-%\begingroup
-%
-%\partialtocbeforespace{6cm}
-%\setlength{\beforeepigraphskip}{-5cm}
-%\setlength{\afterepigraphskip}{4cm}
-%
-%\chapter{The things in themselves are what first give rise to
-%         reason, as is proven in the ontological}
-%
-%\epigraph{As is proven in the ontological manuals,
-%          it is obvious that the transcendental unity 
-%          of apperception proves the
-%          validity of the Antinomies}{G.W.F. Hegel}
-%
-%\endgroup
-%\end{verbatim}
-% \end{latexcode}
-%
 % ^^A ----------------------------------------------------------------
 % ^^A
 %        \subsection{Headers and footers}
@@ -1686,7 +1694,7 @@
 %      Does not indents the block quotations.
 %   \end{valuelist}
 % \optitem[footnotesize]{quotesize}{\opt{small}, \dots, \opt{footnotesize}, \dots, \opt{scriptsize}, \dots}
-% You can use all the sizes made available by the \sty{fontsize} package.
+% You can use all the sizes made available by the \sty{fontsize} package \parencite{fontsize}.
 % \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
 %
 % \end{optionlist*}
@@ -1904,28 +1912,11 @@
 % 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. 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 
+% customizable. Anyway, 
+% to produce a complete book cover, with spine and dust jacket, you should 
 % take a look at the \sty{bookcover} class by Tibor \textcite{bookcover}.
 %
-%
 % \begin{ltxsyntax}
-% \cmditem{makecover}
 % \cmditem{makecover}[tikz options]
 %
 % Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz} 
@@ -1968,59 +1959,35 @@
 %
 % \end{ltxsyntax}
 % 
-% ^^A ----------------------------------------------------------------
-% ^^A
-%        \subsubsection*{Some examples of cover pages}
-% ^^A
-% ^^A ----------------------------------------------------------------
-%
-% First you have to declare the informations you want to put in the cover page. It is better to give these informations in the preamble:
-%
+% You can customize the circle using the optional arguments of the 
+% \cmd{makecover} command. Some of these \meta{tikz options} require 
+% special \sty{tikz} libraries. For example, you can add a shadow to 
+% the circle loading the \texttt{shadows} library and using the 
+% \texttt{circular drop shadow} otpion.
+% The cover shown 
+% in figure \ref{fig:cover} is obtained with the following code:
 % \begin{latexcode}
 %\begin{verbatim}
+%\documentclass{suftesi}
+%\usepackage[svgnames]{xcolor}
 %\usepackage{tikz}
+%  \usetikzlibrary{shadows}
 %
 %\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\\ \includegraphics[width=1cm]{logo}}
-%\end{verbatim}
-% \end{latexcode}
+%\Cfoot{Punch Press\\ \fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
+%\Cfootcolor{black}
 %
-% Then you can print the cover page with:
-% \begin{ttquote}
-% \cmd{makecover}
-% \end{ttquote}
-%
-% You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\usepackage{tikz}
-%\usetikzlibrary{shadows}
-%...
 %\begin{document}
-%  \makecover[circular drop shadow]
+%  \makecover[ball color=DarkBlue,draw=none,circular drop shadow]
 %\end{document}
 %\end{verbatim}
 % \end{latexcode}
 %
-% There are thousands of possibilities. Here is another (not necessarily good) example:
-% \begin{latexcode}
-%\begin{verbatim}
-%\usepackage{tikz}
-%
-%\Cpagecolor{gray!30}
-%\Ctextcolor{blue!50}
-%\Cfootcolor{black}
-%
-%\begin{document}
-%  \makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
-%\end{document}
-%\end{verbatim}
-% \end{latexcode} 
-%
 %\begin{figure}
 %\begin{minipage}{.5\textwidth}
 %\centering
@@ -2067,7 +2034,7 @@
 %\begin{tikzpicture}[scale=0.4]%
 %\draw[draw=gray,fill=gray!5,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
 % \node at (0,.65\textheight) (c) {};
-% \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
+% \draw[ball color=DarkBlue,draw=none,circular drop shadow] (c) circle (4.5cm);
 % \node[scale=0.4,anchor=center,text=white] at (c) {\parbox{6cm}{%
 %  \centering
 %       {\scriptsize\scshape Bruce Lee\\}
@@ -2216,13 +2183,11 @@
 %\begin{article}
 %\author{Author}
 %\title{Title of the paper}
-% % The abstract is optional.
-% % \begin{abstract}
-% %  The abstract
-% % \end{abstract}
-%
+% %   The abstract is optional.
+% %   \begin{abstract}
+% %     The abstract
+% %   \end{abstract}
 %\maketitle
-%
 %  Text of the paper
 %\end{article}
 %\end{verbatim}
@@ -2374,13 +2339,12 @@
 %    \begin{macrocode}
 \RequirePackage{xkeyval}
 \newif\ifsuftesi at article
-\newif\ifsuftesi at authortitle
 \newif\ifsuftesi at collection
-\newif\ifsuftesi at standard
+\newif\ifsuftesi at lmodern
 \newif\ifsuftesi at cochineal
 \newif\ifsuftesi at libertine 
 \newif\ifsuftesi at palatino 
-\newif\ifsuftesi at compatibility
+\newif\ifsuftesi at mathpazo
 \newif\ifsuftesi at nofont 
 \newif\ifsuftesi at greekfont 
 \newif\ifsuftesi at porson 
@@ -2399,9 +2363,10 @@
 \newif\ifsuftesi at pocketb
 \newif\ifsuftesi at pocketc
 \newif\ifsuftesi at screen
+\newif\ifsuftesi at sufplain
 \newif\ifsuftesi at screencentered
 \newif\ifsuftesi at centerheader
-\newif\ifsuftesi at sufplain
+\newif\ifsuftesi at authortitle
 \newif\ifsuftesi at numparpart
 \newif\ifsuftesi at numparchap
 \newif\ifsuftesi at numparsec
@@ -2413,15 +2378,11 @@
 \newif\ifsuftesi at twocolumntoc
 \newif\ifsuftesi at twocolumnlof
 \newif\ifsuftesi at twocolumnlot
-\newif\ifsuftesi at partialtoc
-\newif\ifsuftesi at toccompactsec
-\newif\ifsuftesi at toccompactsubsec
-\newif\ifsuftesi at toccompactsubsubsec
-\newif\ifsuftesi at toccompactpar
-\newif\ifsuftesi at toccompactsubpar
-\newif\ifsuftesi at draftdate
-\newif\ifsuftesi at fewfootnotes
-\newif\ifsuftesi at partpage
+\newif\ifsuftesi at ctocsec
+\newif\ifsuftesi at ctocsubsec
+\newif\ifsuftesi at ctocsubsubsec
+\newif\ifsuftesi at ctocpar
+\newif\ifsuftesi at ctocsubpar
 \newif\ifsuftesi at FSPL
 %    \end{macrocode}
 % The class is based on the standard \sty{book} class but the following options are disabled as they contrast with the layouts provided by the class. Specifically, the first five options are actually ineffective, while the \opt{landscape} option rotates the page correctly, but sets the text width according to the class options, effectively making it unusable.
@@ -2460,7 +2421,7 @@
   \def\SUF at chapswitch{\thechapter.}
 \or
   \suftesi at articletrue
-  \@titlepagefalse
+  \SUF at titlepagefalse
   \def\SUF at chapswitch{}
 \or
   \suftesi at collectiontrue
@@ -2467,19 +2428,29 @@
     \setkeys{}{headerstyle=authortitleinner}
   \def\SUF at chapswitch{}
 \fi}
-\define at choicekey{}{documentstructure}[\suftesi at val\suftesi at nr]
-    {book,article,collection}[book]{%
-\ClassWarningNoLine{suftesi}{%
-  'documentstructure' option is deprecated.\MessageBreak
-  Use 'structure' option instead}
+%    \end{macrocode}
+% \paragraph{View mode}
+%    \begin{macrocode}
+\define at choicekey{}{version}[\suftesi at val\suftesi at nr]
+    {screen,cscreen,draft,final}[draft]{%
 \ifcase\suftesi at nr\relax
-  \setkeys{}{structure=book}
+  \suftesi at screentrue
 \or
-  \setkeys{}{structure=article}
+  \suftesi at screentrue
+  \suftesi at screencenteredtrue
 \or
-  \setkeys{}{structure=collection}
+  \relax
+\or
+  \AtBeginDocument{\crop[off]}
 \fi}
 %    \end{macrocode}
+% \paragraph{Other options}
+%    \begin{macrocode}
+\define at boolkey[SUF]{}{marginpar}[true]{}
+\define at boolkey[SUF]{}{partpage}[true]{}
+\define at boolkey[SUF]{}{draftdate}[true]{}
+\define at boolkey[SUF]{}{titlepage}[true]{}
+%    \end{macrocode}
 % \subsubsection{Fonts}
 % \paragraph{Roman fonts}
 %    \begin{macrocode}
@@ -2494,9 +2465,9 @@
 \or
   \suftesi at palatinotrue
 \or
-  \suftesi at standardtrue
+  \suftesi at lmoderntrue
 \or
-  \suftesi at compatibilitytrue
+  \suftesi at mathpazotrue
 \fi}
 \define at choicekey{}{mathfont}[\suftesi at val\suftesi at nr]
     {none,minimal,extended}[minimal]{%
@@ -2525,6 +2496,18 @@
   \suftesi at greekfonttrue\suftesi at cbgreektrue
 \fi}
 %    \end{macrocode}
+% \paragraph{Small capitals style}
+%    \begin{macrocode}
+\define at choicekey{}{smallcapsstyle}[\suftesi at val\suftesi at nr]
+    {low,upper}[low]{%
+\ifcase\suftesi at nr\relax
+  \def\SUF at MakeLowercase{\MakeLowercase}
+  \def\SUF at TOCMakeLowercase{\lowercase}
+\or
+  \def\SUF at MakeLowercase{\relax}
+  \def\SUF at TOCMakeLowercase{\relax}
+\fi}
+%    \end{macrocode}
 % \subsubsection{Layouts}
 %    \begin{macrocode}
 \RequirePackage{geometry}
@@ -2682,7 +2665,7 @@
     marginparwidth= 12mm,
     marginparsep=   7pt}
 \or
-\suftesi at pocketBtrue
+\suftesi at pocketbtrue
   \DeclareRobustCommand{\SUF at partsize}{\large}
   \DeclareRobustCommand{\SUF at chaptersize}{\large}
   \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
@@ -2700,7 +2683,7 @@
     marginparwidth= 15mm,
     marginparsep=   7pt}
 \or
-\suftesi at pocketCtrue
+\suftesi at pocketctrue
   \DeclareRobustCommand{\SUF at partsize}{\large}
   \DeclareRobustCommand{\SUF at chaptersize}{\large}
   \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
@@ -2724,91 +2707,91 @@
 \define at choicekey{}{partstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@PARTSwitch{\filright}
+  \def\SUF at PART@align{\filright}
 \or
-  \def\SUF at lr@PARTSwitch{\filcenter}
+  \def\SUF at PART@align{\filcenter}
 \or
-  \def\SUF at lr@PARTSwitch{\filleft}
+  \def\SUF at PART@align{\filleft}
 \or
-  \def\SUF at lr@PARTSwitch{\filright}
+  \def\SUF at PART@align{\filright}
   \suftesi at numparparttrue
 \or
-  \def\SUF at lr@PARTSwitch{\filcenter}
+  \def\SUF at PART@align{\filcenter}
   \suftesi at numparparttrue
 \or
-  \def\SUF at lr@PARTSwitch{\filleft}
+  \def\SUF at PART@align{\filleft}
   \suftesi at numparparttrue
 \fi}
 \define at choicekey{}{chapstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@CHAPSwitch{\filright}
+  \def\SUF at CHAP@align{\filright}
 \or
-  \def\SUF at lr@CHAPSwitch{\filcenter}
+  \def\SUF at CHAP@align{\filcenter}
 \or
-  \def\SUF at lr@CHAPSwitch{\filleft}
+  \def\SUF at CHAP@align{\filleft}
 \or
-  \def\SUF at lr@CHAPSwitch{\filright}
+  \def\SUF at CHAP@align{\filright}
   \suftesi at numparchaptrue
 \or
-  \def\SUF at lr@CHAPSwitch{\filcenter}
+  \def\SUF at CHAP@align{\filcenter}
   \suftesi at numparchaptrue
 \or
-  \def\SUF at lr@CHAPSwitch{\filleft}
+  \def\SUF at CHAP@align{\filleft}
   \suftesi at numparchaptrue
 \fi}
 \define at choicekey{}{secstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SECSwitch{\filright}
+  \def\SUF at SEC@align{\filright}
 \or
-  \def\SUF at lr@SECSwitch{\filcenter}
+  \def\SUF at SEC@align{\filcenter}
 \or
-  \def\SUF at lr@SECSwitch{\filleft}
+  \def\SUF at SEC@align{\filleft}
 \or
-  \def\SUF at lr@SECSwitch{\filright}
+  \def\SUF at SEC@align{\filright}
   \suftesi at numparsectrue
 \or
-  \def\SUF at lr@SECSwitch{\filcenter}
+  \def\SUF at SEC@align{\filcenter}
   \suftesi at numparsectrue
 \or
-  \def\SUF at lr@SECSwitch{\filleft}
+  \def\SUF at SEC@align{\filleft}
   \suftesi at numparsectrue
 \fi}
 \define at choicekey{}{subsecstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SUBSECSwitch{\filright}
+  \def\SUF at SUBSEC@align{\filright}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filcenter}
+  \def\SUF at SUBSEC@align{\filcenter}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filleft}
+  \def\SUF at SUBSEC@align{\filleft}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filright}
+  \def\SUF at SUBSEC@align{\filright}
 \suftesi at numparsubsectrue
 \or
-  \def\SUF at lr@SUBSECSwitch{\filcenter}
+  \def\SUF at SUBSEC@align{\filcenter}
 \suftesi at numparsubsectrue
 \or
-  \def\SUF at lr@SUBSECSwitch{\filleft}
+  \def\SUF at SUBSEC@align{\filleft}
 \suftesi at numparsubsectrue
 \fi}
 \define at choicekey{}{subsubsecstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SUBSUBSECSwitch{\filright}
+  \def\SUF at SUBSUBSEC@align{\filright}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filcenter}
+  \def\SUF at SUBSUBSEC@align{\filcenter}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filleft}
+  \def\SUF at SUBSUBSEC@align{\filleft}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filright}
+  \def\SUF at SUBSUBSEC@align{\filright}
 \suftesi at numparsubsubsectrue
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filcenter}
+  \def\SUF at SUBSUBSEC@align{\filcenter}
 \suftesi at numparsubsubsectrue
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filleft}
+  \def\SUF at SUBSUBSEC@align{\filleft}
 \suftesi at numparsubsubsectrue
 \fi}
 %    \end{macrocode}
@@ -2817,79 +2800,67 @@
 \define at choicekey{}{partfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at PART@StyleSwitch{\relax}
+  \def\SUF at PART@font{\relax}
 \or
-  \def\SUF at PART@StyleSwitch{\itshape}
+  \def\SUF at PART@font{\itshape}
 \or
-  \def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at PART@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{chapfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at CHAP@StyleSwitch{\relax}
+  \def\SUF at CHAP@font{\relax}
 \or
-  \def\SUF at CHAP@StyleSwitch{\itshape}
+  \def\SUF at CHAP@font{\itshape}
 \or
-  \def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at CHAP@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{secfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[italic]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SEC@StyleSwitch{\relax}
+  \def\SUF at SEC@font{\relax}
 \or
-  \def\SUF at SEC@StyleSwitch{\itshape}
+  \def\SUF at SEC@font{\itshape}
 \or
-  \def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subsecfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBSEC@StyleSwitch{\relax}
+  \def\SUF at SUBSEC@font{\relax}
 \or
-  \def\SUF at SUBSEC@StyleSwitch{\itshape}
+  \def\SUF at SUBSEC@font{\itshape}
 \or
-  \def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBSEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subsubsecfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBSUBSEC@StyleSwitch{\relax}
+  \def\SUF at SUBSUBSEC@font{\relax}
 \or
-  \def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
+  \def\SUF at SUBSUBSEC@font{\itshape}
 \or
-  \def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBSUBSEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{parfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at PAR@StyleSwitch{\relax}
+  \def\SUF at PAR@font{\relax}
 \or
-  \def\SUF at PAR@StyleSwitch{\itshape}
+  \def\SUF at PAR@font{\itshape}
 \or
-  \def\SUF at PAR@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at PAR@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subparfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBPAR@StyleSwitch{\relax}
+  \def\SUF at SUBPAR@font{\relax}
 \or
-  \def\SUF at SUBPAR@StyleSwitch{\itshape}
+  \def\SUF at SUBPAR@font{\itshape}
 \or
-  \def\SUF at SUBPAR@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBPAR@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \paragraph{Small capitals style}
-%    \begin{macrocode}
-\define at choicekey{}{smallcapsstyle}[\suftesi at val\suftesi at nr]
-    {low,upper}[low]{%
-\ifcase\suftesi at nr\relax
-  \def\suftesi at MakeTextLowercase{\MakeLowercase}
-  \def\suftesi at MakeTextTOCLowercase{\lowercase}
-\or
-  \def\suftesi at MakeTextLowercase{\relax}
-  \def\suftesi at MakeTextTOCLowercase{\relax}
-\fi}
-%    \end{macrocode}
 % \subsubsection{Sections number}
 % \paragraph{Part number style}
 %    \begin{macrocode}
@@ -2923,32 +2894,32 @@
   \def\SUF at thechapter{\arabic{chapter}}
   \def\SUF at HEAD@thechapter{\arabic{chapter}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
+  \def\SUF at CHAP@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thechapter{\textsc{\roman{chapter}}}
   \def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thechapter{\Roman{chapter}}
   \def\SUF at HEAD@thechapter{\Roman{chapter}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at CHAP@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thechapter{\arabic{chapter}}
   \def\SUF at HEAD@thechapter{\arabic{chapter}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
+  \def\SUF at CHAP@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thechapter{\textsc{\roman{chapter}}}
   \def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thechapter{\Roman{chapter}}
   \def\SUF at HEAD@thechapter{\Roman{chapter}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at CHAP@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \paragraph{Section number style}
@@ -2959,32 +2930,32 @@
   \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
   \def\SUF at HEAD@thesection{\arabic{section}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesection{\textsc{\SUF at chapswitch\roman{section}}}
   \def\SUF at HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
   \def\SUF at HEAD@thesection{\Roman{section}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
   \def\SUF at HEAD@thesection{\arabic{section}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesection{\SUF at chapswitch\textsc{\roman{section}}}
   \def\SUF at HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
   \def\SUF at HEAD@thesection{\Roman{section}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \paragraph{Subsection number style}
@@ -2994,27 +2965,27 @@
 \ifcase\suftesi at nr\relax
   \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \paragraph{Sub-subsection number style}
@@ -3024,27 +2995,27 @@
 \ifcase\suftesi at nr\relax
   \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection{Table of contents}
@@ -3069,41 +3040,41 @@
 \define at choicekey{}{compacttoc}[\suftesi at val\suftesi at nr]
     {sec,subsec,subsubsec,par,subpar}[sec]{%
 \ifcase\suftesi at nr\relax
-  \suftesi at toccompactsectrue
-  \suftesi at toccompactsubsectrue
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsectrue
+  \suftesi at ctocsubsectrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\hskip.5em}
   \def\SUF at ssscorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubsectrue
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubsectrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\relax}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\relax}
@@ -3138,13 +3109,7 @@
   \suftesi at twocolumnlottrue
   \setkeys{}{tocstyle=ragged}
 \fi}
-\define at choicekey{}{partialtoc}[\suftesi at val\suftesi at nr]
-{true,false}[true]{%
- \ifcase\suftesi at nr\relax
-   \suftesi at partialtoctrue
- \or
-   \suftesi at partialtocfalse
- \fi}
+\define at boolkey[SUF]{}{partialtoc}[true]{}
 %    \end{macrocode}
 % \paragraph{Table of contents font}
 %    \begin{macrocode}
@@ -3250,9 +3215,9 @@
   \def\SUF at Lheadstyle{\itshape}
   \def\SUF at thepage{\thepage}
 \or
-  \def\SUF at Rheadstyle{\SUF at headingsmallcaps}
-  \def\SUF at Lheadstyle{\SUF at headingsmallcaps}
-  \def\SUF at thepage{\SUF at headingsmallcaps{\thepage}}
+  \def\SUF at Rheadstyle{\SUF at headersmallcaps}
+  \def\SUF at Lheadstyle{\SUF at headersmallcaps}
+  \def\SUF at thepage{\SUF at headersmallcaps{\thepage}}
 \fi}
 %    \end{macrocode}
 % \subsubsection{Text elements}
@@ -3319,13 +3284,7 @@
   \renewcommand\@makefntext{%
     \textsuperscript{\@thefnmark}\hskip.3em}
 \fi}
-\define at choicekey{}{fewfootnotes}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at fewfootnotestrue
-\or
-  \relax
-\fi}
+\define at boolkey[SUF]{}{fewfootnotes}[true]{}
 %    \end{macrocode}
 % \paragraph{Captions}
 %    \begin{macrocode}
@@ -3342,71 +3301,6 @@
   \captionsetup{labelfont=sc}
 \fi}
 %    \end{macrocode}
-% \paragraph{Marginal notes}
-%    \begin{macrocode}
-\define at choicekey{}{marginpar}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-\or   
-  \renewcommand\marginpar[2][]{}
-\fi}
-%    \end{macrocode}
-% \subsubsection{Other options}
-% \paragraph{Part page}
-%    \begin{macrocode}
-\define at choicekey{}{partpage}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at partpagetrue
-\or
-  \relax
-\fi}
-%    \end{macrocode}
-% \paragraph{Draftdate}
-%    \begin{macrocode}
-\define at choicekey{}{draftdate}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at draftdatetrue
-\or
-  \relax
-\fi}
-%    \end{macrocode}
-% \paragraph{View mode}
-%    \begin{macrocode}
-\define at choicekey{}{version}[\suftesi at val\suftesi at nr]
-    {screen,cscreen,draft,final}[draft]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at screentrue
-\or
-  \suftesi at screentrue
-  \suftesi at screencenteredtrue
-\or
-  \relax
-\or
-  \AtBeginDocument{\crop[off]}
-\fi}
-\define at choicekey{}{crop}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-  \ClassWarningNoLine{suftesi}{%
-    'crop' option is deprecated.\MessageBreak
-    Use 'version' option instead}
-\ifcase\suftesi at nr\relax
-  \setkeys{}{version=draft}
-\or
-  \setkeys{}{version=screen}
-\fi}
-%    \end{macrocode}
-% \paragraph{Titlepage}
-%    \begin{macrocode}
-\define at choicekey{}{titlepage}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \@titlepagetrue
-\or
-  \@titlepagefalse
-\fi}
-%    \end{macrocode}
 % \paragraph{Pre-defined styles}
 %    \begin{macrocode}
 \define at choicekey{}{style}[\suftesi at val\suftesi at nr]
@@ -3591,7 +3485,7 @@
   \setkeys{}{
   chapstyle=parright,
   chapfont=smallcaps,
-  tocchapfont=smallcaps,file:///tmp/mozilla_ivan0/luatex85.pdf
+  tocchapfont=smallcaps,
   secfont=smallcaps,
   headerfont=smallcaps}
 \or
@@ -3658,75 +3552,50 @@
 \define at choicekey{}{authortitlealign}[\suftesi at val\suftesi at nr]
     {left,center,right}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@coll at titleSwitch{\filright}
+  \def\SUF at authortitle@align{\filright}
 \or
-  \def\SUF at lr@coll at titleSwitch{\filcenter}
+  \def\SUF at authortitle@align{\filcenter}
 \or
-  \def\SUF at lr@coll at titleSwitch{\filleft}
+  \def\SUF at authortitle@align{\filleft}
 \fi}
-\define at choicekey{}{papertitlestyle}[\suftesi at val\suftesi at nr]
-    {left,center,right}[left]{%
-\ClassWarningNoLine{suftesi}{%
-  'papertitlestyle' option is deprecated.\MessageBreak
-  Use 'authortitlealign' option instead}
-\ifcase\suftesi at nr\relax
-  \def\SUF at lr@coll at titleSwitch{\filright}
-\or
-  \def\SUF at lr@coll at titleSwitch{\filcenter}
-\or
-  \def\SUF at lr@coll at titleSwitch{\filleft}
-\fi}
 \define at choicekey{}{reverseauthortitle}[\suftesi at val\suftesi at nr]
-    {true,false}[false]{%
+    {true,false}[true]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at first{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \def\SUF at second{\SUF at Tfont@style\SUF at Tfont@shape\@title}
+  \def\SUF at first{\SUF at authorstyle\SUF at authorfont\@author}
+  \def\SUF at second{\SUF at titlestyle\SUF at titlefont\@title}
 \or
-  \def\SUF at first{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-  \def\SUF at second{\SUF at Afont@style\SUF at Afont@shape\@author}
+  \def\SUF at first{\SUF at titlestyle\SUF at titlefont\@title}
+  \def\SUF at second{\SUF at authorstyle\SUF at authorfont\@author}
   \relax
 \fi}
-\define at choicekey{}{revauthortitle}[\suftesi at val\suftesi at nr]
-    {true,false}[false]{%
-\ClassWarningNoLine{suftesi}{%
-  'revauthortitle' option is deprecated.\MessageBreak
-  Use 'reverseauthortitle' option instead}
-\ifcase\suftesi at nr\relax
-  \def\SUF at first{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \def\SUF at second{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-\or
-  \def\SUF at first{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-  \def\SUF at second{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \relax
-\fi}
 \define at choicekey{}{maketitlestyle}[\suftesi at val\suftesi at nr]
     {suftesi,standard}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Tfont@style{\SUF at chaptersize\color{sufred}\sffamily}
-  \def\SUF at Afont@style{\small}
+  \def\SUF at titlestyle{\SUF at chaptersize\color{sufred}\sffamily}
+  \def\SUF at authorstyle{\small}
   \def\SUF at datefont{\small}
 \or
-  \def\SUF at Tfont@style{\LARGE}
-  \def\SUF at Afont@style{\large}
+  \def\SUF at titlestyle{\LARGE}
+  \def\SUF at authorstyle{\large}
   \def\SUF at datefont{\small}
 \fi}
 \define at choicekey{}{titlefont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Tfont@shape{\relax}
+  \def\SUF at titlefont{\relax}
 \or
-  \def\SUF at Tfont@shape{\itshape}
+  \def\SUF at titlefont{\itshape}
 \or
-  \def\SUF at Tfont@shape{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at titlefont{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{authorfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Afont@shape{\relax}
+  \def\SUF at authorfont{\relax}
 \or
-  \def\SUF at Afont@shape{\itshape}
+  \def\SUF at authorfont{\itshape}
 \or
-  \def\SUF at Afont@shape{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at authorfont{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{datefont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
@@ -3756,8 +3625,59 @@
   \def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Execute options}
+% \subsubsection{Deprecated options}
 %    \begin{macrocode}
+\define at choicekey{}{documentstructure}[\suftesi at val\suftesi at nr]
+    {book,article,collection}[book]{%
+\ClassWarningNoLine{suftesi}{%
+  'documentstructure' option is deprecated.\MessageBreak
+  Use 'structure' option instead}
+\ifcase\suftesi at nr\relax
+  \setkeys{}{structure=book}
+\or
+  \setkeys{}{structure=article}
+\or
+  \setkeys{}{structure=collection}
+\fi}
+\define at choicekey{}{crop}[\suftesi at val\suftesi at nr]
+    {true,false}[true]{%
+  \ClassWarningNoLine{suftesi}{%
+    'crop' option is deprecated.\MessageBreak
+    Use 'version' option instead}
+\ifcase\suftesi at nr\relax
+  \setkeys{}{version=draft}
+\or
+  \setkeys{}{version=screen}
+\fi}
+\define at choicekey{}{papertitlestyle}[\suftesi at val\suftesi at nr]
+    {left,center,right}[left]{%
+\ClassWarningNoLine{suftesi}{%
+  'papertitlestyle' option is deprecated.\MessageBreak
+  Use 'authortitlealign' option instead}
+\ifcase\suftesi at nr\relax
+  \def\SUF at authortitle@align{\filright}
+\or
+  \def\SUF at authortitle@align{\filcenter}
+\or
+  \def\SUF at authortitle@align{\filleft}
+\fi}
+\define at choicekey{}{revauthortitle}[\suftesi at val\suftesi at nr]
+    {true,false}[true]{%
+\ClassWarningNoLine{suftesi}{%
+  'revauthortitle' option is deprecated.\MessageBreak
+  Use 'reverseauthortitle' option instead}
+\ifcase\suftesi at nr\relax
+  \def\SUF at first{\SUF at authorstyle\SUF at authorfont\@author}
+  \def\SUF at second{\SUF at titlestyle\SUF at titlefont\@title}
+\or
+  \def\SUF at first{\SUF at titlestyle\SUF at titlefont\@title}
+  \def\SUF at second{\SUF at authorstyle\SUF at authorfont\@author}
+  \relax
+\fi}
+%    \end{macrocode}
+% \subsubsection{Options processing}
+%    \begin{macrocode}
+\ProcessOptionsX[SUF]<>\relax
 \ExecuteOptionsX<>{
   structure=book,
   pagelayout=standard,
@@ -3772,7 +3692,6 @@
   quotesize=footnotesize,
   quotestyle=center,
   captionstyle=standard,
-  marginpar=true,
   tocstyle=standard,
   partstyle=left,
   chapstyle=left,
@@ -3806,40 +3725,41 @@
   tocauthorfont=roman,
   reverseauthortitle=false,
   authortitlealign=left}
-\ProcessOptionsX<>\relax
 %    \end{macrocode}
-% The use of the \cmd{XKV at useoption} command, provided by 
-% the \sty{xkeyval}, is a trick to delete the option given as 
-% its argument from the list stored in \cmd{@unusedoptionlist} 
-% so that the option will not produce the ``Unused global options''
-% message:
-%    \begin{macrocode}
-\XKV at useoption{a4paper}
-\XKV at useoption{10pt}      
-\XKV at useoption{11pt}      
-\XKV at useoption{12pt}
-\XKV at useoption{oneside}   
-\XKV at useoption{twoside}
-\XKV at useoption{onecolumn} 
-\XKV at useoption{twocolumn}
-\XKV at useoption{titlepage} 
-\XKV at useoption{notitlepage}
-\XKV at useoption{openright}
-\XKV at useoption{openany}
-\XKV at useoption{leqno}     
-\XKV at useoption{fleqn}
-\XKV at useoption{a5paper}   
-\XKV at useoption{b5paper}
-\XKV at useoption{legalpaper}
-\XKV at useoption{executivepaper}
-\XKV at useoption{landscape}
-%    \end{macrocode}
 % A trick to delete the class options from \cmd{XKV at classoptionslist},
 % in order to avoid incompatibility with packages using options 
-% defined by \sty{suftesi} too. Thanks to Enrico Gregorio!
+% defined by \sty{suftesi} too. Thanks to Enrico Gregorio! (In previous versions
+% this command was placed after the option processing. Move it back if needed.)
 %    \begin{macrocode}
 \def\XKV at classoptionslist{}
+\ProcessOptionsX<>\relax
 %    \end{macrocode}
+% ^^A The use of the \cmd{XKV at useoption} command, provided by 
+% ^^A the \sty{xkeyval}, is a trick to delete the option given as 
+% ^^A its argument from the list stored in \cmd{@unusedoptionlist} 
+% ^^A so that the option will not produce the ``Unused global options''
+% ^^A message:
+% ^^A    \begin{macrocode}
+% ^^A\XKV at useoption{a4paper}
+% ^^A\XKV at useoption{10pt}      
+% ^^A\XKV at useoption{11pt}      
+% ^^A\XKV at useoption{12pt}
+% ^^A\XKV at useoption{oneside}   
+% ^^A\XKV at useoption{twoside}
+% ^^A\XKV at useoption{onecolumn} 
+% ^^A\XKV at useoption{twocolumn}
+% ^^A\XKV at useoption{titlepage} 
+% ^^A\XKV at useoption{notitlepage}
+% ^^A\XKV at useoption{openright}
+% ^^A\XKV at useoption{openany}
+% ^^A\XKV at useoption{leqno}     
+% ^^A\XKV at useoption{fleqn}
+% ^^A\XKV at useoption{a5paper}   
+% ^^A\XKV at useoption{b5paper}
+% ^^A\XKV at useoption{legalpaper}
+% ^^A\XKV at useoption{executivepaper}
+% ^^A\XKV at useoption{landscape}
+% ^^A    \end{macrocode}
 % \subsection{Basic packages}
 %    \begin{macrocode}
 \RequirePackage{multicol}
@@ -3851,7 +3771,6 @@
 \RequirePackage{iftex}
 \ifLuaTeX  
   \RequirePackage{luatex85}
- \else
 \fi
 %    \end{macrocode}
 % The FSPL style requires a verbose colophon which uses specific icons:
@@ -3858,7 +3777,6 @@
 %    \begin{macrocode}
 \ifsuftesi at FSPL
   \RequirePackage{cclicenses}
- \else
 \fi
 %    \end{macrocode}
 % If \opt{version=screen} or \opt{version=cscreen} the \sty{crop} package is not loaded. This can create problems if the \cmd{crop} command has been used in the document, for example to remove the crop marks from a certain page onwards (with \cmd{crop}|[off]|). For this reason, the \cmd{crop} command is defined (in practice it is rendered ineffective) so as not to produce errors if it had been used within the document.
@@ -3911,7 +3829,7 @@
     \suftesi at greekfontfalse  
       \else\suftesi at greekfontfalse\fi     
 \else
-\ifsuftesi at standard
+\ifsuftesi at lmodern
   \RequirePackage{lmodern}
     \ifsuftesi at greekfont
      \ClassWarningNoLine{suftesi}{%
@@ -3925,7 +3843,7 @@
 % Now this combination is provided only 
 % for backward compatibility.
 %    \begin{macrocode}
-  \ifsuftesi at compatibility
+  \ifsuftesi at mathpazo
     \RequirePackage[osf,sc]{mathpazo}
     \RequirePackage[scaled=0.8]{beramono}
     \renewcommand{\sfdefault}{iwona}
@@ -4151,88 +4069,86 @@
   \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \unless\ifPDFTeX
   \DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextTOCLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\SUF at TOCMakeLowercase{#1}}
   \DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
-  \DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\SUF at MakeLowercase{#1}}
+  \DeclareRobustCommand{\SUF at headersmallcaps}[1]{%
+    \addfontfeature{LetterSpace=10}\scshape\SUF at MakeLowercase{#1}}
 \else
   \DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
-    \scshape\suftesi at MakeTextTOCLowercase{\textls*{#1}}}%
+    \scshape\SUF at TOCMakeLowercase{\textls*{#1}}}%
   \DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
-    \scshape\suftesi at MakeTextLowercase{\textls*{#1}}}%
-  \DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
-    \scshape\suftesi at MakeTextLowercase{\textls*{#1}}}%
+    \scshape\SUF at MakeLowercase{\textls*{#1}}}%
+  \DeclareRobustCommand{\SUF at headersmallcaps}[1]{%
+    \scshape\SUF at MakeLowercase{\textls*{#1}}}%
 \fi
 %    \end{macrocode}
 % \subsubsection{Default styles}
 %    \begin{macrocode}
-\newlength\SUF at ADJnumparchap
+\newlength\SUF at chapbeforesep
 \def\SUF at default@CHAPTER{
 \ifsuftesi at numparchap
   \titleformat{\chapter}[display]
-    {\startpartialtoc\SUF at chaptersize\SUF at lr@CHAPSwitch}
+    {\startchappartialtoc\SUF at chaptersize\SUF at CHAP@align}
     {\SUF at thechapter\SUF at dotchap}
     {2ex}
-    {\SUF at CHAP@StyleSwitch}
-    [\printpartialtoc]
+    {\SUF at CHAP@font}
   \else
   \titleformat{\chapter}[hang]
-    {\startpartialtoc\SUF at chaptersize\SUF at lr@CHAPSwitch}
+    {\startchappartialtoc\SUF at chaptersize\SUF at CHAP@align}
     {\SUF at thechapter\SUF at dotchap}
     {3em}
-    {\SUF at CHAP@StyleSwitch}
-    [\printpartialtoc]
+    {\SUF at CHAP@font}
   \fi
 \ifsuftesi at numparchap
-  \setlength{\SUF at ADJnumparchap}{-6ex}
+  \setlength{\SUF at chapbeforesep}{-6ex}
     \else
-  \setlength{\SUF at ADJnumparchap}{0pt}
+  \setlength{\SUF at chapbeforesep}{0pt}
 \fi}
 \def\SUF at default@SECTIONS{
 \ifsuftesi at numparsec
   \titleformat{\section}[display]
-    {\SUF at sectionsize\SUF at lr@SECSwitch}
+    {\startsecpartialtoc\SUF at sectionsize\SUF at SEC@align}
     {\SUF at thesection\SUF at dotsec}
     {0ex}
-    {\SUF at SEC@StyleSwitch}
+    {\SUF at SEC@font}
   \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]   
 \else
   \titleformat{\section}[hang]
-    {\SUF at sectionsize\SUF at lr@SECSwitch}
+    {\startsecpartialtoc\SUF at sectionsize\SUF at SEC@align}
     {\SUF at thesection\SUF at dotsec}
     {1em}
-    {\SUF at SEC@StyleSwitch}
+    {\SUF at SEC@font}
   \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]    
 \fi
 \ifsuftesi at numparsubsec
   \titleformat{\subsection}[display]
-    {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSEC@align}
     {\textnormal\SUF at thesubsection\SUF at dotsubsec}
     {0ex}
-    {\SUF at SUBSEC@StyleSwitch}
+    {\SUF at SUBSEC@font}
   \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
   \titleformat{\subsection}[hang]
-    {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSEC@align}
     {\textnormal\SUF at thesubsection\SUF at dotsubsec}
     {1em}
-    {\SUF at SUBSEC@StyleSwitch}
+    {\SUF at SUBSEC@font}
   \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi at numparsubsubsec
   \titleformat{\subsubsection}[display]
-    {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSUBSEC@align}
     {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
     {0ex}
-    {\SUF at SUBSUBSEC@StyleSwitch}
+    {\SUF at SUBSUBSEC@font}
   \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
 \else
   \titleformat{\subsubsection}[hang]
-    {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSUBSEC@align}
     {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
     {1em}
-    {\SUF at SUBSUBSEC@StyleSwitch}
+    {\SUF at SUBSUBSEC@font}
   \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
   \fi}
 \SUF at default@CHAPTER
@@ -4241,43 +4157,43 @@
 % \subsubsection{Sections spacing}
 %    \begin{macrocode}
 \ifsuftesi at periodical
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at periodicalaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at compact
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at compactaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at supercompact
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at supercompactaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketa
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketb
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketc
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
   \titlespacing*{\chapter}{0em}{%
-     \dimexpr(6ex+\SUF at ADJnumparchap)}{18ex}  
+     \dimexpr(6ex+\SUF at chapbeforesep)}{18ex}  
   \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
         \fi
        \fi
@@ -4313,7 +4229,7 @@
 % \subsection*{The \cmd{part} command}
 %    \begin{macrocode}
 \renewcommand\part{%
-  \ifsuftesi at partpage
+  \ifSUF at partpage
   \if at openright
   \cleardoublepage
   \else
@@ -4327,7 +4243,7 @@
   \else
   \@tempswafalse
   \fi
-  \ifsuftesi at partpage
+  \ifSUF at partpage
   \null\vfil
   \fi
   \secdef\@part\@spart}
@@ -4343,7 +4259,7 @@
     \SUF at tocPART@font#1}%
   \fi
   \markboth{}{}%
-  {\SUF at lr@PARTSwitch\SUF at partsize
+  {\SUF at PART@align\SUF at partsize
     \interlinepenalty \@M
     \ifnum \c at secnumdepth >-2\relax
     \addvspace{4ex}   
@@ -4354,17 +4270,17 @@
     \else
     \hspace{1em}
     \fi
-    \noindent\SUF at PART@StyleSwitch#2\par}%
+    \noindent\SUF at PART@font#2\par}%
   \@endpart}
 \def\@spart#1{%
-  {\SUF at lr@PARTSwitch\SUF at partsize
+  {\SUF at PART@align\SUF at partsize
     \interlinepenalty \@M
     \addvspace{4ex}   
-    \noindent\SUF at PART@StyleSwitch#1\par}%
+    \noindent\SUF at PART@font#1\par}%
   \@endpart}
 \ifsuftesi at article
   \def\@endpart{%
-    \ifsuftesi at partpage
+    \ifSUF at partpage
     \vfil\newpage
     \if at twoside
     \if at openright
@@ -4397,7 +4313,7 @@
   {}
   {\theparagraph}
   {.5em}
-  {\SUF at PAR@StyleSwitch}
+  {\SUF at PAR@font}
   [{.}\hspace*{1em}]
 \titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \titleformat{\subparagraph}[runin]
@@ -4404,7 +4320,7 @@
   {}
   {\thesubparagraph}
   {.5em}
-  {\SUF at SUBPAR@StyleSwitch}
+  {\SUF at SUBPAR@font}
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 %    \end{macrocode}
@@ -4475,488 +4391,89 @@
 {\relax}}
 \fi
 %    \end{macrocode}
-% \subsection{Cover page}
+% \subsubsection{Commands for sections font}
 %    \begin{macrocode}
-\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
-\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
-\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
-\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
-\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
-\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
-\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
-\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
-\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
-\Cauthor{}
-\Ctitle{}
-\Csubtitle{}
-\Ceditor{}
-\Cfoot{}
-\Cpagecolor{gray!30}
-\Ctextcolor{white}
-\Cfootcolor{black}
-\AtBeginDocument{
-\@ifpackageloaded{tikz}{%
-\newcommand\makecover[1][]{%
-\begin{titlepage}
-\begin{tikzpicture}[overlay,remember picture]
-  \draw[draw=none,fill=\@Cpagecolor]
-    (current page.north west) rectangle (current page.south east);
-  \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
-  \draw[draw=none,fill=gray,#1]
-    (c)  circle (.38\paperwidth) ;
-  \node[anchor=center] at (c) (author) {%
-\parbox{.7\paperwidth}{%
-  \centering
-    \ifx\@Cauthor\@empty
-     \else
-       {\scshape\color{\@Ctextcolor}\@Cauthor\\}
-       \vspace*{\baselineskip}
-     \fi
-
-     \ifx\@Ctitle\@empty
-     \else
-     {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
-     \fi
-
-    \ifx\@Csubtitle\@empty
-     \else
-       {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
-     \fi
-
-    \ifx\@Ceditor\@empty
-     \else
-       {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
-     \fi}
-};
-\ifx\@Cfoot\@empty\else
-  \node[xshift=.5\paperwidth,yshift=1cm,
-    align=center,text=\@Cfootcolor,anchor=south]
-  at (current page.south west) {\@Cfoot};
-\fi
-\end{tikzpicture}
-\end{titlepage}
-}
-}
-{\def\makecover{\ClassError{suftesi}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}}}
-}
+\newcommand{\partfont}[1]{\def\SUF at PART@font{#1}}
+\newcommand{\chapfont}[1]{\def\SUF at CHAP@font{#1}}
+\newcommand{\secfont}[1]{\def\SUF at SEC@font{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@font{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@font{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}\partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
+\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
+\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
+\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF at titlestyle{#1}\let\SUF at titlefont\relax}
+\newcommand{\authorfont}[1]{\def\SUF at authorstyle{#1}\let\SUF at authorfont\relax}
+\newcommand{\datefont}[1]{\def\SUF at datefont{#1}}
 %    \end{macrocode}
-% \subsection{Title page}
-% The new \cmd{title} command has an optional argument 
-% which can be used in the headers.
+% \subsubsection{Commands for breaking titles}
+% Two commands for manual breaks active, respectively, only in the table of contents and in the body text. The solution was initially made available by Enrico Gregorio many years ago in one of the first versions of the class (at that time the commands were called \cmd{headbreak} and \cmd{xheadbreak}). Later, while I was working on version 3.0, I noticed an alignment problem in the chapter titles when using the \opt{chapstyle=left} option. So I added the \cmd{breakinbodyleft} command and updated the command names to make them more recognizable. Old names are in any case available for backwards compatibility.
 %    \begin{macrocode}
-\def\isbn#1{\gdef\@isbn{#1}}
-\def\@issn{\@latex at warning@no at line{%
-  No \noexpand\isbn given}}
-\def\doi#1{\gdef\@doi{#1}}
-\def\@doi{\@latex at warning@no at line{%
-  No \noexpand\doi given}}
-\def\isbn#1{\gdef\@issn{#1}}
-\def\@issn{\@latex at warning@no at line{%
-  No \noexpand\isbn given}}
-\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
-\edef\title{\noexpand\@dblarg
-  \expandafter\noexpand\csname\string\title\endcsname}
-\def\@headtitle{--missing title--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given \MessageBreak%
-            See the class documentation for explanation}}
-\def\@title{--missing title--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given\MessageBreak%
-            See the class documentation for explanation}}
-\def\@author{--missing author--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\author\space given\MessageBreak%
-            See the class documentation for explanation}}
-\if at titlepage
-  \renewcommand\maketitle{%
-  \begin{titlepage}
-    \let\footnotesize\small
-    \let\footnoterule\relax
-    \let \footnote \thanks
-    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-    \null\vfil
-    \vskip 60\p@
-    \begin{center}%
-      {\SUF at first\par}%
-      \vskip 3em%
-      {\lineskip .75em%
-        \begin{tabular}[t]{c}%
-          \SUF at second
-        \end{tabular}\par}%
-        \vskip 1.5em%
-      {\SUF at datefont\@date\par}%       
-    \end{center}\par
-    \@thanks
-    \vfil\null
-  \end{titlepage}%
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\@date\@empty
-  \global\let\date\relax
-  \global\let\and\relax}
-\else
-\renewcommand\maketitle{\par
-   \begingroup
-     \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-     \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-     \long\def\@makefntext##1{\parindent 1em\noindent
-             \hb at xt@1.8em{%
-                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-     \if at twocolumn
-       \ifnum \col at number=\@ne
-         \@maketitle
-       \else
-         \twocolumn[\@maketitle]%
-       \fi
-     \else
-       \newpage
-       \global\@topnum\z@% Prevents figures from going at top of page.
-       \@maketitle
-     \fi
-     \thispagestyle{plain}\@thanks
-   \endgroup
-   \setcounter{footnote}{0}%
-   \global\let\thanks\relax
-   \global\let\maketitle\relax
-   \global\let\@maketitle\relax
-   \global\let\@thanks\@empty
-   \global\let\@date\@empty
-   \global\let\date\relax
-   \global\let\and\relax}
-\def\@maketitle{%
-   \newpage
-   \null
-   \vskip 2em%
-   \begin{center}%
-   \let \footnote \thanks
-     {\SUF at first\par}%
-     \vskip 1.5em%
-     {\lineskip .5em%
-       \begin{tabular}[t]{c}%
-        \SUF at second\par
-       \end{tabular}\par}%
-     \vskip 1em%
-     {\SUF at datefont\@date\par}%
-   \end{center}%
-   \par
-   \vskip 1.5em}
-\fi
+\newif\ifbreakintoc\breakintocfalse
+\newif\ifbreakinbody\breakinbodytrue
+\DeclareRobustCommand{\breakintoc}
+   {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\breakinbody}
+  {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\breakinbodyleft}
+  {\ifbreakinbody\newline\else\fi}
+\let\origtableofcontents\tableofcontents
+\renewcommand{\tableofcontents}{%
+  \begingroup
+    \breakintoctrue\breakinbodyfalse%
+      \origtableofcontents
+  \endgroup}
+\DeclareRobustCommand{\headbreak}
+  {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+  {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+  {\ifbreakinbody\newline\else\fi}
 %    \end{macrocode}
-% \subsection{The \opt{collection} structure}
+% \subsubsection{Abstract}
 %    \begin{macrocode}
 \ifsuftesi at collection
-\newcounter{journalnumber}
-\newcounter{journalvolume}
-\newcounter{issue}
-\newcounter{title}
-\setcounter{title}{1}
-\newcounter{article}
-\setcounter{article}{0}
-\setcounter{journalnumber}{0}
-\setcounter{tocdepth}{0}
-\def\journalname#1{\gdef\@journalname{#1}}
-  \def\@journalname{\@latex at warning@no at line{%
-    No \noexpand\journalname given}}
-\def\journalvolume#1{\gdef\@journalvolume{#1}}
-  \def\@journalvolume{\@latex at warning@no at line{%
-    No \noexpand\journalvolume given}}
-\def\journalnumber#1{\gdef\@journalnumber{#1}}
-  \def\@journalnumber{\@latex at warning@no at line{%
-    No \noexpand\journalnumber given}}
-\def\issue#1{\gdef\@issue{#1}}
-  \def\@issue{\@latex at warning@no at line{%
-    No \noexpand\issue given}}
-\def\journalyear#1{\gdef\@journalyear{#1}}
-  \def\@journalyear{\@latex at warning@no at line{%
-    No \noexpand\journalyear given}}
-\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
-  \def\@journalwebsite{\@latex at warning@no at line{%
-    No \noexpand\journalwebsite given}}
-\def\thanks#1{\footnotemark\ \protected at xdef\@thanks{%
-  \@thanks\protect\footnotetext[\the\c at footnote]{#1}}}
-\def\fulljournal{\emph{\@journalname} \@journalnumber, %
-  \@issue{} \@journalyear}
-\def\issuename#1{\gdef\@issuename{#1}}
-\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
-  \def\@collectiontitle{\@latex at warning@no at line{%
-    No \noexpand\collectiontitle given}}
-\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
-  \def\@collectioneditor{\@latex at warning@no at line{%
-    No \noexpand\collectioneditor given}}
-\renewcommand*{\title}[2][]{%
-  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
-    \edef\title{\noexpand\@dblarg
-  \expandafter\noexpand\csname\string\title\endcsname}
-    \def\@headtitle{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given \MessageBreak%
-            See the class documentation for explanation}}
-    \def\@title{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given\MessageBreak%
-            See the class documentation for explanation}}
-    \def\@author{--missing author--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\author\space given\MessageBreak%
-            See the class documentation for explanation}}
-\newcommand*\l at title[2]{%
-  \ifnum \c at tocdepth >\m at ne
-    \addpenalty{-\@highpenalty}%
-    \vskip 1.0ex \@plus\p@
-    \begingroup
-      \parindent \z@ \rightskip \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \advance\leftskip1em
-      \hskip -\leftskip
-      #1\nobreak%
-    \ifsuftesi at dottedtoc\dotfill%
-      \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
-        \else
-          \ifsuftesi at raggedtoc%
-            \nobreak\hskip1em #2 \hfill\null\par
-              \else
-                \ifsuftesi at pagelefttoc
-              \ClassError{suftesi}
-                {\MessageBreak
-                You can not use tocstyle=leftpage\MessageBreak
-                  with structure=collection}
-                {You can not use tocstyle=leftpage\MessageBreak
-                  with structure=collection}
-            \else
-          \nobreak\hfill #2\par
-        \fi
-      \fi
-    \fi
-      \penalty\@highpenalty
-    \endgroup
-  \fi}
-\renewcommand\maketitle{\par
-  \begingroup
-    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-    \long\def\@makefntext##1{\parindent 1em\noindent
-            \hb at xt@1.8em{%
-                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-    \if at twocolumn
-      \ifnum \col at number=\@ne
-        \@maketitle
+  \newenvironment{abstract}{%
+      \if at twocolumn
+        \section*{\abstractname}%
       \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
-      \newpage
-      \global\@topnum\z@ % Prevents figures from going at top of page.
-      \@maketitle
-    \fi
-    \thispagestyle{plain}\@thanks%
-  \endgroup
-   \setcounter{section}{0}%
-%  \setcounter{footnote}{0}%
-%  \global\let\thanks\relax
-%  \global\let\maketitle\relax
-%  \global\let\@maketitle\relax
-%  \global\let\@thanks\@empty
-%  \global\let\@author\@empty
-%  \global\let\@date\@empty
-%  \global\let\@title\@empty
-%  \global\let\title\relax
-%  \global\let\author\relax
-%  \global\let\date\relax
-   \global\let\and\relax
-   \let\thanks\@gobble}
-\AtBeginDocument{\def\@maketitle{%
-  \refstepcounter{article}
-  \SUF at chaptersize
-   \SUF at lr@coll at titleSwitch
-    \let\footnote\thanks
-     \parindent=0pt
-    {\SUF at second}%
-   \label{begin:\thearticle}
-%    \end{macrocode}
-% Check if you don't use \sty{hyperrref} provided by Enrico Gregorio
-% (\url{https://tex.stackexchange.com/a/427203/231952}):
-%    \begin{macrocode}
-   \@ifundefined{Hy at raisedlink}{\let\texorpdfstring\@firstoftwo}{%
-    \xdef\@currentHref{title.\thearticle}%
-     \Hy at raisedlink{\hyper at anchorstart{\@currentHref}\hyper at anchorend}%
-    }%  
-%    \end{macrocode}
-%    \begin{macrocode}
-   \csname toc at entry@\endcsname
-    \begingroup%
-    \let\thanks\@gobble
-    \addcontentsline{toc}{title}{%
-    {\SUF at tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
-    {\SUF at tocTIT@font{\@headtitle}}}
-    \endgroup%
-    \par\nobreak\vspace{2ex}
-    {\SUF at first%
-    \vskip1.5cm}}%
-    }
-% \newenvironment{article}
-%  {\begingroup
-%  \global\let\@thanks\@empty
-%  \setcounter{footnote}{0}
-%  \refstepcounter{article}
-%  \label{begin:\thearticle}
-%}
-%  {\label{end:\thearticle}\endgroup
-%  }
-\newenvironment{article}
-  {\begingroup
-  \setcounter{section}{0}
-  \setcounter{footnote}{0}
-  \setcounter{figure}{0}
-  \setcounter{table}{0}}
-  {\label{end:\thearticle}
-    \cleardoublepage
-      \global\let\@thanks\@empty
-    \endgroup}
-\newcommand{\collectiontitlepage}{%
-  \thispagestyle{empty}%
-    \begingroup
-     \centering
-       \vspace*{\stretch{1}}
-     
-       {\SUF at chaptersize\@collectiontitle\par}
-         \vskip5ex
-     
-       \@collectioneditor
-       \vspace*{\stretch{3}}
-            
-    \endgroup
-  \clearpage}
-\def\frontispiece{\collectiontitlepage}
-%    \end{macrocode}
-% In the collection document structure the articles are treated as
-% chapters but you would not need to print in
-% the table of contents all the sections of every article. So first of 
-% all we include in the table of contents only the author and the 
-% title of each paper. Anyway the sections inside each paper are 
-% numbered as in standard articles:
-%    \begin{macrocode}
-  \setcounter{tocdepth}{0}
-  \renewcommand\thesection{%
-          \@arabic\c at section}
-  \renewcommand\thesubsection{%
-          \thesection.\@arabic\c at subsection}
-  \renewcommand\thesubsubsection{%
-          \thesubsection.\@arabic\c at subsubsection}
-  \renewcommand\theparagraph{%
-          \thesubsubsection.\@arabic\c at paragraph}
-  \renewcommand\thesubparagraph{%
-          \theparagraph.\@arabic\c at subparagraph}
-  \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if at twocolumn\else\endquotation\fi\vspace{6ex}}
+\else
+\ifSUF at titlepage
+  \newenvironment{abstract}{%
+      \titlepage
+      \null\vfil
+      \@beginparpenalty\@lowpenalty
+      \begin{center}%
+         \abstractname
+        \@endparpenalty\@M
+      \end{center}}%
+     {\par\vfil\null\endtitlepage}
+\else
+  \newenvironment{abstract}{%
+      \if at twocolumn
+        \section*{\abstractname}%
+      \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if at twocolumn\else\endquotation\fi}
+  \fi
 \fi
+\newcommand\abstractname{Abstract}
 %    \end{macrocode}
-% \subsection{Frontispiece}
+% \subsubsection{Appendices}
 %    \begin{macrocode}
-\AtBeginDocument{%
-\@ifpackagewith{frontespizio}{suftesi}{%
-\ifsuftesi at periodical
-  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at periodicalaureo
-  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at compact
-  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at compactaureo
-  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at supercompact
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at supercompactaureo
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketa
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketb
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketc
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\@ifpackageloaded{frontespizio}{%
-\ifsuftesi at periodical
-  \Margini {1cm}{7cm}{5cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at periodicalaureo
-  \Margini {1cm}{7cm}{5cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at compact
-  \Margini {1cm}{7cm}{6cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at compactaureo
-  \Margini {1cm}{7cm}{6cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at supercompact
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at supercompactaureo
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketa
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketb
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketc
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\relax}}}
-%    \end{macrocode}
-% \subsection{Index}
-%    \begin{macrocode}
-\renewenvironment{theindex}
-  {\if at twocolumn
-     \@restonecolfalse
-   \else
-     \@restonecoltrue
-   \fi
-   \ifsuftesi at article
-   \twocolumn[\section*{\indexname}]%
-   \else
-   \twocolumn[\@makeschapterhead{\indexname}]%
-   \fi
-   \@mkboth{\indexname}{\indexname}%
-   \thispagestyle{plain}%
-   \raggedright%
-   \parindent\z@
-   \parskip\z@ \@plus .3\p@\relax
-   \columnseprule \z@
-   \columnsep 35\p@
-   \let\item\@idxitem}
-  {\if at restonecol\onecolumn\else\clearpage\fi}
-%    \end{macrocode}
-% \subsection{Appendices}
-%    \begin{macrocode}
 \RequirePackage{appendix}
 \noappendicestocpagenum
 %  Bug using defaultfont=none,libertine,standard,compatibility
@@ -4981,7 +4498,7 @@
     \interlinepenalty \@M
     \normalfont
     \SUF at chaptersize
-        \SUF at CHAP@StyleSwitch\expandafter\appendixpagename\par}%
+        \SUF at CHAP@font\expandafter\appendixpagename\par}%
   \if at dotoc@pp
   \addappheadtotoc
   \fi
@@ -5004,7 +4521,7 @@
     \interlinepenalty \@M
     \normalfont
     \SUF at chaptersize
-        \SUF at CHAP@StyleSwitch\expandafter\appendixpagename%
+        \SUF at CHAP@font\expandafter\appendixpagename%
     \markboth{}{}\par}%
   \if at dotoc@pp
   \addappheadtotoc
@@ -5018,7 +4535,7 @@
 % this label is passed as an argument to \cmd{@Roman} or \cmd{@roman}, 
 % which however accepts only integers. For this reason we must redefine 
 % all the occurrences of \cmd{titlecontents} in order to have \cmd{thecontentslabel} 
-% in place of \cmd{SUF at CHAP@thecontentslabel} or \cmd{SUF at SEC@thecontentslabel}.
+% in place of \cmd{SUF at CHAP@contentslabel} or \cmd{SUF at SEC@contentslabel}.
 %    \begin{macrocode}
 \def\suf at appendixtoc{%
   \ifsuftesi at pagelefttoc
@@ -5036,7 +4553,7 @@
     \hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
   {}
   [\addvspace{1ex}]
-  \ifsuftesi at toccompactsec
+  \ifsuftesi at ctocsec
   \titlecontents*{section}[\SUF at tochang@chap]{}{%
     \thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{, 
     \thecontentspage.}[][\adjtocpagesep][]
@@ -5068,7 +4585,7 @@
     \SUF at tocCHAP@font}
   {\SUF at chaptitlerule\contentspage}
   [\addvspace{1ex}]
-  \ifsuftesi at toccompactsec
+  \ifsuftesi at ctocsec
   \titlecontents*{section}[\SUF at tocindent@chap]{}{%
     \thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{, 
     \thecontentspage.}[][\adjtocpagesep][]
@@ -5106,290 +4623,29 @@
   \renewcommand{\thechapter}{\@Alph\c at chapter}}
 \fi
 %    \end{macrocode}
-% \subsection{Headings}
+% \subsubsection{Index}
 %    \begin{macrocode}
-\RequirePackage{fancyhdr}
-\newcommand{\versionstring}[1]{\def\version at string{#1}}
-  \versionstring{Version of}
-\AtBeginDocument{%
- \pagestyle{fancy}
-  \renewcommand{\headrulewidth}{0pt} 
-  \renewcommand{\footnoterule}{}
-\def\SUF at versionstring{\texttt{\version at string{} \today}}
+\renewenvironment{theindex}
+  {\if at twocolumn
+     \@restonecolfalse
+   \else
+     \@restonecoltrue
+   \fi
+   \ifsuftesi at article
+   \twocolumn[\section*{\indexname}]%
+   \else
+   \twocolumn[\@makeschapterhead{\indexname}]%
+   \fi
+   \@mkboth{\indexname}{\indexname}%
+   \thispagestyle{plain}%
+   \raggedright%
+   \parindent\z@
+   \parskip\z@ \@plus .3\p@\relax
+   \columnseprule \z@
+   \columnsep 35\p@
+   \let\item\@idxitem}
+  {\if at restonecol\onecolumn\else\clearpage\fi}
 %    \end{macrocode}
-% \paragraph{The \opt{default} headers}
-%    \begin{macrocode}
-\renewcommand{\chaptermark}[1]{%
-  \markboth{\chaptertitlename\ \protect\SUF at HEAD@thechapter}{#1}}
-  \ifsuftesi at article
-    \renewcommand{\sectionmark}[1]{\markright{\protect\SUF at HEAD@thesection.\ #1}}
-      \else
-    \renewcommand{\sectionmark}[1]{}
-  \fi
-%    \end{macrocode}
-% \paragraph{The \opt{plain} style}
-%    \begin{macrocode}
-\fancypagestyle{plain}{\fancyhf{}}
-%    \end{macrocode}
-% \paragraph{The \opt{sufplain} style}
-%    \begin{macrocode}
-\fancypagestyle{sufplain}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{%
-   \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
- \fancyfoot[C]{\footnotesize\SUF at thepage}}
-%    \end{macrocode}
-% \paragraph{The \opt{centerheader} style}
-%    \begin{macrocode}
-\fancypagestyle{centerheader}{%
-  \fancyhf{}%
-  \fancyfoot[RE,LO]{%
-    \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
-  \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark} 
-  \fancyhead[CE]{\footnotesize\breakinbodyfalse%
-    \SUF at LR@MarkSwitch} 
-  \fancyfoot[C]{\footnotesize\SUF at thepage}}
-%    \end{macrocode}
-% \paragraph{The \opt{sufdefault} style}
-%    \begin{macrocode}
-\fancypagestyle{sufdefault}{%
-  \fancyhf{}%
-  \fancyfoot[RE,LO]{%
-    \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
-  \fancyhead[LE,RO]{\footnotesize\SUF at thepage} 
-  \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
-  \fancyhead[RE]{\footnotesize\breakinbodyfalse%
-    \SUF at LR@MarkSwitch}}
-\ifsuftesi at article
-  \ifsuftesi at authortitle
-    \def\SUF at LR@MarkSwitch{\SUF at leftmark}
-  \else
-    \def\SUF at LR@MarkSwitch{\SUF at rightmark}
-  \fi
-\else
-  \def\SUF at LR@MarkSwitch{\SUF at leftmark}
-\fi
-\def\SUF at leftrightmark{%
-  \if at mainmatter\leftmark\else\rightmark\fi} 
-\pagestyle{sufdefault}
-  \ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
-  \ifsuftesi at sufplain\pagestyle{sufplain}\else\fi}
-%    \end{macrocode}
-% \subsection{Text elements}
-% \paragraph{Block Quotations}
-% New environments for block quotations according to a popular Italian style. 
-% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
-%    \begin{macrocode}
-\renewenvironment{quotation}
-  {\list{}{\listparindent\parindent%
-    \itemindent    \listparindent
-    \SUF at quote@style      
-    \parsep    \z@ \@plus\p@}%
-    \item\relax%
-    \SUF at quotation@size%
-    \noindent\ignorespaces}
-  {\endlist}
-\renewenvironment{quote}
-  {\list{}{%
-    \SUF at quote@style}%
-    \item\relax%
-    \SUF at quotation@size}% \ignorespaces?
-  {\endlist}
-\renewenvironment{verse}
-  {\let\\\@centercr
-    \list{}{\itemsep      \z@
-      \itemindent   -1.5em%
-      \listparindent\itemindent
-      \rightmargin  \leftmargin
-      \advance\leftmargin 1.5em}%
-    \item\relax
-    \SUF at quotation@size}
-  {\endlist}  
-%    \end{macrocode}
-% \paragraph{The \opt{fewfootnotes} option}
-% Enable only with three footnotes per page maximum.
-%    \begin{macrocode}
-\ifsuftesi at fewfootnotes
-\AtBeginDocument{%
-\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
-  \ClassError{suftesi}%
-  {Too many footnotes\MessageBreak
-  Remove the class option 'fewfootnote'}
-  {Too many footnotes\MessageBreak
-  Remove the class option 'fewfootnote'}
-  \else\@ctrerr\fi}}}
-\def\thefootnote{\@fnsymbol\c at footnote}%
-\else\fi
-%    \end{macrocode}
-% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
-% symbol give in the first argument.
-%    \begin{macrocode}
-\newcommand*\xfootnote[1][*]{%
-  \xdef\@thefnmark{#1}%
-    \@footnotemark\@footnotetext}
-%    \end{macrocode}
-% \paragraph{Marginal notes}
-% The |\marginpar| command is redefined according to the look 
-% of \emph{Classic Thesis} by 
-% André \textcite{Miede:2011}\index{Miede, André}. 
-%    \begin{macrocode}
-\def\SUF at mpsetup{%
-  \itshape
-    \footnotesize%
-    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
-    \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
-    \doublehyphendemerits=100000%
-    \finalhyphendemerits=\doublehyphendemerits}
-  \let\oldmarginpar\marginpar
-  \renewcommand{\marginpar}[1]{\oldmarginpar%
-     [\SUF at mpsetup\raggedleft\hspace{0pt}{#1}]%
-     {\SUF at mpsetup\raggedright\hspace{0pt}{#1}}}
-%    \end{macrocode}
-% Redefine an internal command of the \sty{todonotes} package in 
-% order to use the class-specific marginal notes when this 
-% package is loaded. This redefinition simply substitute 
-% \cmd{oldmarginpar} to \cmd{marginpar}:
-%    \begin{macrocode}
-\AtBeginDocument{%
-\@ifpackageloaded{todonotes}{%
-  \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
-    \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
-      \node [coordinate] (inText) {};%
-    \end{tikzpicture}%
-      \oldmarginpar[{% Draw note in left margin
-      \@todonotes at drawMarginNote%
-      \@todonotes at drawLineToLeftMargin%
-      }]{% Draw note in right margin
-      \@todonotes at drawMarginNote%
-      \@todonotes at drawLineToRightMargin%
-      }
-    }
-  }
-{\relax}}
-%    \end{macrocode}
-% \paragraph{Abstract}
-%    \begin{macrocode}
-\ifsuftesi at collection
-  \newenvironment{abstract}{%
-      \if at twocolumn
-        \section*{\abstractname}%
-      \else
-        \small
-        \begin{center}%
-          {\abstractname\vspace{-.5em}\vspace{\z@}}%
-        \end{center}%
-        \quotation
-      \fi}
-      {\if at twocolumn\else\endquotation\fi\vspace{6ex}}
-\else
-\if at titlepage
-  \newenvironment{abstract}{%
-      \titlepage
-      \null\vfil
-      \@beginparpenalty\@lowpenalty
-      \begin{center}%
-         \abstractname
-        \@endparpenalty\@M
-      \end{center}}%
-     {\par\vfil\null\endtitlepage}
-\else
-  \newenvironment{abstract}{%
-      \if at twocolumn
-        \section*{\abstractname}%
-      \else
-        \small
-        \begin{center}%
-          {\abstractname\vspace{-.5em}\vspace{\z@}}%
-        \end{center}%
-        \quotation
-      \fi}
-      {\if at twocolumn\else\endquotation\fi}
-  \fi
-\fi
-\newcommand\abstractname{Abstract}
-%    \end{macrocode}
-% \paragraph{Colophon or copyright notice} 
-%    \begin{macrocode}
-\newcommand{\colophon}[3][]{%
-  \thispagestyle{empty}
-  \null
-    \vfill
-     \def\next{#2}
-         \ifx\next\@empty\else
-            \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          Tutti i diritti riservati
-        \fi
-  \vfill  
-  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
-     \def\next{#1}
-        \ifx\next\@empty\else su #1 
-      \fi usando la classe \textsf{suftesi} di 
-      Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
-      \cleardoublepage}
-\newcommand{\bookcolophon}[2]{%
-  \thispagestyle{empty}
-  \null
-    \vfill
-            \noindent #1
-  \vfill  
-  {\small\noindent #2\par}
-      \cleardoublepage}
-\newcommand{\artcolophon}[1]{%
-\thispagestyle{empty}
-  \null
-    \vfill
-  {\small\noindent #1\par}}
-\newcommand{\finalcolophon}[1]{%
-\thispagestyle{empty}
-  \null\vspace*{\stretch{1}}
-  \begin{center}
-  \begin{minipage}{.5\textwidth}
-  \centering\small #1
-  \end{minipage}
-  \end{center}
-    \vspace*{\stretch{6}}}
-%    \end{macrocode}
-% \paragraph{The \cmd{FSPL} colophon}
-% This command is defined only for the \opt{style=FSPL*} options.
-%    \begin{macrocode}
-\ifsuftesi at FSPL
-\newcommand{\FSPLcolophon}[1][\the\year]{%
-\begingroup
-\thispagestyle{empty}
-\null\vspace{\stretch{1}}
-\noindent \hskip-.5em\cc #1 \@author%
-\vskip1ex
-
-\small\noindent This work is licensed under the Creative Commons 
-Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
-To view a copy of this license, 
-visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
-
-\endgroup
-
-\begingroup
-\footnotesize
-
-\null\vspace{\stretch{1}}
-
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
-\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
-Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
-is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by 
-Janusz M.~Nowacki.
-
-\endgroup
-
-\clearpage}
-\else
-\def\FSPLcolophon{%
- \ClassError{suftesi}
-   {\noexpand\FSPLcolophon is defined\MessageBreak 
-     only for the FSPL styles}
-   {\noexpand\FSPLcolophon is defined\MessageBreak 
-     only for the FSPL styles}}
-\fi
-%    \end{macrocode}
 % \subsection{Contents lists}
 %    \begin{macrocode}
 \RequirePackage{titletoc}
@@ -5465,7 +4721,7 @@
 %  [0em]
 %  {\addvspace{3ex}}
 %  {\partname\hspace*{.5em}\makebox[\SUF at label@part][l]{%
-%    \SUF at PART@thecontentslabel}\hspace*{1em}\SUF at tocPART@font}
+%    \SUF at PART@contentslabel}\hspace*{1em}\SUF at tocPART@font}
 %  {\SUF at tocPART@font}
 %  {}
 %  [\addvspace{1ex}]
@@ -5534,7 +4790,7 @@
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF at addto@tochang at chap%
       \makebox[\SUF at label@chap][l]{%
-        \SUF at CHAP@thecontentslabel}\hspace*{1em}%
+        \SUF at CHAP@contentslabel}\hspace*{1em}%
           \SUF at tocCHAP@font}
   {\hskip-\SUF at tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
@@ -5541,9 +4797,9 @@
        \hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
   {}
   [\addvspace{1ex}]
-\ifsuftesi at toccompactsec
+\ifsuftesi at ctocsec
 \titlecontents*{section}[\SUF at tochang@chap]{}{%
-  \SUF at SEC@thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{, 
+  \SUF at SEC@contentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{, 
   \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{section}
@@ -5554,7 +4810,7 @@
 %     \makebox[\SUF at label@sec][l]{%
 %     \ifsuftesi at article\SUF at toclabelnum%
 %      \else\fi\thecontentslabel}\hspace*{1em}%
-    \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@sec][l]{\SUF at SEC@contentslabel}\hspace*{1em}%
        \SUF at tocSEC@font}
   {\hskip-\SUF at tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
@@ -5561,9 +4817,9 @@
      \SUF at tocSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactsubsec
+\ifsuftesi at ctocsubsec
 \titlecontents*{subsection}[\SUF at tochang@sec]{\SUF at sscorrect}{%
-  \SUF at SUBSEC@thecontentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}{\SUF at tocSUBSEC@font}{, 
+  \SUF at SUBSEC@contentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}{\SUF at tocSUBSEC@font}{, 
   \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{subsection}
@@ -5571,7 +4827,7 @@
   {}
   {\hskip-\SUF at tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
-    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSEC@font}
   {\hskip-\SUF at tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
@@ -5578,9 +4834,9 @@
      \SUF at tocSUBSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactsubsubsec
+\ifsuftesi at ctocsubsubsec
 \titlecontents*{subsubsection}[\SUF at tochang@subsec]{\SUF at ssscorrect}{%
-  \SUF at SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF at SUBSUBSEC@contentslabel\adjtoclabelsep%
   \SUF at tocSUBSUBSEC@font}{\SUF at tocSUBSUBSEC@font}{, 
   \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5589,7 +4845,7 @@
   {}
   {\hskip-\SUF at tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
-    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSUBSEC@font}
   {\hskip-\SUF at tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
@@ -5596,9 +4852,9 @@
      \SUF at tocSUBSUBSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactpar
+\ifsuftesi at ctocpar
 \titlecontents*{paragraph}[\SUF at tochang@subsubsec]{\SUF at pcorrect}{%
- \SUF at PAR@thecontentslabel\adjtoclabelsep%
+ \SUF at PAR@contentslabel\adjtoclabelsep%
  \SUF at tocPAR@font}{\SUF at tocPAR@font}{, 
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5614,9 +4870,9 @@
    \SUF at tocPAR@font}
 {}
 \fi
-\ifsuftesi at toccompactsubpar
+\ifsuftesi at ctocsubpar
 \titlecontents*{subparagraph}[\SUF at tochang@par]{\SUF at pcorrect}{%
- \SUF at SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF at SUBPAR@contentslabel\adjtoclabelsep%
  \SUF at tocSUBPAR@font}{\SUF at tocSUBPAR@font}{, 
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5701,7 +4957,7 @@
   [\SUF at tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF at tocindent@chap%
-    \makebox[\SUF at label@chap][l]{\SUF at CHAP@thecontentslabel}%
+    \makebox[\SUF at label@chap][l]{\SUF at CHAP@contentslabel}%
     \hspace*{1em}%
       \SUF at tocCHAP@font}
   {\hskip-\SUF at tocindent@chap%
@@ -5708,9 +4964,9 @@
       \SUF at tocCHAP@font}
   {\SUF at chaptitlerule\contentspage}
   [\addvspace{1ex}]
-\ifsuftesi at toccompactsec
+\ifsuftesi at ctocsec
 \titlecontents*{section}[\SUF at tocindent@chap]{}{%
-  \SUF at SEC@thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}
+  \SUF at SEC@contentslabel\adjtoclabelsep\SUF at tocSEC@font}
   {\SUF at tocSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{section}
@@ -5720,7 +4976,7 @@
 %     \makebox[\SUF at label@sec][l]{%
 %     \ifsuftesi at article\SUF at toclabelnum%
 %       \else\fi\thecontentslabel}\hspace*{1em}%
-    \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@sec][l]{\SUF at SEC@contentslabel}\hspace*{1em}%
         \SUF at tocSEC@font}
   {\hskip-\dimexpr(\SUF at label@sec+1em)%
     \SUF at tocSEC@font}
@@ -5727,9 +4983,9 @@
   {\ifsuftesi at article\SUF at chaptitlerule%
        \else\SUF at titlerule\fi\contentspage}
 \fi
-\ifsuftesi at toccompactsubsec
+\ifsuftesi at ctocsubsec
 \titlecontents*{subsection}[\SUF at tocindent@sec]{\SUF at sscorrect}{%
-  \SUF at SUBSEC@thecontentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}
+  \SUF at SUBSEC@contentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}
   {\SUF at tocSUBSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{subsection}
@@ -5736,15 +4992,15 @@
   [\SUF at tocindent@subsec]
   {}
   {\hskip-\dimexpr(\SUF at label@subsec+1em)%
-    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSEC@font}
   {\hskip-\dimexpr(\SUF at label@subsec+1em)%
     \SUF at tocSUBSEC@font}
   {\SUF at titlerule\contentspage}
 \fi  
-\ifsuftesi at toccompactsubsubsec
+\ifsuftesi at ctocsubsubsec
 \titlecontents*{subsubsection}[\SUF at tocindent@subsec]{\SUF at ssscorrect}{%
-  \SUF at SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF at SUBSUBSEC@contentslabel\adjtoclabelsep%
   \SUF at tocSUBSUBSEC@font}{\SUF at tocSUBSUBSEC@font}{, 
   \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5752,15 +5008,15 @@
   [\SUF at tocindent@subsubsec]
   {}
   {\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
-    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSUBSEC@font}
   {\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
     \SUF at tocSUBSUBSEC@font}
   {\SUF at titlerule\contentspage}
 \fi
-\ifsuftesi at toccompactpar
+\ifsuftesi at ctocpar
 \titlecontents*{paragraph}[\SUF at tocindent@subsubsec]{\SUF at pcorrect}{%
- \SUF at PAR@thecontentslabel\adjtoclabelsep%
+ \SUF at PAR@contentslabel\adjtoclabelsep%
  \SUF at tocPAR@font}{\SUF at tocPAR@font}{, 
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5774,9 +5030,9 @@
      \SUF at tocPAR@font}
   {\SUF at titlerule\contentspage}
 \fi
-\ifsuftesi at toccompactsubpar
+\ifsuftesi at ctocsubpar
 \titlecontents*{subparagraph}[\SUF at tocindent@par]{\SUF at pcorrect}{%
- \SUF at SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF at SUBPAR@contentslabel\adjtoclabelsep%
  \SUF at tocSUBPAR@font}{\SUF at tocSUBPAR@font}{, 
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -5808,34 +5064,57 @@
 %    \end{macrocode}
 % \subparagraph{partial ToC}
 %    \begin{macrocode}
-\titlecontents*{partialtocsection}[0cm]{}{%
- \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
- {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
- {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
- {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
- \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
- {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
- \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
- {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\newcommand{\startpartialtoc}{%
- \ifsuftesi at partialtoc\startcontents\fi}
-\newcommand{\printpartialtoc}{%
- \ifsuftesi at partialtoc
-  \setcounter{tocdepth}{5}
-   \contentsmargin{0cm}
-    \@partialtocsize
-     \@partialtocbeforespace
-      \@partialtocbeforecode\par
-       \printcontents{partialtoc}{1}{}
-      \par\@partialtocaftercode
-    \@partialtocafterspace
- \fi}
+\ifSUF at partialtoc
+  \titlecontents*{partialtocsection}[0cm]{}{%
+   \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
+   {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \ifsuftesi at article
+  \titlecontents*{partialtocsubsection}[0cm]{}{%
+   \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+   {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \else
+  \titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
+   \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+   {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \fi
+  \titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
+   \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
+   {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+  \titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
+   \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
+   {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+  \titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
+   \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
+   {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+    \ifsuftesi at article
+        \let\startsecpartialtoc\startcontents
+        \let\startchappartialtoc\relax
+      \else
+        \let\startchappartialtoc\startcontents
+        \let\startsecpartialtoc\relax
+    \fi
+  \newcommand{\printpartialtoc}{%
+    \setcounter{tocdepth}{5}
+     \contentsmargin{0cm}
+      \@partialtocsize
+       \@partialtocbeforespace
+        \@partialtocbeforecode\par
+         \ifsuftesi at article
+         \printcontents{partialtoc}{2}{}
+         \else
+         \printcontents{partialtoc}{1}{}
+         \fi
+        \par\@partialtocaftercode
+      \@partialtocafterspace
+   }
+\else
+  \let\startchappartialtoc\relax
+  \let\startsecpartialtoc\relax
+  \def\printpartialtoc{%
+    \ClassWarningNoLine{suftesi}%
+      {To activate \string\printpartialtoc\MessageBreak
+      load the 'partialtoc' option}}
+\fi
 %    \end{macrocode}
 % \subparagraph{The ToC, LoF and LoT in the \opt{article} structure}
 %    \begin{macrocode}
@@ -5947,27 +5226,10 @@
     }
 \fi
 %    \end{macrocode}
-% \subsection{Customizations}
-% \subsubsection{Sections font}
+% \subsubsection{Commands for sections font in ToC}
 %    \begin{macrocode}
 \newcommand{\tocpartname}[1]{\def\SUF at tocpartname{#1}}
   \tocpartname{\partname}
-\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}\partnumfont{}
-\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
-\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
-\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
-\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
-\newcommand{\titlefont}[1]{\def\SUF at Tfont@style{#1}\let\SUF at Tfont@shape\relax}
-\newcommand{\authorfont}[1]{\def\SUF at Afont@style{#1}\let\SUF at Afont@shape\relax}
-\newcommand{\datefont}[1]{\def\SUF at datefont{#1}}
-%    \end{macrocode}
-% \subsubsection{Sections font in ToC}
-%    \begin{macrocode}
 \newcommand{\tocpartfont}[1]{\def\SUF at tocPART@font{#1}}
 \newcommand{\tocchapfont}[1]{\def\SUF at tocCHAP@font{#1}}
 \newcommand{\tocsecfont}[1]{\def\SUF at tocSEC@font{#1}}
@@ -5977,17 +5239,17 @@
 \newcommand{\tocsubparfont}[1]{\def\SUF at tocSUBPAR@font{#1}}
 \newcommand{\tocpartnumfont}[1]{\def\SUF at tocPARTnum@font{#1}}\tocpartnumfont{}
 \newcommand{\tocchapnumfont}[1]{%
-  \def\SUF at CHAP@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at CHAP@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsecnumfont}[1]{%
-  \def\SUF at SEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubsecnumfont}[1]{%
-  \def\SUF at SUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubsubsecnumfont}[1]{%
-  \def\SUF at SUBSUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SUBSUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocparnumfont}[1]{%
- \def\SUF at PAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF at PAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubparnumfont}[1]{%
- \def\SUF at SUBPAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF at SUBPAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \tocparnumfont{}
 \tocsubparnumfont{}
 %    \end{macrocode}
@@ -6006,15 +5268,15 @@
 \newcommand{\partialtocsubparfont}[1]{%
  \def\@partialtocsubparfont{#1}} 
 \newcommand{\partialtocseclabel}[1]{%
-  \def\@partialtocseclabel{\begingroup#1\thecontentslabel\endgroup}} 
+  \def\@partialtocseclabel{\begingroup#1\thecontentslabel~\endgroup}} 
 \newcommand{\partialtocsubseclabel}[1]{%
-  \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel\endgroup}} 
+  \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel~\endgroup}} 
 \newcommand{\partialtocsubsubseclabel}[1]{%
-  \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel\endgroup}} 
+  \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel~\endgroup}} 
 \newcommand{\partialtocparlabelfont}[1]{%
- \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel\endgroup}} 
+ \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel~\endgroup}} 
 \newcommand{\partialtocsubparlabelfont}[1]{%
- \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel\endgroup}} 
+ \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel~\endgroup}} 
 \newcommand{\partialtocbeforespace}[1]{%
   \def\@partialtocbeforespace{\vspace*{#1}}} 
 \newcommand{\partialtocafterspace}[1]{%
@@ -6029,59 +5291,721 @@
 \partialtocsubsubsecfont{}
 \partialtocparfont{}
 \partialtocsubparfont{}
-\partialtocseclabel{\itshape}
+\partialtocseclabel{}
 \partialtocsubseclabel{}
 \partialtocsubsubseclabel{}
 \partialtocparlabelfont{}
 \partialtocsubparlabelfont{}
-\partialtocbeforespace{18ex}
-\partialtocafterspace{-18ex}
+\partialtocbeforespace{0pt}
+\partialtocafterspace{0pt}
 \partialtocbeforecode{}
 \partialtocaftercode{}
 %    \end{macrocode}
-% \subsection{New commands}
-% A command to print an unnumbered introduction at the beginning of the chapter. The \cmd{chapterintroname} defaults to ``Introduzione'' because the class was initially designed primarily for Italian-speaking users.
+% \subsection{Headers and footers}
 %    \begin{macrocode}
+\RequirePackage{fancyhdr}
+\newcommand{\versionstring}[1]{\def\version at string{#1}}
+  \versionstring{Version of}
+\ifSUF at draftdate
+  \def\SUF at versionof{\footnotesize\texttt{\version at string{} \today}}
+\else
+  \let\SUF at versionof\relax
+\fi
+\AtBeginDocument{%
+ \pagestyle{fancy}
+  \renewcommand{\headrulewidth}{0pt} 
+  \renewcommand{\footnoterule}{}}
+%    \end{macrocode}
+% \paragraph{The \opt{default} headers}
+% In previous versions \cmd{SUF at HEAD@thechapter} and 
+% \cmd{SUF at HEAD@thesection} were preceded by \cmd{protect}.
+% This caused an error in the headers. Removing \cmd{protect} 
+% may cause other bugs. To be tested.
+%    \begin{macrocode}
+\renewcommand{\chaptermark}[1]{%
+  \markboth{\chaptertitlename\ \SUF at HEAD@thechapter}{#1}}
+  \ifsuftesi at article
+    \renewcommand{\sectionmark}[1]{\markright{\SUF at HEAD@thesection.\ #1}}
+      \else
+    \renewcommand{\sectionmark}[1]{}
+  \fi
+%    \end{macrocode}
+% \paragraph{Page styles}
+%    \begin{macrocode}
+\fancypagestyle{plain}{\fancyhf{}\fancyfoot[RE,LO]{\SUF at versionof}}
+\fancypagestyle{empty}{\fancyhf{}\fancyfoot[RE,LO]{\SUF at versionof}}
+\fancypagestyle{sufplain}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\SUF at versionof}
+ \fancyfoot[C]{\footnotesize\SUF at thepage}}
+\fancypagestyle{centerheader}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{\SUF at versionof}
+  \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark} 
+  \fancyhead[CE]{\footnotesize\breakinbodyfalse\SUF at mark} 
+  \fancyfoot[C]{\footnotesize\SUF at thepage}}
+\fancypagestyle{sufdefault}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{\SUF at versionof}
+  \fancyhead[LE,RO]{\footnotesize\SUF at thepage} 
+  \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+  \fancyhead[RE]{\footnotesize\breakinbodyfalse\SUF at mark}}
 \ifsuftesi at article
-\def\chapterintro{%
-\ClassError{suftesi}
-  {Command \noexpand\chapterintro is undefined\MessageBreak 
-     using 'structure=article'}
-  {Command \noexpand\chapterintro is undefined\MessageBreak 
-     using 'structure=article'}}
+  \ifsuftesi at authortitle
+    \def\SUF at mark{\SUF at leftmark}
+  \else
+    \def\SUF at mark{\SUF at rightmark}
+  \fi
 \else
-\def\chapterintro{\@ifstar{%
-  \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
-\def\@chapterintro{\phantomsection
-  \if at tempswa\section*{\SUF at fchapterintroname}\fi
-  \addcontentsline{toc}{section}{\SUF at fchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\SUF at fchapterintroname{#1}}
-\chapterintroname{Introduzione}
+  \def\SUF at mark{\SUF at leftmark}
 \fi
+\def\SUF at leftrightmark{%
+  \if at mainmatter\leftmark\else\rightmark\fi} 
+\pagestyle{sufdefault}
+  \ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
+  \ifsuftesi at sufplain\pagestyle{sufplain}\else\fi
 %    \end{macrocode}
-% Two commands for manual breaks active, respectively, only in the table of contents and in the body text. The solution was initially made available by Enrico Gregorio many years ago in one of the first versions of the class (at that time the commands were called \cmd{headbreak} and \cmd{xheadbreak}). Later, while I was working on version 3.0, I noticed an alignment problem in the chapter titles when using the \opt{chapstyle=left} option. So I added the \cmd{breakinbodyleft} command and updated the command names to make them more recognizable. Old names are in any case available for backwards compatibility.
+% \subsection{Notes and quotations}
+% \paragraph{Block Quotations}
+% New environments for block quotations according to a popular Italian style. 
+% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
 %    \begin{macrocode}
-\newif\ifbreakintoc\breakintocfalse
-\newif\ifbreakinbody\breakinbodytrue
-\DeclareRobustCommand{\breakintoc}
-   {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\breakinbody}
-  {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\breakinbodyleft}
-  {\ifbreakinbody\newline\else\fi}
-\let\origtableofcontents\tableofcontents
-\renewcommand{\tableofcontents}{%
-  \begingroup\suftesi at partialtocfalse
-    \breakintoctrue\breakinbodyfalse%
-      \origtableofcontents
-  \endgroup}
-\DeclareRobustCommand{\headbreak}
-  {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\xheadbreak}
-  {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\yheadbreak}
-  {\ifbreakinbody\newline\else\fi}
+\renewenvironment{quotation}
+  {\list{}{\listparindent\parindent%
+    \itemindent    \listparindent
+    \SUF at quote@style      
+    \parsep    \z@ \@plus\p@}%
+    \item\relax%
+    \SUF at quotation@size%
+    \noindent\ignorespaces}
+  {\endlist}
+\renewenvironment{quote}
+  {\list{}{%
+    \SUF at quote@style}%
+    \item\relax%
+    \SUF at quotation@size}% \ignorespaces?
+  {\endlist}
+\renewenvironment{verse}
+  {\let\\\@centercr
+    \list{}{\itemsep      \z@
+      \itemindent   -1.5em%
+      \listparindent\itemindent
+      \rightmargin  \leftmargin
+      \advance\leftmargin 1.5em}%
+    \item\relax
+    \SUF at quotation@size}
+  {\endlist}  
 %    \end{macrocode}
+% \paragraph{The \opt{fewfootnotes} option}
+% Enable only with three footnotes per page maximum.
+%    \begin{macrocode}
+\ifSUF at fewfootnotes
+\RequirePackage[perpage]{zref}
+ \zmakeperpage{footnote}
+\AtBeginDocument{%
+\def\@fnsymbol#1{%
+   \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+   \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+   \TextOrMath {\textasteriskcentered%
+                \textasteriskcentered\textasteriskcentered}{***}\or
+  \protect\ClassWarningNoLine{suftesi}%
+  {Too many footnotes per page. Compile again or\MessageBreak
+   remove the class option 'fewfootnote'}
+  \fi
+}%
+}
+\def\thefootnote{\@fnsymbol\c at footnote}%
+\fi
+%    \end{macrocode}
+% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
+% symbol give in the first argument.
+%    \begin{macrocode}
+\newcommand*\xfootnote[1][*]{%
+  \xdef\@thefnmark{#1}%
+    \@footnotemark\@footnotetext}
+%    \end{macrocode}
+% \paragraph{Marginal notes}
+% The |\marginpar| command is redefined according to the look 
+% of \emph{Classic Thesis} by 
+% André \textcite{Miede:2011}\index{Miede, André}. 
+%    \begin{macrocode}
+\let\oldmarginpar\marginpar
+\ifSUF at marginpar
+  \def\SUF at mpsetup{%
+    \itshape
+      \footnotesize%
+      \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
+      \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
+      \doublehyphendemerits=100000%
+      \finalhyphendemerits=\doublehyphendemerits}
+    \renewcommand{\marginpar}[1]{\oldmarginpar%
+       [\SUF at mpsetup\raggedleft\hspace{0pt}{#1}]%
+       {\SUF at mpsetup\raggedright\hspace{0pt}{#1}}}
+\else
+  \renewcommand\marginpar[2][]{}
+\fi
+%    \end{macrocode}
+% Redefine an internal command of the \sty{todonotes} package in 
+% order to use the class-specific marginal notes when this 
+% package is loaded. This redefinition simply substitute 
+% \cmd{oldmarginpar} to \cmd{marginpar}:
+%    \begin{macrocode}
+\AtBeginDocument{%
+\@ifpackageloaded{todonotes}{%
+  \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
+    \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+      \node [coordinate] (inText) {};%
+    \end{tikzpicture}%
+      \oldmarginpar[{% Draw note in left margin
+      \@todonotes at drawMarginNote%
+      \@todonotes at drawLineToLeftMargin%
+      }]{% Draw note in right margin
+      \@todonotes at drawMarginNote%
+      \@todonotes at drawLineToRightMargin%
+      }
+    }
+  }
+{\relax}}
+%    \end{macrocode}
+% \subsection{The \opt{collection} structure}
+%    \begin{macrocode}
+\ifsuftesi at collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\newcounter{article}
+\setcounter{article}{0}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+  \def\@journalname{\@latex at warning@no at line{%
+    No \noexpand\journalname given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+  \def\@journalvolume{\@latex at warning@no at line{%
+    No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+  \def\@journalnumber{\@latex at warning@no at line{%
+    No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+  \def\@issue{\@latex at warning@no at line{%
+    No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+  \def\@journalyear{\@latex at warning@no at line{%
+    No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+  \def\@journalwebsite{\@latex at warning@no at line{%
+    No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected at xdef\@thanks{%
+  \@thanks\protect\footnotetext[\the\c at footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+  \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+  \def\@collectiontitle{\@latex at warning@no at line{%
+    No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+  \def\@collectioneditor{\@latex at warning@no at line{%
+    No \noexpand\collectioneditor given}}
+\renewcommand*{\title}[2][]{%
+  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
+    \edef\title{\noexpand\@dblarg
+  \expandafter\noexpand\csname\string\title\endcsname}
+    \def\@headtitle{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given \MessageBreak%
+            See the class documentation for explanation}}
+    \def\@title{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given\MessageBreak%
+            See the class documentation for explanation}}
+    \def\@author{--missing author--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\author\space given\MessageBreak%
+            See the class documentation for explanation}}
+\newcommand*\l at title[2]{%
+  \ifnum \c at tocdepth >\m at ne
+    \addpenalty{-\@highpenalty}%
+    \vskip 1.0ex \@plus\p@
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \advance\leftskip1em
+      \hskip -\leftskip
+      #1\nobreak%
+    \ifsuftesi at dottedtoc\dotfill%
+      \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
+        \else
+          \ifsuftesi at raggedtoc%
+            \nobreak\hskip1em #2 \hfill\null\par
+              \else
+                \ifsuftesi at pagelefttoc
+              \ClassError{suftesi}
+                {\MessageBreak
+                You can not use tocstyle=leftpage\MessageBreak
+                  with structure=collection}
+                {You can not use tocstyle=leftpage\MessageBreak
+                  with structure=collection}
+            \else
+          \nobreak\hfill #2\par
+        \fi
+      \fi
+    \fi
+      \penalty\@highpenalty
+    \endgroup
+  \fi}
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb at xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if at twocolumn
+      \ifnum \col at number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@ % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks%
+  \endgroup
+   \setcounter{section}{0}%
+%  \setcounter{footnote}{0}%
+%  \global\let\thanks\relax
+%  \global\let\maketitle\relax
+%  \global\let\@maketitle\relax
+%  \global\let\@thanks\@empty
+%  \global\let\@author\@empty
+%  \global\let\@date\@empty
+%  \global\let\@title\@empty
+%  \global\let\title\relax
+%  \global\let\author\relax
+%  \global\let\date\relax
+   \global\let\and\relax
+   \let\thanks\@gobble}
+\AtBeginDocument{\def\@maketitle{%
+  \refstepcounter{article}
+  \SUF at chaptersize
+   \SUF at authortitle@align
+    \let\footnote\thanks
+     \parindent=0pt
+    {\SUF at second}%
+   \label{begin:\thearticle}
+%    \end{macrocode}
+% Check if you don't use \sty{hyperrref} provided by Enrico Gregorio
+% (\url{https://tex.stackexchange.com/a/427203/231952}):
+%    \begin{macrocode}
+   \@ifundefined{Hy at raisedlink}{\let\texorpdfstring\@firstoftwo}{%
+    \xdef\@currentHref{title.\thearticle}%
+     \Hy at raisedlink{\hyper at anchorstart{\@currentHref}\hyper at anchorend}%
+    }%  
+%    \end{macrocode}
+%    \begin{macrocode}
+   \csname toc at entry@\endcsname
+    \begingroup%
+    \let\thanks\@gobble
+    \addcontentsline{toc}{title}{%
+    {\SUF at tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
+    {\SUF at tocTIT@font{\@headtitle}}}
+    \endgroup%
+    \par\nobreak\vspace{2ex}
+    {\SUF at first%
+    \vskip1.5cm}}%
+    }
+% \newenvironment{article}
+%  {\begingroup
+%  \global\let\@thanks\@empty
+%  \setcounter{footnote}{0}
+%  \refstepcounter{article}
+%  \label{begin:\thearticle}
+%}
+%  {\label{end:\thearticle}\endgroup
+%  }
+\newenvironment{article}
+  {\begingroup
+  \setcounter{section}{0}
+  \setcounter{footnote}{0}
+  \setcounter{figure}{0}
+  \setcounter{table}{0}}
+  {\label{end:\thearticle}
+    \cleardoublepage
+      \global\let\@thanks\@empty
+    \endgroup}
+\newcommand{\collectiontitlepage}{%
+  \thispagestyle{empty}%
+    \begingroup
+     \centering
+       \vspace*{\stretch{1}}
+     
+       {\SUF at chaptersize\@collectiontitle\par}
+         \vskip5ex
+     
+       \@collectioneditor
+       \vspace*{\stretch{3}}
+            
+    \endgroup
+  \clearpage}
+\def\frontispiece{\collectiontitlepage}
+%    \end{macrocode}
+% In the collection document structure the articles are treated as
+% chapters but you would not need to print in
+% the table of contents all the sections of every article. So first of 
+% all we include in the table of contents only the author and the 
+% title of each paper. Anyway the sections inside each paper are 
+% numbered as in standard articles:
+%    \begin{macrocode}
+  \setcounter{tocdepth}{0}
+  \renewcommand\thesection{%
+          \@arabic\c at section}
+  \renewcommand\thesubsection{%
+          \thesection.\@arabic\c at subsection}
+  \renewcommand\thesubsubsection{%
+          \thesubsection.\@arabic\c at subsubsection}
+  \renewcommand\theparagraph{%
+          \thesubsubsection.\@arabic\c at paragraph}
+  \renewcommand\thesubparagraph{%
+          \theparagraph.\@arabic\c at subparagraph}
+  \else
+\fi
+%    \end{macrocode}
+% \subsection{Title page}
+% The new \cmd{title} command has an optional argument 
+% which can be used in the headers.
+%    \begin{macrocode}
+\def\isbn#1{\gdef\@isbn{#1}}
+\def\@issn{\@latex at warning@no at line{%
+  No \noexpand\isbn given}}
+\def\doi#1{\gdef\@doi{#1}}
+\def\@doi{\@latex at warning@no at line{%
+  No \noexpand\doi given}}
+\def\isbn#1{\gdef\@issn{#1}}
+\def\@issn{\@latex at warning@no at line{%
+  No \noexpand\isbn given}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\edef\title{\noexpand\@dblarg
+  \expandafter\noexpand\csname\string\title\endcsname}
+\def\@headtitle{--missing title--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given \MessageBreak%
+            See the class documentation for explanation}}
+\def\@title{--missing title--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given\MessageBreak%
+            See the class documentation for explanation}}
+\def\@author{--missing author--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\author\space given\MessageBreak%
+            See the class documentation for explanation}}
+\ifSUF at titlepage
+  \renewcommand\maketitle{%
+  \begin{titlepage}
+    \let\footnotesize\small
+    \let\footnoterule\relax
+    \let \footnote \thanks
+    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+    \null\vfil
+    \vskip 60\p@
+    \begin{center}%
+      {\SUF at first\par}%
+      \vskip 3em%
+      {\lineskip .75em%
+        \begin{tabular}[t]{c}%
+          \SUF at second
+        \end{tabular}\par}%
+        \vskip 1.5em%
+      {\SUF at datefont\@date\par}%       
+    \end{center}\par
+    \@thanks
+    \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@date\@empty
+  \global\let\date\relax
+  \global\let\and\relax}
+\else
+\renewcommand\maketitle{\par
+   \begingroup
+     \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+     \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+     \long\def\@makefntext##1{\parindent 1em\noindent
+             \hb at xt@1.8em{%
+                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+     \if at twocolumn
+       \ifnum \col at number=\@ne
+         \@maketitle
+       \else
+         \twocolumn[\@maketitle]%
+       \fi
+     \else
+       \newpage
+       \global\@topnum\z@% Prevents figures from going at top of page.
+       \@maketitle
+     \fi
+     \thispagestyle{plain}\@thanks
+   \endgroup
+   \setcounter{footnote}{0}%
+   \global\let\thanks\relax
+   \global\let\maketitle\relax
+   \global\let\@maketitle\relax
+   \global\let\@thanks\@empty
+   \global\let\@date\@empty
+   \global\let\date\relax
+   \global\let\and\relax}
+\def\@maketitle{%
+   \newpage
+   \null
+   \vskip 2em%
+   \begin{center}%
+   \let \footnote \thanks
+     {\SUF at first\par}%
+     \vskip 1.5em%
+     {\lineskip .5em%
+       \begin{tabular}[t]{c}%
+        \SUF at second\par
+       \end{tabular}\par}%
+     \vskip 1em%
+     {\SUF at datefont\@date\par}%
+   \end{center}%
+   \par
+   \vskip 1.5em}
+\fi
+%    \end{macrocode}
+% \subsection{Cover page}
+%    \begin{macrocode}
+\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
+\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
+\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
+\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
+\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
+\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
+\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
+\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
+\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
+\Cauthor{}
+\Ctitle{}
+\Csubtitle{}
+\Ceditor{}
+\Cfoot{}
+\Cpagecolor{gray!30}
+\Ctextcolor{white}
+\Cfootcolor{black}
+\AtBeginDocument{
+\@ifpackageloaded{tikz}{%
+\newcommand\makecover[1][]{%
+\begin{titlepage}
+\begin{tikzpicture}[overlay,remember picture]
+  \draw[draw=none,fill=\@Cpagecolor]
+    (current page.north west) rectangle (current page.south east);
+  \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
+  \draw[draw=none,fill=gray,#1]
+    (c)  circle (.38\paperwidth) ;
+  \node[anchor=center] at (c) (author) {%
+\parbox{.7\paperwidth}{%
+  \centering
+    \ifx\@Cauthor\@empty
+     \else
+       {\scshape\color{\@Ctextcolor}\@Cauthor\\}
+       \vspace*{\baselineskip}
+     \fi
+
+     \ifx\@Ctitle\@empty
+     \else
+     {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
+     \fi
+
+    \ifx\@Csubtitle\@empty
+     \else
+       {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
+     \fi
+
+    \ifx\@Ceditor\@empty
+     \else
+       {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
+     \fi}
+};
+\ifx\@Cfoot\@empty\else
+  \node[xshift=.5\paperwidth,yshift=1cm,
+    align=center,text=\@Cfootcolor,anchor=south]
+  at (current page.south west) {\@Cfoot};
+\fi
+\end{tikzpicture}
+\end{titlepage}
+}
+}
+{\def\makecover{\ClassError{suftesi}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}}}
+}
+%    \end{macrocode}
+% \subsection{Frontispiece}
+%    \begin{macrocode}
+\AtBeginDocument{%
+\@ifpackagewith{frontespizio}{suftesi}{%
+\ifsuftesi at periodical
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at periodicalaureo
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at compact
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at compactaureo
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at supercompact
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at supercompactaureo
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketa
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketb
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketc
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\@ifpackageloaded{frontespizio}{%
+\ifsuftesi at periodical
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at periodicalaureo
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at compact
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at compactaureo
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at supercompact
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at supercompactaureo
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketa
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketb
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketc
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\relax}}}
+%    \end{macrocode}
+% \paragraph{Colophon or copyright notice} 
+%    \begin{macrocode}
+\newcommand{\colophon}[3][]{%
+  \thispagestyle{empty}
+  \null
+    \vfill
+     \def\next{#2}
+         \ifx\next\@empty\else
+            \noindent Copyright \copyright{} \the\year~#2\\[1ex]
+          Tutti i diritti riservati
+        \fi
+  \vfill  
+  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
+     \def\next{#1}
+        \ifx\next\@empty\else su #1 
+      \fi usando la classe \textsf{suftesi} di 
+      Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
+      \cleardoublepage}
+\newcommand{\bookcolophon}[2]{%
+  \thispagestyle{empty}
+  \null
+    \vfill
+            \noindent #1
+  \vfill  
+  {\small\noindent #2\par}
+      \cleardoublepage}
+\newcommand{\artcolophon}[1]{%
+\thispagestyle{empty}
+  \null
+    \vfill
+  {\small\noindent #1\par}}
+\newcommand{\finalcolophon}[1]{%
+\thispagestyle{empty}
+  \null\vspace*{\stretch{1}}
+  \begin{center}
+  \begin{minipage}{.5\textwidth}
+  \centering\small #1
+  \end{minipage}
+  \end{center}
+    \vspace*{\stretch{6}}}
+%    \end{macrocode}
+% \paragraph{The \cmd{FSPL} colophon}
+% This command is defined only for the \opt{style=FSPL*} options.
+%    \begin{macrocode}
+\ifsuftesi at FSPL
+\newcommand{\FSPLcolophon}[1][\the\year]{%
+\begingroup
+\thispagestyle{empty}
+\null\vspace{\stretch{1}}
+\noindent \hskip-.5em\cc #1 \@author%
+\vskip1ex
+
+\small\noindent This work is licensed under the Creative Commons 
+Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
+To view a copy of this license, 
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+
+\endgroup
+
+\begingroup
+\footnotesize
+
+\null\vspace{\stretch{1}}
+
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by 
+Janusz M.~Nowacki.
+
+\endgroup
+
+\clearpage}
+\else
+\def\FSPLcolophon{%
+ \ClassError{suftesi}
+   {\noexpand\FSPLcolophon is defined\MessageBreak 
+     only for the FSPL styles}
+   {\noexpand\FSPLcolophon is defined\MessageBreak 
+     only for the FSPL styles}}
+\fi
+%    \end{macrocode}
 % \subsection{Backward compatibility}
 % Two environments to manually typeset the bibliography and the list of shorthands.
 % As the class was initially designed primarily for Italian-speaking users, these two environments have an Italian name. Particularly the list of shorthands relies on \cmd{losname} which defaults to ``Sigle'' (that means ``shorthands''). They are not documented and are made available only for backward compatibility.
@@ -6114,6 +6038,27 @@
       \let\makelabel\itlabel}}
   {\endlist}
 %    \end{macrocode}
+% A command to print an unnumbered introduction at the beginning of the chapter. 
+% The \cmd{chapterintroname} defaults to ``Introduzione'' because the class was 
+% initially designed primarily for Italian-speaking users.
+%    \begin{macrocode}
+\ifsuftesi at article
+\def\chapterintro{%
+\ClassError{suftesi}
+  {Command \noexpand\chapterintro is undefined\MessageBreak 
+     using 'structure=article'}
+  {Command \noexpand\chapterintro is undefined\MessageBreak 
+     using 'structure=article'}}
+\else
+\def\chapterintro{\@ifstar{%
+  \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
+\def\@chapterintro{\phantomsection
+  \if at tempswa\section*{\SUF at fchapterintroname}\fi
+  \addcontentsline{toc}{section}{\SUF at fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF at fchapterintroname{#1}}
+\chapterintroname{Introduzione}
+\fi
+%    \end{macrocode}
 % \subsection{Final settings}
 %    \begin{macrocode}
 \ifsuftesi at article
@@ -6160,8 +6105,6 @@
 %    \begin{macrocode}
 \unless\ifPDFTeX% if xetex or luatex
   \let\@afterindenttrue\@afterindentfalse
-    \else
-  \relax
 \fi
 %    \end{macrocode}
 % Now we switch off extra space after punctuation, in accordance with the habits 
@@ -6244,13 +6187,6 @@
     und der Typographie},
   Year = {1975}}
 
- at online{Lehman:2010,
-  Author = {Philipp Lehman},
-  Note = {Versione 0.9a},
-  Title = {The \textsf{biblatex} package},
-  Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf},
-  Year = {2010}}
-
 @online{Miede:2011,
   Author = {André Miede},
   Title = {A Classic Thesis style},
@@ -6257,35 +6193,6 @@
   Url = {http://mirrors.ctan.org/macros/latex/contrib/classicthesis/ClassicThesis.pdf},
   Date = {2011}}
 
- at book{Pantieri:2011,
-  Author = {Lorenzo Pantieri and Tommaso Gordini},
-  Booktitle = {L'arte di scrivere con \LaTeX},
-  Date = {2012},
-  Edition = {new edition},
-  Foreword = {Enrico Gregorio},
-  Hyphenation = {italian},
-  Subtitle = {Un'introduzione a \LaTeXe},
-  Title = {L'arte di scrivere con \LaTeX},
-  Url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf},
-  Annote = {Questa guida è diventata il punto di riferimento degli utenti 
-    italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la 
-    completezza dei contenuti}}
-
- at article{Pantieri:2009,
-  Author = {Lorenzo Pantieri},
-  Title = {L'arte di gestire la bibliografia con \pack{biblatex}},
-  Url = {http://www.lorenzopantieri.net/LaTeX_files/Bibliografia.pdf},
-  Year = {2009}}
-
- at article{Mori:2008,
-  Author = {Lapo F. Mori},
-  Journal = {ArsTeXnica},
-  Month = {10},
-  Pages = {37-51},
-  Title = {Gestire la bibliografia con {\LaTeX}},
-  Volume = {6},
-  Year = {2008}}
-
 @article{valbusa:20122,
   Author = {Ivan Valbusa},
   Date = {2012},
@@ -6361,7 +6268,7 @@
   author = {Pignalberi, Gianluca},
   url = {http://www.ctan.org/pkg/cclicenses},
   urldate = {2020-05-24}, 
-  date = {2005/05/20},
+  date = {2005-05-20},
   version = {v0.4}
 }
 
@@ -6371,7 +6278,7 @@
   author = {Sharpe, Michael},
   url = {http://www.ctan.org/pkg/cochineal},
   urldate = {2020-05-24}, 
-  date = {2016-2020},
+  date = {2020},
   version = {1.061}
 }
 
@@ -6401,7 +6308,7 @@
   author = {Wette, Karl},
   url = {http://www.ctan.org/pkg/emptypage},
   urldate = {2020-05-24}, 
-  date = {2009-2010},
+  date = {2010},
   version = {1.2}
 }
 
@@ -6501,7 +6408,7 @@
   author = {B. Jackowski and J.M. Nowacki},
   url = {http://www.ctan.org/pkg/lmodern},
   urldate = {2020-05-24}, 
-  date = {2003-2009},
+  date = {2009},
   version = {2.004}
 }
 
@@ -6636,15 +6543,24 @@
   version = {v2.3}
 }
 
- at manual{afterpage,
-  title = {The \textsf{afterpage} package},
-  subtitle = { Execute command after the next page break},
-  author = {David Carlisle},
-  url = {http://www.ctan.org/pkg/bookcover},
-  urldate = {2020-06-29}, 
-  date = {2014-10-28},
-  version = {v1.08}
+ at manual{zref,
+  title = {The \sty{zref} package},
+  author = {Heiko Oberdiek},
+  url = {http://www.ctan.org/pkg/zref},
+  urldate = {2021-05-23}, 
+  date = {2020-07-03},
+  version = {v2.32}
 }
+
+ at manual{epigraph,
+  title = {The \sty{epigraph} package},
+  author = {Peter R. Wilson and Will Robertson},
+  url = {http://www.ctan.org/pkg/epigraph},
+  urldate = {2021-05-23}, 
+  date = {2020-01-02},
+  version = {v1.5e}
+}
+
 %</bib>
 % \fi
 % \Finale

Modified: trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls	2021-05-24 20:19:37 UTC (rev 59333)
+++ trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls	2021-05-24 20:19:55 UTC (rev 59334)
@@ -26,16 +26,15 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2021/05/20 v3.1.0 A class for typesetting theses, books and articles]
+    [2021/05/23 v3.1.1 A class for typesetting theses, books and articles]
 \RequirePackage{xkeyval}
 \newif\ifsuftesi at article
-\newif\ifsuftesi at authortitle
 \newif\ifsuftesi at collection
-\newif\ifsuftesi at standard
+\newif\ifsuftesi at lmodern
 \newif\ifsuftesi at cochineal
 \newif\ifsuftesi at libertine
 \newif\ifsuftesi at palatino
-\newif\ifsuftesi at compatibility
+\newif\ifsuftesi at mathpazo
 \newif\ifsuftesi at nofont
 \newif\ifsuftesi at greekfont
 \newif\ifsuftesi at porson
@@ -54,9 +53,10 @@
 \newif\ifsuftesi at pocketb
 \newif\ifsuftesi at pocketc
 \newif\ifsuftesi at screen
+\newif\ifsuftesi at sufplain
 \newif\ifsuftesi at screencentered
 \newif\ifsuftesi at centerheader
-\newif\ifsuftesi at sufplain
+\newif\ifsuftesi at authortitle
 \newif\ifsuftesi at numparpart
 \newif\ifsuftesi at numparchap
 \newif\ifsuftesi at numparsec
@@ -68,15 +68,11 @@
 \newif\ifsuftesi at twocolumntoc
 \newif\ifsuftesi at twocolumnlof
 \newif\ifsuftesi at twocolumnlot
-\newif\ifsuftesi at partialtoc
-\newif\ifsuftesi at toccompactsec
-\newif\ifsuftesi at toccompactsubsec
-\newif\ifsuftesi at toccompactsubsubsec
-\newif\ifsuftesi at toccompactpar
-\newif\ifsuftesi at toccompactsubpar
-\newif\ifsuftesi at draftdate
-\newif\ifsuftesi at fewfootnotes
-\newif\ifsuftesi at partpage
+\newif\ifsuftesi at ctocsec
+\newif\ifsuftesi at ctocsubsec
+\newif\ifsuftesi at ctocsubsubsec
+\newif\ifsuftesi at ctocpar
+\newif\ifsuftesi at ctocsubpar
 \newif\ifsuftesi at FSPL
 \DeclareOption{a4paper}{%
   \ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
@@ -104,7 +100,7 @@
   \def\SUF at chapswitch{\thechapter.}
 \or
   \suftesi at articletrue
-  \@titlepagefalse
+  \SUF at titlepagefalse
   \def\SUF at chapswitch{}
 \or
   \suftesi at collectiontrue
@@ -111,18 +107,22 @@
     \setkeys{}{headerstyle=authortitleinner}
   \def\SUF at chapswitch{}
 \fi}
-\define at choicekey{}{documentstructure}[\suftesi at val\suftesi at nr]
-    {book,article,collection}[book]{%
-\ClassWarningNoLine{suftesi}{%
-  'documentstructure' option is deprecated.\MessageBreak
-  Use 'structure' option instead}
+\define at choicekey{}{version}[\suftesi at val\suftesi at nr]
+    {screen,cscreen,draft,final}[draft]{%
 \ifcase\suftesi at nr\relax
-  \setkeys{}{structure=book}
+  \suftesi at screentrue
 \or
-  \setkeys{}{structure=article}
+  \suftesi at screentrue
+  \suftesi at screencenteredtrue
 \or
-  \setkeys{}{structure=collection}
+  \relax
+\or
+  \AtBeginDocument{\crop[off]}
 \fi}
+\define at boolkey[SUF]{}{marginpar}[true]{}
+\define at boolkey[SUF]{}{partpage}[true]{}
+\define at boolkey[SUF]{}{draftdate}[true]{}
+\define at boolkey[SUF]{}{titlepage}[true]{}
 \define at choicekey{}{defaultfont}[\suftesi at val\suftesi at nr]
     {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
 \ifcase\suftesi at nr\relax
@@ -134,9 +134,9 @@
 \or
   \suftesi at palatinotrue
 \or
-  \suftesi at standardtrue
+  \suftesi at lmoderntrue
 \or
-  \suftesi at compatibilitytrue
+  \suftesi at mathpazotrue
 \fi}
 \define at choicekey{}{mathfont}[\suftesi at val\suftesi at nr]
     {none,minimal,extended}[minimal]{%
@@ -161,6 +161,15 @@
 \or
   \suftesi at greekfonttrue\suftesi at cbgreektrue
 \fi}
+\define at choicekey{}{smallcapsstyle}[\suftesi at val\suftesi at nr]
+    {low,upper}[low]{%
+\ifcase\suftesi at nr\relax
+  \def\SUF at MakeLowercase{\MakeLowercase}
+  \def\SUF at TOCMakeLowercase{\lowercase}
+\or
+  \def\SUF at MakeLowercase{\relax}
+  \def\SUF at TOCMakeLowercase{\relax}
+\fi}
 \RequirePackage{geometry}
 \define at choicekey{}{pagelayout}[\suftesi at val\suftesi at nr]
     {standard,standardaureo,periodical,periodicalaureo,compact,compactaureo,
@@ -316,7 +325,7 @@
     marginparwidth= 12mm,
     marginparsep=   7pt}
 \or
-\suftesi at pocketBtrue
+\suftesi at pocketbtrue
   \DeclareRobustCommand{\SUF at partsize}{\large}
   \DeclareRobustCommand{\SUF at chaptersize}{\large}
   \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
@@ -334,7 +343,7 @@
     marginparwidth= 15mm,
     marginparsep=   7pt}
 \or
-\suftesi at pocketCtrue
+\suftesi at pocketctrue
   \DeclareRobustCommand{\SUF at partsize}{\large}
   \DeclareRobustCommand{\SUF at chaptersize}{\large}
   \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
@@ -355,165 +364,156 @@
 \define at choicekey{}{partstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@PARTSwitch{\filright}
+  \def\SUF at PART@align{\filright}
 \or
-  \def\SUF at lr@PARTSwitch{\filcenter}
+  \def\SUF at PART@align{\filcenter}
 \or
-  \def\SUF at lr@PARTSwitch{\filleft}
+  \def\SUF at PART@align{\filleft}
 \or
-  \def\SUF at lr@PARTSwitch{\filright}
+  \def\SUF at PART@align{\filright}
   \suftesi at numparparttrue
 \or
-  \def\SUF at lr@PARTSwitch{\filcenter}
+  \def\SUF at PART@align{\filcenter}
   \suftesi at numparparttrue
 \or
-  \def\SUF at lr@PARTSwitch{\filleft}
+  \def\SUF at PART@align{\filleft}
   \suftesi at numparparttrue
 \fi}
 \define at choicekey{}{chapstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@CHAPSwitch{\filright}
+  \def\SUF at CHAP@align{\filright}
 \or
-  \def\SUF at lr@CHAPSwitch{\filcenter}
+  \def\SUF at CHAP@align{\filcenter}
 \or
-  \def\SUF at lr@CHAPSwitch{\filleft}
+  \def\SUF at CHAP@align{\filleft}
 \or
-  \def\SUF at lr@CHAPSwitch{\filright}
+  \def\SUF at CHAP@align{\filright}
   \suftesi at numparchaptrue
 \or
-  \def\SUF at lr@CHAPSwitch{\filcenter}
+  \def\SUF at CHAP@align{\filcenter}
   \suftesi at numparchaptrue
 \or
-  \def\SUF at lr@CHAPSwitch{\filleft}
+  \def\SUF at CHAP@align{\filleft}
   \suftesi at numparchaptrue
 \fi}
 \define at choicekey{}{secstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SECSwitch{\filright}
+  \def\SUF at SEC@align{\filright}
 \or
-  \def\SUF at lr@SECSwitch{\filcenter}
+  \def\SUF at SEC@align{\filcenter}
 \or
-  \def\SUF at lr@SECSwitch{\filleft}
+  \def\SUF at SEC@align{\filleft}
 \or
-  \def\SUF at lr@SECSwitch{\filright}
+  \def\SUF at SEC@align{\filright}
   \suftesi at numparsectrue
 \or
-  \def\SUF at lr@SECSwitch{\filcenter}
+  \def\SUF at SEC@align{\filcenter}
   \suftesi at numparsectrue
 \or
-  \def\SUF at lr@SECSwitch{\filleft}
+  \def\SUF at SEC@align{\filleft}
   \suftesi at numparsectrue
 \fi}
 \define at choicekey{}{subsecstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SUBSECSwitch{\filright}
+  \def\SUF at SUBSEC@align{\filright}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filcenter}
+  \def\SUF at SUBSEC@align{\filcenter}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filleft}
+  \def\SUF at SUBSEC@align{\filleft}
 \or
-  \def\SUF at lr@SUBSECSwitch{\filright}
+  \def\SUF at SUBSEC@align{\filright}
 \suftesi at numparsubsectrue
 \or
-  \def\SUF at lr@SUBSECSwitch{\filcenter}
+  \def\SUF at SUBSEC@align{\filcenter}
 \suftesi at numparsubsectrue
 \or
-  \def\SUF at lr@SUBSECSwitch{\filleft}
+  \def\SUF at SUBSEC@align{\filleft}
 \suftesi at numparsubsectrue
 \fi}
 \define at choicekey{}{subsubsecstyle}[\suftesi at val\suftesi at nr]
     {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@SUBSUBSECSwitch{\filright}
+  \def\SUF at SUBSUBSEC@align{\filright}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filcenter}
+  \def\SUF at SUBSUBSEC@align{\filcenter}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filleft}
+  \def\SUF at SUBSUBSEC@align{\filleft}
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filright}
+  \def\SUF at SUBSUBSEC@align{\filright}
 \suftesi at numparsubsubsectrue
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filcenter}
+  \def\SUF at SUBSUBSEC@align{\filcenter}
 \suftesi at numparsubsubsectrue
 \or
-  \def\SUF at lr@SUBSUBSECSwitch{\filleft}
+  \def\SUF at SUBSUBSEC@align{\filleft}
 \suftesi at numparsubsubsectrue
 \fi}
 \define at choicekey{}{partfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at PART@StyleSwitch{\relax}
+  \def\SUF at PART@font{\relax}
 \or
-  \def\SUF at PART@StyleSwitch{\itshape}
+  \def\SUF at PART@font{\itshape}
 \or
-  \def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at PART@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{chapfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at CHAP@StyleSwitch{\relax}
+  \def\SUF at CHAP@font{\relax}
 \or
-  \def\SUF at CHAP@StyleSwitch{\itshape}
+  \def\SUF at CHAP@font{\itshape}
 \or
-  \def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at CHAP@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{secfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[italic]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SEC@StyleSwitch{\relax}
+  \def\SUF at SEC@font{\relax}
 \or
-  \def\SUF at SEC@StyleSwitch{\itshape}
+  \def\SUF at SEC@font{\itshape}
 \or
-  \def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subsecfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBSEC@StyleSwitch{\relax}
+  \def\SUF at SUBSEC@font{\relax}
 \or
-  \def\SUF at SUBSEC@StyleSwitch{\itshape}
+  \def\SUF at SUBSEC@font{\itshape}
 \or
-  \def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBSEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subsubsecfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBSUBSEC@StyleSwitch{\relax}
+  \def\SUF at SUBSUBSEC@font{\relax}
 \or
-  \def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
+  \def\SUF at SUBSUBSEC@font{\itshape}
 \or
-  \def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBSUBSEC@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{parfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at PAR@StyleSwitch{\relax}
+  \def\SUF at PAR@font{\relax}
 \or
-  \def\SUF at PAR@StyleSwitch{\itshape}
+  \def\SUF at PAR@font{\itshape}
 \or
-  \def\SUF at PAR@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at PAR@font{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{subparfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at SUBPAR@StyleSwitch{\relax}
+  \def\SUF at SUBPAR@font{\relax}
 \or
-  \def\SUF at SUBPAR@StyleSwitch{\itshape}
+  \def\SUF at SUBPAR@font{\itshape}
 \or
-  \def\SUF at SUBPAR@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at SUBPAR@font{\expandafter\SUF at titlesmallcaps}
 \fi}
-\define at choicekey{}{smallcapsstyle}[\suftesi at val\suftesi at nr]
-    {low,upper}[low]{%
-\ifcase\suftesi at nr\relax
-  \def\suftesi at MakeTextLowercase{\MakeLowercase}
-  \def\suftesi at MakeTextTOCLowercase{\lowercase}
-\or
-  \def\suftesi at MakeTextLowercase{\relax}
-  \def\suftesi at MakeTextTOCLowercase{\relax}
-\fi}
 \define at choicekey{}{partnumstyle}[\suftesi at val\suftesi at nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\suftesi at nr\relax
@@ -541,32 +541,32 @@
   \def\SUF at thechapter{\arabic{chapter}}
   \def\SUF at HEAD@thechapter{\arabic{chapter}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
+  \def\SUF at CHAP@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thechapter{\textsc{\roman{chapter}}}
   \def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thechapter{\Roman{chapter}}
   \def\SUF at HEAD@thechapter{\Roman{chapter}}
   \def\SUF at dotchap{}
-  \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at CHAP@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thechapter{\arabic{chapter}}
   \def\SUF at HEAD@thechapter{\arabic{chapter}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
+  \def\SUF at CHAP@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thechapter{\textsc{\roman{chapter}}}
   \def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thechapter{\Roman{chapter}}
   \def\SUF at HEAD@thechapter{\Roman{chapter}}
   \def\SUF at dotchap{.}
-  \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at CHAP@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define at choicekey{}{secnumstyle}[\suftesi at val\suftesi at nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -574,32 +574,32 @@
   \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
   \def\SUF at HEAD@thesection{\arabic{section}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesection{\textsc{\SUF at chapswitch\roman{section}}}
   \def\SUF at HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
   \def\SUF at HEAD@thesection{\Roman{section}}
   \def\SUF at dotsec{}
-  \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
   \def\SUF at HEAD@thesection{\arabic{section}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesection{\SUF at chapswitch\textsc{\roman{section}}}
   \def\SUF at HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
   \def\SUF at HEAD@thesection{\Roman{section}}
   \def\SUF at dotsec{.}
-  \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define at choicekey{}{subsecnumstyle}[\suftesi at val\suftesi at nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -606,27 +606,27 @@
 \ifcase\suftesi at nr\relax
   \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
   \def\SUF at dotsubsec{}
-  \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
   \def\SUF at dotsubsec{.}
-  \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define at choicekey{}{subsubsecnumstyle}[\suftesi at val\suftesi at nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -633,27 +633,27 @@
 \ifcase\suftesi at nr\relax
   \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
   \def\SUF at dotsubsubsec{}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
+  \def\SUF at SUBSUBSEC@contentslabel{\thecontentslabel}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+  \def\SUF at SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
   \def\SUF at dotsubsubsec{.}
-  \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \def\SUF at SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define at choicekey{}{tocstyle}[\suftesi at val\suftesi at nr]
     {standard,dotted,ragged,leftpage}[standard]{%
@@ -674,41 +674,41 @@
 \define at choicekey{}{compacttoc}[\suftesi at val\suftesi at nr]
     {sec,subsec,subsubsec,par,subpar}[sec]{%
 \ifcase\suftesi at nr\relax
-  \suftesi at toccompactsectrue
-  \suftesi at toccompactsubsectrue
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsectrue
+  \suftesi at ctocsubsectrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\hskip.5em}
   \def\SUF at ssscorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubsectrue
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubsectrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubsubsectrue
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubsubsectrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\hskip.5em}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactpartrue
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\relax}
   \def\SUF at pcorrect{\hskip.5em}
 \or
-  \suftesi at toccompactsubpartrue
+  \suftesi at ctocsubpartrue
   \def\SUF at sscorrect{\relax}
   \def\SUF at ssscorrect{\relax}
   \def\SUF at pcorrect{\relax}
@@ -743,13 +743,7 @@
   \suftesi at twocolumnlottrue
   \setkeys{}{tocstyle=ragged}
 \fi}
-\define at choicekey{}{partialtoc}[\suftesi at val\suftesi at nr]
-{true,false}[true]{%
- \ifcase\suftesi at nr\relax
-   \suftesi at partialtoctrue
- \or
-   \suftesi at partialtocfalse
- \fi}
+\define at boolkey[SUF]{}{partialtoc}[true]{}
 \define at choicekey{}{tocpartfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
 \ifcase\suftesi at nr\relax
@@ -845,9 +839,9 @@
   \def\SUF at Lheadstyle{\itshape}
   \def\SUF at thepage{\thepage}
 \or
-  \def\SUF at Rheadstyle{\SUF at headingsmallcaps}
-  \def\SUF at Lheadstyle{\SUF at headingsmallcaps}
-  \def\SUF at thepage{\SUF at headingsmallcaps{\thepage}}
+  \def\SUF at Rheadstyle{\SUF at headersmallcaps}
+  \def\SUF at Lheadstyle{\SUF at headersmallcaps}
+  \def\SUF at thepage{\SUF at headersmallcaps{\thepage}}
 \fi}
 \RequirePackage[inline]{enumitem}
   \setlist[itemize,1]{label=\color{sufgray}\textbullet}
@@ -904,13 +898,7 @@
   \renewcommand\@makefntext{%
     \textsuperscript{\@thefnmark}\hskip.3em}
 \fi}
-\define at choicekey{}{fewfootnotes}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at fewfootnotestrue
-\or
-  \relax
-\fi}
+\define at boolkey[SUF]{}{fewfootnotes}[true]{}
 \RequirePackage{caption}
 \captionsetup{labelsep=period,font=small,textformat=period}
 \define at choicekey{}{captionstyle}[\suftesi at val\suftesi at nr]
@@ -923,55 +911,6 @@
 \or
   \captionsetup{labelfont=sc}
 \fi}
-\define at choicekey{}{marginpar}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-\or
-  \renewcommand\marginpar[2][]{}
-\fi}
-\define at choicekey{}{partpage}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at partpagetrue
-\or
-  \relax
-\fi}
-\define at choicekey{}{draftdate}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at draftdatetrue
-\or
-  \relax
-\fi}
-\define at choicekey{}{version}[\suftesi at val\suftesi at nr]
-    {screen,cscreen,draft,final}[draft]{%
-\ifcase\suftesi at nr\relax
-  \suftesi at screentrue
-\or
-  \suftesi at screentrue
-  \suftesi at screencenteredtrue
-\or
-  \relax
-\or
-  \AtBeginDocument{\crop[off]}
-\fi}
-\define at choicekey{}{crop}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-  \ClassWarningNoLine{suftesi}{%
-    'crop' option is deprecated.\MessageBreak
-    Use 'version' option instead}
-\ifcase\suftesi at nr\relax
-  \setkeys{}{version=draft}
-\or
-  \setkeys{}{version=screen}
-\fi}
-\define at choicekey{}{titlepage}[\suftesi at val\suftesi at nr]
-    {true,false}[true]{%
-\ifcase\suftesi at nr\relax
-  \@titlepagetrue
-\or
-  \@titlepagefalse
-\fi}
 \define at choicekey{}{style}[\suftesi at val\suftesi at nr]
   {roman1,roman2,roman3,roman4,roman5,roman6,
   italic1,italic2,italic3,italic4,italic5,italic6,
@@ -1145,7 +1084,7 @@
   \setkeys{}{
   chapstyle=parright,
   chapfont=smallcaps,
-  tocchapfont=smallcaps,file:///tmp/mozilla_ivan0/luatex85.pdf
+  tocchapfont=smallcaps,
   secfont=smallcaps,
   headerfont=smallcaps}
 \or
@@ -1206,75 +1145,50 @@
 \define at choicekey{}{authortitlealign}[\suftesi at val\suftesi at nr]
     {left,center,right}[left]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at lr@coll at titleSwitch{\filright}
+  \def\SUF at authortitle@align{\filright}
 \or
-  \def\SUF at lr@coll at titleSwitch{\filcenter}
+  \def\SUF at authortitle@align{\filcenter}
 \or
-  \def\SUF at lr@coll at titleSwitch{\filleft}
+  \def\SUF at authortitle@align{\filleft}
 \fi}
-\define at choicekey{}{papertitlestyle}[\suftesi at val\suftesi at nr]
-    {left,center,right}[left]{%
-\ClassWarningNoLine{suftesi}{%
-  'papertitlestyle' option is deprecated.\MessageBreak
-  Use 'authortitlealign' option instead}
-\ifcase\suftesi at nr\relax
-  \def\SUF at lr@coll at titleSwitch{\filright}
-\or
-  \def\SUF at lr@coll at titleSwitch{\filcenter}
-\or
-  \def\SUF at lr@coll at titleSwitch{\filleft}
-\fi}
 \define at choicekey{}{reverseauthortitle}[\suftesi at val\suftesi at nr]
-    {true,false}[false]{%
+    {true,false}[true]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at first{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \def\SUF at second{\SUF at Tfont@style\SUF at Tfont@shape\@title}
+  \def\SUF at first{\SUF at authorstyle\SUF at authorfont\@author}
+  \def\SUF at second{\SUF at titlestyle\SUF at titlefont\@title}
 \or
-  \def\SUF at first{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-  \def\SUF at second{\SUF at Afont@style\SUF at Afont@shape\@author}
+  \def\SUF at first{\SUF at titlestyle\SUF at titlefont\@title}
+  \def\SUF at second{\SUF at authorstyle\SUF at authorfont\@author}
   \relax
 \fi}
-\define at choicekey{}{revauthortitle}[\suftesi at val\suftesi at nr]
-    {true,false}[false]{%
-\ClassWarningNoLine{suftesi}{%
-  'revauthortitle' option is deprecated.\MessageBreak
-  Use 'reverseauthortitle' option instead}
-\ifcase\suftesi at nr\relax
-  \def\SUF at first{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \def\SUF at second{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-\or
-  \def\SUF at first{\SUF at Tfont@style\SUF at Tfont@shape\@title}
-  \def\SUF at second{\SUF at Afont@style\SUF at Afont@shape\@author}
-  \relax
-\fi}
 \define at choicekey{}{maketitlestyle}[\suftesi at val\suftesi at nr]
     {suftesi,standard}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Tfont@style{\SUF at chaptersize\color{sufred}\sffamily}
-  \def\SUF at Afont@style{\small}
+  \def\SUF at titlestyle{\SUF at chaptersize\color{sufred}\sffamily}
+  \def\SUF at authorstyle{\small}
   \def\SUF at datefont{\small}
 \or
-  \def\SUF at Tfont@style{\LARGE}
-  \def\SUF at Afont@style{\large}
+  \def\SUF at titlestyle{\LARGE}
+  \def\SUF at authorstyle{\large}
   \def\SUF at datefont{\small}
 \fi}
 \define at choicekey{}{titlefont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Tfont@shape{\relax}
+  \def\SUF at titlefont{\relax}
 \or
-  \def\SUF at Tfont@shape{\itshape}
+  \def\SUF at titlefont{\itshape}
 \or
-  \def\SUF at Tfont@shape{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at titlefont{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{authorfont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[suftesi]{%
 \ifcase\suftesi at nr\relax
-  \def\SUF at Afont@shape{\relax}
+  \def\SUF at authorfont{\relax}
 \or
-  \def\SUF at Afont@shape{\itshape}
+  \def\SUF at authorfont{\itshape}
 \or
-  \def\SUF at Afont@shape{\expandafter\SUF at titlesmallcaps}
+  \def\SUF at authorfont{\expandafter\SUF at titlesmallcaps}
 \fi}
 \define at choicekey{}{datefont}[\suftesi at val\suftesi at nr]
     {roman,italic,smallcaps}[roman]{%
@@ -1303,6 +1217,54 @@
 \or
   \def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
 \fi}
+\define at choicekey{}{documentstructure}[\suftesi at val\suftesi at nr]
+    {book,article,collection}[book]{%
+\ClassWarningNoLine{suftesi}{%
+  'documentstructure' option is deprecated.\MessageBreak
+  Use 'structure' option instead}
+\ifcase\suftesi at nr\relax
+  \setkeys{}{structure=book}
+\or
+  \setkeys{}{structure=article}
+\or
+  \setkeys{}{structure=collection}
+\fi}
+\define at choicekey{}{crop}[\suftesi at val\suftesi at nr]
+    {true,false}[true]{%
+  \ClassWarningNoLine{suftesi}{%
+    'crop' option is deprecated.\MessageBreak
+    Use 'version' option instead}
+\ifcase\suftesi at nr\relax
+  \setkeys{}{version=draft}
+\or
+  \setkeys{}{version=screen}
+\fi}
+\define at choicekey{}{papertitlestyle}[\suftesi at val\suftesi at nr]
+    {left,center,right}[left]{%
+\ClassWarningNoLine{suftesi}{%
+  'papertitlestyle' option is deprecated.\MessageBreak
+  Use 'authortitlealign' option instead}
+\ifcase\suftesi at nr\relax
+  \def\SUF at authortitle@align{\filright}
+\or
+  \def\SUF at authortitle@align{\filcenter}
+\or
+  \def\SUF at authortitle@align{\filleft}
+\fi}
+\define at choicekey{}{revauthortitle}[\suftesi at val\suftesi at nr]
+    {true,false}[true]{%
+\ClassWarningNoLine{suftesi}{%
+  'revauthortitle' option is deprecated.\MessageBreak
+  Use 'reverseauthortitle' option instead}
+\ifcase\suftesi at nr\relax
+  \def\SUF at first{\SUF at authorstyle\SUF at authorfont\@author}
+  \def\SUF at second{\SUF at titlestyle\SUF at titlefont\@title}
+\or
+  \def\SUF at first{\SUF at titlestyle\SUF at titlefont\@title}
+  \def\SUF at second{\SUF at authorstyle\SUF at authorfont\@author}
+  \relax
+\fi}
+\ProcessOptionsX[SUF]<>\relax
 \ExecuteOptionsX<>{
   structure=book,
   pagelayout=standard,
@@ -1317,7 +1279,6 @@
   quotesize=footnotesize,
   quotestyle=center,
   captionstyle=standard,
-  marginpar=true,
   tocstyle=standard,
   partstyle=left,
   chapstyle=left,
@@ -1351,27 +1312,8 @@
   tocauthorfont=roman,
   reverseauthortitle=false,
   authortitlealign=left}
+\def\XKV at classoptionslist{}
 \ProcessOptionsX<>\relax
-\XKV at useoption{a4paper}
-\XKV at useoption{10pt}
-\XKV at useoption{11pt}
-\XKV at useoption{12pt}
-\XKV at useoption{oneside}
-\XKV at useoption{twoside}
-\XKV at useoption{onecolumn}
-\XKV at useoption{twocolumn}
-\XKV at useoption{titlepage}
-\XKV at useoption{notitlepage}
-\XKV at useoption{openright}
-\XKV at useoption{openany}
-\XKV at useoption{leqno}
-\XKV at useoption{fleqn}
-\XKV at useoption{a5paper}
-\XKV at useoption{b5paper}
-\XKV at useoption{legalpaper}
-\XKV at useoption{executivepaper}
-\XKV at useoption{landscape}
-\def\XKV at classoptionslist{}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
 \RequirePackage{microtype}
@@ -1381,11 +1323,9 @@
 \RequirePackage{iftex}
 \ifLuaTeX
   \RequirePackage{luatex85}
- \else
 \fi
 \ifsuftesi at FSPL
   \RequirePackage{cclicenses}
- \else
 \fi
 \ifsuftesi at screen
   \newcommand*\crop[1][]{}
@@ -1423,7 +1363,7 @@
     \suftesi at greekfontfalse
       \else\suftesi at greekfontfalse\fi
 \else
-\ifsuftesi at standard
+\ifsuftesi at lmodern
   \RequirePackage{lmodern}
     \ifsuftesi at greekfont
      \ClassWarningNoLine{suftesi}{%
@@ -1431,7 +1371,7 @@
        \suftesi at greekfontfalse
          \else\suftesi at greekfontfalse\fi
 \else
-  \ifsuftesi at compatibility
+  \ifsuftesi at mathpazo
     \RequirePackage[osf,sc]{mathpazo}
     \RequirePackage[scaled=0.8]{beramono}
     \renewcommand{\sfdefault}{iwona}
@@ -1644,127 +1584,125 @@
   \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \unless\ifPDFTeX
   \DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextTOCLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\SUF at TOCMakeLowercase{#1}}
   \DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
-  \DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\SUF at MakeLowercase{#1}}
+  \DeclareRobustCommand{\SUF at headersmallcaps}[1]{%
+    \addfontfeature{LetterSpace=10}\scshape\SUF at MakeLowercase{#1}}
 \else
   \DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
-    \scshape\suftesi at MakeTextTOCLowercase{\textls*{#1}}}%
+    \scshape\SUF at TOCMakeLowercase{\textls*{#1}}}%
   \DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
-    \scshape\suftesi at MakeTextLowercase{\textls*{#1}}}%
-  \DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
-    \scshape\suftesi at MakeTextLowercase{\textls*{#1}}}%
+    \scshape\SUF at MakeLowercase{\textls*{#1}}}%
+  \DeclareRobustCommand{\SUF at headersmallcaps}[1]{%
+    \scshape\SUF at MakeLowercase{\textls*{#1}}}%
 \fi
-\newlength\SUF at ADJnumparchap
+\newlength\SUF at chapbeforesep
 \def\SUF at default@CHAPTER{
 \ifsuftesi at numparchap
   \titleformat{\chapter}[display]
-    {\startpartialtoc\SUF at chaptersize\SUF at lr@CHAPSwitch}
+    {\startchappartialtoc\SUF at chaptersize\SUF at CHAP@align}
     {\SUF at thechapter\SUF at dotchap}
     {2ex}
-    {\SUF at CHAP@StyleSwitch}
-    [\printpartialtoc]
+    {\SUF at CHAP@font}
   \else
   \titleformat{\chapter}[hang]
-    {\startpartialtoc\SUF at chaptersize\SUF at lr@CHAPSwitch}
+    {\startchappartialtoc\SUF at chaptersize\SUF at CHAP@align}
     {\SUF at thechapter\SUF at dotchap}
     {3em}
-    {\SUF at CHAP@StyleSwitch}
-    [\printpartialtoc]
+    {\SUF at CHAP@font}
   \fi
 \ifsuftesi at numparchap
-  \setlength{\SUF at ADJnumparchap}{-6ex}
+  \setlength{\SUF at chapbeforesep}{-6ex}
     \else
-  \setlength{\SUF at ADJnumparchap}{0pt}
+  \setlength{\SUF at chapbeforesep}{0pt}
 \fi}
 \def\SUF at default@SECTIONS{
 \ifsuftesi at numparsec
   \titleformat{\section}[display]
-    {\SUF at sectionsize\SUF at lr@SECSwitch}
+    {\startsecpartialtoc\SUF at sectionsize\SUF at SEC@align}
     {\SUF at thesection\SUF at dotsec}
     {0ex}
-    {\SUF at SEC@StyleSwitch}
+    {\SUF at SEC@font}
   \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
   \titleformat{\section}[hang]
-    {\SUF at sectionsize\SUF at lr@SECSwitch}
+    {\startsecpartialtoc\SUF at sectionsize\SUF at SEC@align}
     {\SUF at thesection\SUF at dotsec}
     {1em}
-    {\SUF at SEC@StyleSwitch}
+    {\SUF at SEC@font}
   \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi at numparsubsec
   \titleformat{\subsection}[display]
-    {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSEC@align}
     {\textnormal\SUF at thesubsection\SUF at dotsubsec}
     {0ex}
-    {\SUF at SUBSEC@StyleSwitch}
+    {\SUF at SUBSEC@font}
   \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
   \titleformat{\subsection}[hang]
-    {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSEC@align}
     {\textnormal\SUF at thesubsection\SUF at dotsubsec}
     {1em}
-    {\SUF at SUBSEC@StyleSwitch}
+    {\SUF at SUBSEC@font}
   \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi at numparsubsubsec
   \titleformat{\subsubsection}[display]
-    {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSUBSEC@align}
     {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
     {0ex}
-    {\SUF at SUBSUBSEC@StyleSwitch}
+    {\SUF at SUBSUBSEC@font}
   \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
   \titleformat{\subsubsection}[hang]
-    {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+    {\SUF at subsectionsize\SUF at SUBSUBSEC@align}
     {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
     {1em}
-    {\SUF at SUBSUBSEC@StyleSwitch}
+    {\SUF at SUBSUBSEC@font}
   \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
   \fi}
 \SUF at default@CHAPTER
 \SUF at default@SECTIONS
 \ifsuftesi at periodical
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at periodicalaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at compact
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at compactaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at supercompact
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at supercompactaureo
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketa
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketb
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
 \ifsuftesi at pocketc
-  \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
+  \titlespacing*{\chapter}{0em}{\SUF at chapbeforesep}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
   \titlespacing*{\chapter}{0em}{%
-     \dimexpr(6ex+\SUF at ADJnumparchap)}{18ex}
+     \dimexpr(6ex+\SUF at chapbeforesep)}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
         \fi
        \fi
@@ -1794,7 +1732,7 @@
 \renewcommand\thesubparagraph{%
   \theparagraph.\@arabic\c at subparagraph}
 \renewcommand\part{%
-  \ifsuftesi at partpage
+  \ifSUF at partpage
   \if at openright
   \cleardoublepage
   \else
@@ -1808,7 +1746,7 @@
   \else
   \@tempswafalse
   \fi
-  \ifsuftesi at partpage
+  \ifSUF at partpage
   \null\vfil
   \fi
   \secdef\@part\@spart}
@@ -1824,7 +1762,7 @@
     \SUF at tocPART@font#1}%
   \fi
   \markboth{}{}%
-  {\SUF at lr@PARTSwitch\SUF at partsize
+  {\SUF at PART@align\SUF at partsize
     \interlinepenalty \@M
     \ifnum \c at secnumdepth >-2\relax
     \addvspace{4ex}
@@ -1835,17 +1773,17 @@
     \else
     \hspace{1em}
     \fi
-    \noindent\SUF at PART@StyleSwitch#2\par}%
+    \noindent\SUF at PART@font#2\par}%
   \@endpart}
 \def\@spart#1{%
-  {\SUF at lr@PARTSwitch\SUF at partsize
+  {\SUF at PART@align\SUF at partsize
     \interlinepenalty \@M
     \addvspace{4ex}
-    \noindent\SUF at PART@StyleSwitch#1\par}%
+    \noindent\SUF at PART@font#1\par}%
   \@endpart}
 \ifsuftesi at article
   \def\@endpart{%
-    \ifsuftesi at partpage
+    \ifSUF at partpage
     \vfil\newpage
     \if at twoside
     \if at openright
@@ -1875,7 +1813,7 @@
   {}
   {\theparagraph}
   {.5em}
-  {\SUF at PAR@StyleSwitch}
+  {\SUF at PAR@font}
   [{.}\hspace*{1em}]
 \titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \titleformat{\subparagraph}[runin]
@@ -1882,7 +1820,7 @@
   {}
   {\thesubparagraph}
   {.5em}
-  {\SUF at SUBPAR@StyleSwitch}
+  {\SUF at SUBPAR@font}
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \ifsuftesi at article
@@ -1946,435 +1884,77 @@
     \section{#1}}}
 {\relax}}
 \fi
-\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
-\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
-\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
-\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
-\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
-\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
-\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
-\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
-\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
-\Cauthor{}
-\Ctitle{}
-\Csubtitle{}
-\Ceditor{}
-\Cfoot{}
-\Cpagecolor{gray!30}
-\Ctextcolor{white}
-\Cfootcolor{black}
-\AtBeginDocument{
-\@ifpackageloaded{tikz}{%
-\newcommand\makecover[1][]{%
-\begin{titlepage}
-\begin{tikzpicture}[overlay,remember picture]
-  \draw[draw=none,fill=\@Cpagecolor]
-    (current page.north west) rectangle (current page.south east);
-  \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
-  \draw[draw=none,fill=gray,#1]
-    (c)  circle (.38\paperwidth) ;
-  \node[anchor=center] at (c) (author) {%
-\parbox{.7\paperwidth}{%
-  \centering
-    \ifx\@Cauthor\@empty
-     \else
-       {\scshape\color{\@Ctextcolor}\@Cauthor\\}
-       \vspace*{\baselineskip}
-     \fi
-
-     \ifx\@Ctitle\@empty
-     \else
-     {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
-     \fi
-
-    \ifx\@Csubtitle\@empty
-     \else
-       {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
-     \fi
-
-    \ifx\@Ceditor\@empty
-     \else
-       {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
-     \fi}
-};
-\ifx\@Cfoot\@empty\else
-  \node[xshift=.5\paperwidth,yshift=1cm,
-    align=center,text=\@Cfootcolor,anchor=south]
-  at (current page.south west) {\@Cfoot};
-\fi
-\end{tikzpicture}
-\end{titlepage}
-}
-}
-{\def\makecover{\ClassError{suftesi}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}}}
-}
-\def\isbn#1{\gdef\@isbn{#1}}
-\def\@issn{\@latex at warning@no at line{%
-  No \noexpand\isbn given}}
-\def\doi#1{\gdef\@doi{#1}}
-\def\@doi{\@latex at warning@no at line{%
-  No \noexpand\doi given}}
-\def\isbn#1{\gdef\@issn{#1}}
-\def\@issn{\@latex at warning@no at line{%
-  No \noexpand\isbn given}}
-\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
-\edef\title{\noexpand\@dblarg
-  \expandafter\noexpand\csname\string\title\endcsname}
-\def\@headtitle{--missing title--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given \MessageBreak%
-            See the class documentation for explanation}}
-\def\@title{--missing title--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given\MessageBreak%
-            See the class documentation for explanation}}
-\def\@author{--missing author--%
-           \protect\ClassWarningNoLine{suftesi}{%
-            No \string\author\space given\MessageBreak%
-            See the class documentation for explanation}}
-\if at titlepage
-  \renewcommand\maketitle{%
-  \begin{titlepage}
-    \let\footnotesize\small
-    \let\footnoterule\relax
-    \let \footnote \thanks
-    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-    \null\vfil
-    \vskip 60\p@
-    \begin{center}%
-      {\SUF at first\par}%
-      \vskip 3em%
-      {\lineskip .75em%
-        \begin{tabular}[t]{c}%
-          \SUF at second
-        \end{tabular}\par}%
-        \vskip 1.5em%
-      {\SUF at datefont\@date\par}%
-    \end{center}\par
-    \@thanks
-    \vfil\null
-  \end{titlepage}%
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\@date\@empty
-  \global\let\date\relax
-  \global\let\and\relax}
-\else
-\renewcommand\maketitle{\par
-   \begingroup
-     \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-     \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-     \long\def\@makefntext##1{\parindent 1em\noindent
-             \hb at xt@1.8em{%
-                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-     \if at twocolumn
-       \ifnum \col at number=\@ne
-         \@maketitle
-       \else
-         \twocolumn[\@maketitle]%
-       \fi
-     \else
-       \newpage
-       \global\@topnum\z@% Prevents figures from going at top of page.
-       \@maketitle
-     \fi
-     \thispagestyle{plain}\@thanks
-   \endgroup
-   \setcounter{footnote}{0}%
-   \global\let\thanks\relax
-   \global\let\maketitle\relax
-   \global\let\@maketitle\relax
-   \global\let\@thanks\@empty
-   \global\let\@date\@empty
-   \global\let\date\relax
-   \global\let\and\relax}
-\def\@maketitle{%
-   \newpage
-   \null
-   \vskip 2em%
-   \begin{center}%
-   \let \footnote \thanks
-     {\SUF at first\par}%
-     \vskip 1.5em%
-     {\lineskip .5em%
-       \begin{tabular}[t]{c}%
-        \SUF at second\par
-       \end{tabular}\par}%
-     \vskip 1em%
-     {\SUF at datefont\@date\par}%
-   \end{center}%
-   \par
-   \vskip 1.5em}
-\fi
+\newcommand{\partfont}[1]{\def\SUF at PART@font{#1}}
+\newcommand{\chapfont}[1]{\def\SUF at CHAP@font{#1}}
+\newcommand{\secfont}[1]{\def\SUF at SEC@font{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@font{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@font{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}\partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
+\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
+\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
+\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF at titlestyle{#1}\let\SUF at titlefont\relax}
+\newcommand{\authorfont}[1]{\def\SUF at authorstyle{#1}\let\SUF at authorfont\relax}
+\newcommand{\datefont}[1]{\def\SUF at datefont{#1}}
+\newif\ifbreakintoc\breakintocfalse
+\newif\ifbreakinbody\breakinbodytrue
+\DeclareRobustCommand{\breakintoc}
+   {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\breakinbody}
+  {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\breakinbodyleft}
+  {\ifbreakinbody\newline\else\fi}
+\let\origtableofcontents\tableofcontents
+\renewcommand{\tableofcontents}{%
+  \begingroup
+    \breakintoctrue\breakinbodyfalse%
+      \origtableofcontents
+  \endgroup}
+\DeclareRobustCommand{\headbreak}
+  {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+  {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+  {\ifbreakinbody\newline\else\fi}
 \ifsuftesi at collection
-\newcounter{journalnumber}
-\newcounter{journalvolume}
-\newcounter{issue}
-\newcounter{title}
-\setcounter{title}{1}
-\newcounter{article}
-\setcounter{article}{0}
-\setcounter{journalnumber}{0}
-\setcounter{tocdepth}{0}
-\def\journalname#1{\gdef\@journalname{#1}}
-  \def\@journalname{\@latex at warning@no at line{%
-    No \noexpand\journalname given}}
-\def\journalvolume#1{\gdef\@journalvolume{#1}}
-  \def\@journalvolume{\@latex at warning@no at line{%
-    No \noexpand\journalvolume given}}
-\def\journalnumber#1{\gdef\@journalnumber{#1}}
-  \def\@journalnumber{\@latex at warning@no at line{%
-    No \noexpand\journalnumber given}}
-\def\issue#1{\gdef\@issue{#1}}
-  \def\@issue{\@latex at warning@no at line{%
-    No \noexpand\issue given}}
-\def\journalyear#1{\gdef\@journalyear{#1}}
-  \def\@journalyear{\@latex at warning@no at line{%
-    No \noexpand\journalyear given}}
-\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
-  \def\@journalwebsite{\@latex at warning@no at line{%
-    No \noexpand\journalwebsite given}}
-\def\thanks#1{\footnotemark\ \protected at xdef\@thanks{%
-  \@thanks\protect\footnotetext[\the\c at footnote]{#1}}}
-\def\fulljournal{\emph{\@journalname} \@journalnumber, %
-  \@issue{} \@journalyear}
-\def\issuename#1{\gdef\@issuename{#1}}
-\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
-  \def\@collectiontitle{\@latex at warning@no at line{%
-    No \noexpand\collectiontitle given}}
-\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
-  \def\@collectioneditor{\@latex at warning@no at line{%
-    No \noexpand\collectioneditor given}}
-\renewcommand*{\title}[2][]{%
-  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
-    \edef\title{\noexpand\@dblarg
-  \expandafter\noexpand\csname\string\title\endcsname}
-    \def\@headtitle{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given \MessageBreak%
-            See the class documentation for explanation}}
-    \def\@title{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given\MessageBreak%
-            See the class documentation for explanation}}
-    \def\@author{--missing author--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\author\space given\MessageBreak%
-            See the class documentation for explanation}}
-\newcommand*\l at title[2]{%
-  \ifnum \c at tocdepth >\m at ne
-    \addpenalty{-\@highpenalty}%
-    \vskip 1.0ex \@plus\p@
-    \begingroup
-      \parindent \z@ \rightskip \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \advance\leftskip1em
-      \hskip -\leftskip
-      #1\nobreak%
-    \ifsuftesi at dottedtoc\dotfill%
-      \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
-        \else
-          \ifsuftesi at raggedtoc%
-            \nobreak\hskip1em #2 \hfill\null\par
-              \else
-                \ifsuftesi at pagelefttoc
-              \ClassError{suftesi}
-                {\MessageBreak
-                You can not use tocstyle=leftpage\MessageBreak
-                  with structure=collection}
-                {You can not use tocstyle=leftpage\MessageBreak
-                  with structure=collection}
-            \else
-          \nobreak\hfill #2\par
-        \fi
-      \fi
-    \fi
-      \penalty\@highpenalty
-    \endgroup
-  \fi}
-\renewcommand\maketitle{\par
-  \begingroup
-    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-    \long\def\@makefntext##1{\parindent 1em\noindent
-            \hb at xt@1.8em{%
-                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-    \if at twocolumn
-      \ifnum \col at number=\@ne
-        \@maketitle
+  \newenvironment{abstract}{%
+      \if at twocolumn
+        \section*{\abstractname}%
       \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
-      \newpage
-      \global\@topnum\z@ % Prevents figures from going at top of page.
-      \@maketitle
-    \fi
-    \thispagestyle{plain}\@thanks%
-  \endgroup
-   \setcounter{section}{0}%
-   \global\let\and\relax
-   \let\thanks\@gobble}
-\AtBeginDocument{\def\@maketitle{%
-  \refstepcounter{article}
-  \SUF at chaptersize
-   \SUF at lr@coll at titleSwitch
-    \let\footnote\thanks
-     \parindent=0pt
-    {\SUF at second}%
-   \label{begin:\thearticle}
-   \@ifundefined{Hy at raisedlink}{\let\texorpdfstring\@firstoftwo}{%
-    \xdef\@currentHref{title.\thearticle}%
-     \Hy at raisedlink{\hyper at anchorstart{\@currentHref}\hyper at anchorend}%
-    }%
-   \csname toc at entry@\endcsname
-    \begingroup%
-    \let\thanks\@gobble
-    \addcontentsline{toc}{title}{%
-    {\SUF at tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
-    {\SUF at tocTIT@font{\@headtitle}}}
-    \endgroup%
-    \par\nobreak\vspace{2ex}
-    {\SUF at first%
-    \vskip1.5cm}}%
-    }
-\newenvironment{article}
-  {\begingroup
-  \setcounter{section}{0}
-  \setcounter{footnote}{0}
-  \setcounter{figure}{0}
-  \setcounter{table}{0}}
-  {\label{end:\thearticle}
-    \cleardoublepage
-      \global\let\@thanks\@empty
-    \endgroup}
-\newcommand{\collectiontitlepage}{%
-  \thispagestyle{empty}%
-    \begingroup
-     \centering
-       \vspace*{\stretch{1}}
-
-       {\SUF at chaptersize\@collectiontitle\par}
-         \vskip5ex
-
-       \@collectioneditor
-       \vspace*{\stretch{3}}
-
-    \endgroup
-  \clearpage}
-\def\frontispiece{\collectiontitlepage}
-  \setcounter{tocdepth}{0}
-  \renewcommand\thesection{%
-          \@arabic\c at section}
-  \renewcommand\thesubsection{%
-          \thesection.\@arabic\c at subsection}
-  \renewcommand\thesubsubsection{%
-          \thesubsection.\@arabic\c at subsubsection}
-  \renewcommand\theparagraph{%
-          \thesubsubsection.\@arabic\c at paragraph}
-  \renewcommand\thesubparagraph{%
-          \theparagraph.\@arabic\c at subparagraph}
-  \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if at twocolumn\else\endquotation\fi\vspace{6ex}}
+\else
+\ifSUF at titlepage
+  \newenvironment{abstract}{%
+      \titlepage
+      \null\vfil
+      \@beginparpenalty\@lowpenalty
+      \begin{center}%
+         \abstractname
+        \@endparpenalty\@M
+      \end{center}}%
+     {\par\vfil\null\endtitlepage}
+\else
+  \newenvironment{abstract}{%
+      \if at twocolumn
+        \section*{\abstractname}%
+      \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if at twocolumn\else\endquotation\fi}
+  \fi
 \fi
-\AtBeginDocument{%
-\@ifpackagewith{frontespizio}{suftesi}{%
-\ifsuftesi at periodical
-  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at periodicalaureo
-  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at compact
-  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at compactaureo
-  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
-    \else
-\ifsuftesi at supercompact
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at supercompactaureo
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketa
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketb
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\ifsuftesi at pocketc
-  \Margini {4.5cm}{10cm}{6cm}{1cm}
-    \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\@ifpackageloaded{frontespizio}{%
-\ifsuftesi at periodical
-  \Margini {1cm}{7cm}{5cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at periodicalaureo
-  \Margini {1cm}{7cm}{5cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at compact
-  \Margini {1cm}{7cm}{6cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at compactaureo
-  \Margini {1cm}{7cm}{6cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at supercompact
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at supercompactaureo
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketa
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketb
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\ifsuftesi at pocketc
-  \Margini {1cm}{10cm}{8cm}{1cm}
-  \Rientro{1cm}
-    \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\relax}}}
-\renewenvironment{theindex}
-  {\if at twocolumn
-     \@restonecolfalse
-   \else
-     \@restonecoltrue
-   \fi
-   \ifsuftesi at article
-   \twocolumn[\section*{\indexname}]%
-   \else
-   \twocolumn[\@makeschapterhead{\indexname}]%
-   \fi
-   \@mkboth{\indexname}{\indexname}%
-   \thispagestyle{plain}%
-   \raggedright%
-   \parindent\z@
-   \parskip\z@ \@plus .3\p@\relax
-   \columnseprule \z@
-   \columnsep 35\p@
-   \let\item\@idxitem}
-  {\if at restonecol\onecolumn\else\clearpage\fi}
+\newcommand\abstractname{Abstract}
 \RequirePackage{appendix}
 \noappendicestocpagenum
 \def\appendicesname{%
@@ -2397,7 +1977,7 @@
     \interlinepenalty \@M
     \normalfont
     \SUF at chaptersize
-        \SUF at CHAP@StyleSwitch\expandafter\appendixpagename\par}%
+        \SUF at CHAP@font\expandafter\appendixpagename\par}%
   \if at dotoc@pp
   \addappheadtotoc
   \fi
@@ -2420,7 +2000,7 @@
     \interlinepenalty \@M
     \normalfont
     \SUF at chaptersize
-        \SUF at CHAP@StyleSwitch\expandafter\appendixpagename%
+        \SUF at CHAP@font\expandafter\appendixpagename%
     \markboth{}{}\par}%
   \if at dotoc@pp
   \addappheadtotoc
@@ -2444,7 +2024,7 @@
     \hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
   {}
   [\addvspace{1ex}]
-  \ifsuftesi at toccompactsec
+  \ifsuftesi at ctocsec
   \titlecontents*{section}[\SUF at tochang@chap]{}{%
     \thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{,
     \thecontentspage.}[][\adjtocpagesep][]
@@ -2473,7 +2053,7 @@
     \SUF at tocCHAP@font}
   {\SUF at chaptitlerule\contentspage}
   [\addvspace{1ex}]
-  \ifsuftesi at toccompactsec
+  \ifsuftesi at ctocsec
   \titlecontents*{section}[\SUF at tocindent@chap]{}{%
     \thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{,
     \thecontentspage.}[][\adjtocpagesep][]
@@ -2507,236 +2087,26 @@
   \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}%
   \renewcommand{\thechapter}{\@Alph\c at chapter}}
 \fi
-\RequirePackage{fancyhdr}
-\newcommand{\versionstring}[1]{\def\version at string{#1}}
-  \versionstring{Version of}
-\AtBeginDocument{%
- \pagestyle{fancy}
-  \renewcommand{\headrulewidth}{0pt}
-  \renewcommand{\footnoterule}{}
-\def\SUF at versionstring{\texttt{\version at string{} \today}}
-\renewcommand{\chaptermark}[1]{%
-  \markboth{\chaptertitlename\ \protect\SUF at HEAD@thechapter}{#1}}
-  \ifsuftesi at article
-    \renewcommand{\sectionmark}[1]{\markright{\protect\SUF at HEAD@thesection.\ #1}}
-      \else
-    \renewcommand{\sectionmark}[1]{}
-  \fi
-\fancypagestyle{plain}{\fancyhf{}}
-\fancypagestyle{sufplain}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{%
-   \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
- \fancyfoot[C]{\footnotesize\SUF at thepage}}
-\fancypagestyle{centerheader}{%
-  \fancyhf{}%
-  \fancyfoot[RE,LO]{%
-    \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
-  \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
-  \fancyhead[CE]{\footnotesize\breakinbodyfalse%
-    \SUF at LR@MarkSwitch}
-  \fancyfoot[C]{\footnotesize\SUF at thepage}}
-\fancypagestyle{sufdefault}{%
-  \fancyhf{}%
-  \fancyfoot[RE,LO]{%
-    \ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
-  \fancyhead[LE,RO]{\footnotesize\SUF at thepage}
-  \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
-  \fancyhead[RE]{\footnotesize\breakinbodyfalse%
-    \SUF at LR@MarkSwitch}}
-\ifsuftesi at article
-  \ifsuftesi at authortitle
-    \def\SUF at LR@MarkSwitch{\SUF at leftmark}
-  \else
-    \def\SUF at LR@MarkSwitch{\SUF at rightmark}
-  \fi
-\else
-  \def\SUF at LR@MarkSwitch{\SUF at leftmark}
-\fi
-\def\SUF at leftrightmark{%
-  \if at mainmatter\leftmark\else\rightmark\fi}
-\pagestyle{sufdefault}
-  \ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
-  \ifsuftesi at sufplain\pagestyle{sufplain}\else\fi}
-\renewenvironment{quotation}
-  {\list{}{\listparindent\parindent%
-    \itemindent    \listparindent
-    \SUF at quote@style
-    \parsep    \z@ \@plus\p@}%
-    \item\relax%
-    \SUF at quotation@size%
-    \noindent\ignorespaces}
-  {\endlist}
-\renewenvironment{quote}
-  {\list{}{%
-    \SUF at quote@style}%
-    \item\relax%
-    \SUF at quotation@size}% \ignorespaces?
-  {\endlist}
-\renewenvironment{verse}
-  {\let\\\@centercr
-    \list{}{\itemsep      \z@
-      \itemindent   -1.5em%
-      \listparindent\itemindent
-      \rightmargin  \leftmargin
-      \advance\leftmargin 1.5em}%
-    \item\relax
-    \SUF at quotation@size}
-  {\endlist}
-\ifsuftesi at fewfootnotes
-\AtBeginDocument{%
-\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
-  \ClassError{suftesi}%
-  {Too many footnotes\MessageBreak
-  Remove the class option 'fewfootnote'}
-  {Too many footnotes\MessageBreak
-  Remove the class option 'fewfootnote'}
-  \else\@ctrerr\fi}}}
-\def\thefootnote{\@fnsymbol\c at footnote}%
-\else\fi
-\newcommand*\xfootnote[1][*]{%
-  \xdef\@thefnmark{#1}%
-    \@footnotemark\@footnotetext}
-\def\SUF at mpsetup{%
-  \itshape
-    \footnotesize%
-    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
-    \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
-    \doublehyphendemerits=100000%
-    \finalhyphendemerits=\doublehyphendemerits}
-  \let\oldmarginpar\marginpar
-  \renewcommand{\marginpar}[1]{\oldmarginpar%
-     [\SUF at mpsetup\raggedleft\hspace{0pt}{#1}]%
-     {\SUF at mpsetup\raggedright\hspace{0pt}{#1}}}
-\AtBeginDocument{%
-\@ifpackageloaded{todonotes}{%
-  \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
-    \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
-      \node [coordinate] (inText) {};%
-    \end{tikzpicture}%
-      \oldmarginpar[{% Draw note in left margin
-      \@todonotes at drawMarginNote%
-      \@todonotes at drawLineToLeftMargin%
-      }]{% Draw note in right margin
-      \@todonotes at drawMarginNote%
-      \@todonotes at drawLineToRightMargin%
-      }
-    }
-  }
-{\relax}}
-\ifsuftesi at collection
-  \newenvironment{abstract}{%
-      \if at twocolumn
-        \section*{\abstractname}%
-      \else
-        \small
-        \begin{center}%
-          {\abstractname\vspace{-.5em}\vspace{\z@}}%
-        \end{center}%
-        \quotation
-      \fi}
-      {\if at twocolumn\else\endquotation\fi\vspace{6ex}}
-\else
-\if at titlepage
-  \newenvironment{abstract}{%
-      \titlepage
-      \null\vfil
-      \@beginparpenalty\@lowpenalty
-      \begin{center}%
-         \abstractname
-        \@endparpenalty\@M
-      \end{center}}%
-     {\par\vfil\null\endtitlepage}
-\else
-  \newenvironment{abstract}{%
-      \if at twocolumn
-        \section*{\abstractname}%
-      \else
-        \small
-        \begin{center}%
-          {\abstractname\vspace{-.5em}\vspace{\z@}}%
-        \end{center}%
-        \quotation
-      \fi}
-      {\if at twocolumn\else\endquotation\fi}
-  \fi
-\fi
-\newcommand\abstractname{Abstract}
-\newcommand{\colophon}[3][]{%
-  \thispagestyle{empty}
-  \null
-    \vfill
-     \def\next{#2}
-         \ifx\next\@empty\else
-            \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          Tutti i diritti riservati
-        \fi
-  \vfill
-  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
-     \def\next{#1}
-        \ifx\next\@empty\else su #1
-      \fi usando la classe \textsf{suftesi} di
-      Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
-      \cleardoublepage}
-\newcommand{\bookcolophon}[2]{%
-  \thispagestyle{empty}
-  \null
-    \vfill
-            \noindent #1
-  \vfill
-  {\small\noindent #2\par}
-      \cleardoublepage}
-\newcommand{\artcolophon}[1]{%
-\thispagestyle{empty}
-  \null
-    \vfill
-  {\small\noindent #1\par}}
-\newcommand{\finalcolophon}[1]{%
-\thispagestyle{empty}
-  \null\vspace*{\stretch{1}}
-  \begin{center}
-  \begin{minipage}{.5\textwidth}
-  \centering\small #1
-  \end{minipage}
-  \end{center}
-    \vspace*{\stretch{6}}}
-\ifsuftesi at FSPL
-\newcommand{\FSPLcolophon}[1][\the\year]{%
-\begingroup
-\thispagestyle{empty}
-\null\vspace{\stretch{1}}
-\noindent \hskip-.5em\cc #1 \@author%
-\vskip1ex
-
-\small\noindent This work is licensed under the Creative Commons
-Attribution-NonCommercial-NoDerivs 3.0 Unported License.
-To view a copy of this license,
-visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
-
-\endgroup
-
-\begingroup
-\footnotesize
-
-\null\vspace{\stretch{1}}
-
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
-\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
-Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
-is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
-Janusz M.~Nowacki.
-
-\endgroup
-
-\clearpage}
-\else
-\def\FSPLcolophon{%
- \ClassError{suftesi}
-   {\noexpand\FSPLcolophon is defined\MessageBreak
-     only for the FSPL styles}
-   {\noexpand\FSPLcolophon is defined\MessageBreak
-     only for the FSPL styles}}
-\fi
+\renewenvironment{theindex}
+  {\if at twocolumn
+     \@restonecolfalse
+   \else
+     \@restonecoltrue
+   \fi
+   \ifsuftesi at article
+   \twocolumn[\section*{\indexname}]%
+   \else
+   \twocolumn[\@makeschapterhead{\indexname}]%
+   \fi
+   \@mkboth{\indexname}{\indexname}%
+   \thispagestyle{plain}%
+   \raggedright%
+   \parindent\z@
+   \parskip\z@ \@plus .3\p@\relax
+   \columnseprule \z@
+   \columnsep 35\p@
+   \let\item\@idxitem}
+  {\if at restonecol\onecolumn\else\clearpage\fi}
 \RequirePackage{titletoc}
 \newlength\SUF at label@chap
 \setlength\SUF at label@chap{.5em}
@@ -2841,7 +2211,7 @@
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF at addto@tochang at chap%
       \makebox[\SUF at label@chap][l]{%
-        \SUF at CHAP@thecontentslabel}\hspace*{1em}%
+        \SUF at CHAP@contentslabel}\hspace*{1em}%
           \SUF at tocCHAP@font}
   {\hskip-\SUF at tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
@@ -2848,9 +2218,9 @@
        \hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
   {}
   [\addvspace{1ex}]
-\ifsuftesi at toccompactsec
+\ifsuftesi at ctocsec
 \titlecontents*{section}[\SUF at tochang@chap]{}{%
-  \SUF at SEC@thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{,
+  \SUF at SEC@contentslabel\adjtoclabelsep\SUF at tocSEC@font}{\SUF at tocSEC@font}{,
   \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{section}
@@ -2858,7 +2228,7 @@
   {}
   {\hskip-\SUF at tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
-    \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@sec][l]{\SUF at SEC@contentslabel}\hspace*{1em}%
        \SUF at tocSEC@font}
   {\hskip-\SUF at tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
@@ -2865,9 +2235,9 @@
      \SUF at tocSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactsubsec
+\ifsuftesi at ctocsubsec
 \titlecontents*{subsection}[\SUF at tochang@sec]{\SUF at sscorrect}{%
-  \SUF at SUBSEC@thecontentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}{\SUF at tocSUBSEC@font}{,
+  \SUF at SUBSEC@contentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}{\SUF at tocSUBSEC@font}{,
   \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{subsection}
@@ -2875,7 +2245,7 @@
   {}
   {\hskip-\SUF at tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
-    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSEC@font}
   {\hskip-\SUF at tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
@@ -2882,9 +2252,9 @@
      \SUF at tocSUBSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactsubsubsec
+\ifsuftesi at ctocsubsubsec
 \titlecontents*{subsubsection}[\SUF at tochang@subsec]{\SUF at ssscorrect}{%
-  \SUF at SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF at SUBSUBSEC@contentslabel\adjtoclabelsep%
   \SUF at tocSUBSUBSEC@font}{\SUF at tocSUBSUBSEC@font}{,
   \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -2893,7 +2263,7 @@
   {}
   {\hskip-\SUF at tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
-    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSUBSEC@font}
   {\hskip-\SUF at tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
@@ -2900,9 +2270,9 @@
      \SUF at tocSUBSUBSEC@font}
   {}
 \fi
-\ifsuftesi at toccompactpar
+\ifsuftesi at ctocpar
 \titlecontents*{paragraph}[\SUF at tochang@subsubsec]{\SUF at pcorrect}{%
- \SUF at PAR@thecontentslabel\adjtoclabelsep%
+ \SUF at PAR@contentslabel\adjtoclabelsep%
  \SUF at tocPAR@font}{\SUF at tocPAR@font}{,
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -2918,9 +2288,9 @@
    \SUF at tocPAR@font}
 {}
 \fi
-\ifsuftesi at toccompactsubpar
+\ifsuftesi at ctocsubpar
 \titlecontents*{subparagraph}[\SUF at tochang@par]{\SUF at pcorrect}{%
- \SUF at SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF at SUBPAR@contentslabel\adjtoclabelsep%
  \SUF at tocSUBPAR@font}{\SUF at tocSUBPAR@font}{,
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -2999,7 +2369,7 @@
   [\SUF at tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF at tocindent@chap%
-    \makebox[\SUF at label@chap][l]{\SUF at CHAP@thecontentslabel}%
+    \makebox[\SUF at label@chap][l]{\SUF at CHAP@contentslabel}%
     \hspace*{1em}%
       \SUF at tocCHAP@font}
   {\hskip-\SUF at tocindent@chap%
@@ -3006,9 +2376,9 @@
       \SUF at tocCHAP@font}
   {\SUF at chaptitlerule\contentspage}
   [\addvspace{1ex}]
-\ifsuftesi at toccompactsec
+\ifsuftesi at ctocsec
 \titlecontents*{section}[\SUF at tocindent@chap]{}{%
-  \SUF at SEC@thecontentslabel\adjtoclabelsep\SUF at tocSEC@font}
+  \SUF at SEC@contentslabel\adjtoclabelsep\SUF at tocSEC@font}
   {\SUF at tocSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{section}
@@ -3015,7 +2385,7 @@
   [\SUF at tocindent@sec]
   {}
   {\hskip-\dimexpr(\SUF at label@sec+1em)%
-    \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@sec][l]{\SUF at SEC@contentslabel}\hspace*{1em}%
         \SUF at tocSEC@font}
   {\hskip-\dimexpr(\SUF at label@sec+1em)%
     \SUF at tocSEC@font}
@@ -3022,9 +2392,9 @@
   {\ifsuftesi at article\SUF at chaptitlerule%
        \else\SUF at titlerule\fi\contentspage}
 \fi
-\ifsuftesi at toccompactsubsec
+\ifsuftesi at ctocsubsec
 \titlecontents*{subsection}[\SUF at tocindent@sec]{\SUF at sscorrect}{%
-  \SUF at SUBSEC@thecontentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}
+  \SUF at SUBSEC@contentslabel\adjtoclabelsep\SUF at tocSUBSEC@font}
   {\SUF at tocSUBSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
 \else
 \titlecontents{subsection}
@@ -3031,15 +2401,15 @@
   [\SUF at tocindent@subsec]
   {}
   {\hskip-\dimexpr(\SUF at label@subsec+1em)%
-    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSEC@font}
   {\hskip-\dimexpr(\SUF at label@subsec+1em)%
     \SUF at tocSUBSEC@font}
   {\SUF at titlerule\contentspage}
 \fi
-\ifsuftesi at toccompactsubsubsec
+\ifsuftesi at ctocsubsubsec
 \titlecontents*{subsubsection}[\SUF at tocindent@subsec]{\SUF at ssscorrect}{%
-  \SUF at SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF at SUBSUBSEC@contentslabel\adjtoclabelsep%
   \SUF at tocSUBSUBSEC@font}{\SUF at tocSUBSUBSEC@font}{,
   \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -3047,15 +2417,15 @@
   [\SUF at tocindent@subsubsec]
   {}
   {\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
-    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@contentslabel}\hspace*{1em}%
       \SUF at tocSUBSUBSEC@font}
   {\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
     \SUF at tocSUBSUBSEC@font}
   {\SUF at titlerule\contentspage}
 \fi
-\ifsuftesi at toccompactpar
+\ifsuftesi at ctocpar
 \titlecontents*{paragraph}[\SUF at tocindent@subsubsec]{\SUF at pcorrect}{%
- \SUF at PAR@thecontentslabel\adjtoclabelsep%
+ \SUF at PAR@contentslabel\adjtoclabelsep%
  \SUF at tocPAR@font}{\SUF at tocPAR@font}{,
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -3069,9 +2439,9 @@
      \SUF at tocPAR@font}
   {\SUF at titlerule\contentspage}
 \fi
-\ifsuftesi at toccompactsubpar
+\ifsuftesi at ctocsubpar
 \titlecontents*{subparagraph}[\SUF at tocindent@par]{\SUF at pcorrect}{%
- \SUF at SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF at SUBPAR@contentslabel\adjtoclabelsep%
  \SUF at tocSUBPAR@font}{\SUF at tocSUBPAR@font}{,
  \thecontentspage.}[][\adjtocpagesep][]
 \else
@@ -3100,34 +2470,57 @@
   {}
   {\SUF at titlerule\contentspage}
 \fi
-\titlecontents*{partialtocsection}[0cm]{}{%
- \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
- {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
- {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
- {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
- \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
- {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
- \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
- {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\newcommand{\startpartialtoc}{%
- \ifsuftesi at partialtoc\startcontents\fi}
-\newcommand{\printpartialtoc}{%
- \ifsuftesi at partialtoc
-  \setcounter{tocdepth}{5}
-   \contentsmargin{0cm}
-    \@partialtocsize
-     \@partialtocbeforespace
-      \@partialtocbeforecode\par
-       \printcontents{partialtoc}{1}{}
-      \par\@partialtocaftercode
-    \@partialtocafterspace
- \fi}
+\ifSUF at partialtoc
+  \titlecontents*{partialtocsection}[0cm]{}{%
+   \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
+   {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \ifsuftesi at article
+  \titlecontents*{partialtocsubsection}[0cm]{}{%
+   \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+   {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \else
+  \titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
+   \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+   {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+   \fi
+  \titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
+   \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
+   {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+  \titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
+   \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
+   {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+  \titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
+   \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
+   {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+    \ifsuftesi at article
+        \let\startsecpartialtoc\startcontents
+        \let\startchappartialtoc\relax
+      \else
+        \let\startchappartialtoc\startcontents
+        \let\startsecpartialtoc\relax
+    \fi
+  \newcommand{\printpartialtoc}{%
+    \setcounter{tocdepth}{5}
+     \contentsmargin{0cm}
+      \@partialtocsize
+       \@partialtocbeforespace
+        \@partialtocbeforecode\par
+         \ifsuftesi at article
+         \printcontents{partialtoc}{2}{}
+         \else
+         \printcontents{partialtoc}{1}{}
+         \fi
+        \par\@partialtocaftercode
+      \@partialtocafterspace
+   }
+\else
+  \let\startchappartialtoc\relax
+  \let\startsecpartialtoc\relax
+  \def\printpartialtoc{%
+    \ClassWarningNoLine{suftesi}%
+      {To activate \string\printpartialtoc\MessageBreak
+      load the 'partialtoc' option}}
+\fi
 \ifsuftesi at article
 \renewcommand\tableofcontents{%
     \vspace{2ex}%
@@ -3234,19 +2627,6 @@
 \fi
 \newcommand{\tocpartname}[1]{\def\SUF at tocpartname{#1}}
   \tocpartname{\partname}
-\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}\partnumfont{}
-\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
-\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
-\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
-\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
-\newcommand{\titlefont}[1]{\def\SUF at Tfont@style{#1}\let\SUF at Tfont@shape\relax}
-\newcommand{\authorfont}[1]{\def\SUF at Afont@style{#1}\let\SUF at Afont@shape\relax}
-\newcommand{\datefont}[1]{\def\SUF at datefont{#1}}
 \newcommand{\tocpartfont}[1]{\def\SUF at tocPART@font{#1}}
 \newcommand{\tocchapfont}[1]{\def\SUF at tocCHAP@font{#1}}
 \newcommand{\tocsecfont}[1]{\def\SUF at tocSEC@font{#1}}
@@ -3256,17 +2636,17 @@
 \newcommand{\tocsubparfont}[1]{\def\SUF at tocSUBPAR@font{#1}}
 \newcommand{\tocpartnumfont}[1]{\def\SUF at tocPARTnum@font{#1}}\tocpartnumfont{}
 \newcommand{\tocchapnumfont}[1]{%
-  \def\SUF at CHAP@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at CHAP@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsecnumfont}[1]{%
-  \def\SUF at SEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubsecnumfont}[1]{%
-  \def\SUF at SUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubsubsecnumfont}[1]{%
-  \def\SUF at SUBSUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\SUF at SUBSUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocparnumfont}[1]{%
- \def\SUF at PAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF at PAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \newcommand{\tocsubparnumfont}[1]{%
- \def\SUF at SUBPAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF at SUBPAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
 \tocparnumfont{}
 \tocsubparnumfont{}
 \newcommand{\partialtocsize}[1]{%
@@ -3282,15 +2662,15 @@
 \newcommand{\partialtocsubparfont}[1]{%
  \def\@partialtocsubparfont{#1}}
 \newcommand{\partialtocseclabel}[1]{%
-  \def\@partialtocseclabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\@partialtocseclabel{\begingroup#1\thecontentslabel~\endgroup}}
 \newcommand{\partialtocsubseclabel}[1]{%
-  \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel~\endgroup}}
 \newcommand{\partialtocsubsubseclabel}[1]{%
-  \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+  \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel~\endgroup}}
 \newcommand{\partialtocparlabelfont}[1]{%
- \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel~\endgroup}}
 \newcommand{\partialtocsubparlabelfont}[1]{%
- \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel~\endgroup}}
 \newcommand{\partialtocbeforespace}[1]{%
   \def\@partialtocbeforespace{\vspace*{#1}}}
 \newcommand{\partialtocafterspace}[1]{%
@@ -3305,51 +2685,626 @@
 \partialtocsubsubsecfont{}
 \partialtocparfont{}
 \partialtocsubparfont{}
-\partialtocseclabel{\itshape}
+\partialtocseclabel{}
 \partialtocsubseclabel{}
 \partialtocsubsubseclabel{}
 \partialtocparlabelfont{}
 \partialtocsubparlabelfont{}
-\partialtocbeforespace{18ex}
-\partialtocafterspace{-18ex}
+\partialtocbeforespace{0pt}
+\partialtocafterspace{0pt}
 \partialtocbeforecode{}
 \partialtocaftercode{}
+\RequirePackage{fancyhdr}
+\newcommand{\versionstring}[1]{\def\version at string{#1}}
+  \versionstring{Version of}
+\ifSUF at draftdate
+  \def\SUF at versionof{\footnotesize\texttt{\version at string{} \today}}
+\else
+  \let\SUF at versionof\relax
+\fi
+\AtBeginDocument{%
+ \pagestyle{fancy}
+  \renewcommand{\headrulewidth}{0pt}
+  \renewcommand{\footnoterule}{}}
+\renewcommand{\chaptermark}[1]{%
+  \markboth{\chaptertitlename\ \SUF at HEAD@thechapter}{#1}}
+  \ifsuftesi at article
+    \renewcommand{\sectionmark}[1]{\markright{\SUF at HEAD@thesection.\ #1}}
+      \else
+    \renewcommand{\sectionmark}[1]{}
+  \fi
+\fancypagestyle{plain}{\fancyhf{}\fancyfoot[RE,LO]{\SUF at versionof}}
+\fancypagestyle{empty}{\fancyhf{}\fancyfoot[RE,LO]{\SUF at versionof}}
+\fancypagestyle{sufplain}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\SUF at versionof}
+ \fancyfoot[C]{\footnotesize\SUF at thepage}}
+\fancypagestyle{centerheader}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{\SUF at versionof}
+  \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+  \fancyhead[CE]{\footnotesize\breakinbodyfalse\SUF at mark}
+  \fancyfoot[C]{\footnotesize\SUF at thepage}}
+\fancypagestyle{sufdefault}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{\SUF at versionof}
+  \fancyhead[LE,RO]{\footnotesize\SUF at thepage}
+  \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+  \fancyhead[RE]{\footnotesize\breakinbodyfalse\SUF at mark}}
 \ifsuftesi at article
-\def\chapterintro{%
-\ClassError{suftesi}
-  {Command \noexpand\chapterintro is undefined\MessageBreak
-     using 'structure=article'}
-  {Command \noexpand\chapterintro is undefined\MessageBreak
-     using 'structure=article'}}
+  \ifsuftesi at authortitle
+    \def\SUF at mark{\SUF at leftmark}
+  \else
+    \def\SUF at mark{\SUF at rightmark}
+  \fi
 \else
-\def\chapterintro{\@ifstar{%
-  \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
-\def\@chapterintro{\phantomsection
-  \if at tempswa\section*{\SUF at fchapterintroname}\fi
-  \addcontentsline{toc}{section}{\SUF at fchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\SUF at fchapterintroname{#1}}
-\chapterintroname{Introduzione}
+  \def\SUF at mark{\SUF at leftmark}
 \fi
-\newif\ifbreakintoc\breakintocfalse
-\newif\ifbreakinbody\breakinbodytrue
-\DeclareRobustCommand{\breakintoc}
-   {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\breakinbody}
-  {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\breakinbodyleft}
-  {\ifbreakinbody\newline\else\fi}
-\let\origtableofcontents\tableofcontents
-\renewcommand{\tableofcontents}{%
-  \begingroup\suftesi at partialtocfalse
-    \breakintoctrue\breakinbodyfalse%
-      \origtableofcontents
-  \endgroup}
-\DeclareRobustCommand{\headbreak}
-  {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\xheadbreak}
-  {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\yheadbreak}
-  {\ifbreakinbody\newline\else\fi}
+\def\SUF at leftrightmark{%
+  \if at mainmatter\leftmark\else\rightmark\fi}
+\pagestyle{sufdefault}
+  \ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
+  \ifsuftesi at sufplain\pagestyle{sufplain}\else\fi
+\renewenvironment{quotation}
+  {\list{}{\listparindent\parindent%
+    \itemindent    \listparindent
+    \SUF at quote@style
+    \parsep    \z@ \@plus\p@}%
+    \item\relax%
+    \SUF at quotation@size%
+    \noindent\ignorespaces}
+  {\endlist}
+\renewenvironment{quote}
+  {\list{}{%
+    \SUF at quote@style}%
+    \item\relax%
+    \SUF at quotation@size}% \ignorespaces?
+  {\endlist}
+\renewenvironment{verse}
+  {\let\\\@centercr
+    \list{}{\itemsep      \z@
+      \itemindent   -1.5em%
+      \listparindent\itemindent
+      \rightmargin  \leftmargin
+      \advance\leftmargin 1.5em}%
+    \item\relax
+    \SUF at quotation@size}
+  {\endlist}
+\ifSUF at fewfootnotes
+\RequirePackage[perpage]{zref}
+ \zmakeperpage{footnote}
+\AtBeginDocument{%
+\def\@fnsymbol#1{%
+   \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+   \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+   \TextOrMath {\textasteriskcentered%
+                \textasteriskcentered\textasteriskcentered}{***}\or
+  \protect\ClassWarningNoLine{suftesi}%
+  {Too many footnotes per page. Compile again or\MessageBreak
+   remove the class option 'fewfootnote'}
+  \fi
+}%
+}
+\def\thefootnote{\@fnsymbol\c at footnote}%
+\fi
+\newcommand*\xfootnote[1][*]{%
+  \xdef\@thefnmark{#1}%
+    \@footnotemark\@footnotetext}
+\let\oldmarginpar\marginpar
+\ifSUF at marginpar
+  \def\SUF at mpsetup{%
+    \itshape
+      \footnotesize%
+      \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
+      \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
+      \doublehyphendemerits=100000%
+      \finalhyphendemerits=\doublehyphendemerits}
+    \renewcommand{\marginpar}[1]{\oldmarginpar%
+       [\SUF at mpsetup\raggedleft\hspace{0pt}{#1}]%
+       {\SUF at mpsetup\raggedright\hspace{0pt}{#1}}}
+\else
+  \renewcommand\marginpar[2][]{}
+\fi
+\AtBeginDocument{%
+\@ifpackageloaded{todonotes}{%
+  \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
+    \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+      \node [coordinate] (inText) {};%
+    \end{tikzpicture}%
+      \oldmarginpar[{% Draw note in left margin
+      \@todonotes at drawMarginNote%
+      \@todonotes at drawLineToLeftMargin%
+      }]{% Draw note in right margin
+      \@todonotes at drawMarginNote%
+      \@todonotes at drawLineToRightMargin%
+      }
+    }
+  }
+{\relax}}
+\ifsuftesi at collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\newcounter{article}
+\setcounter{article}{0}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+  \def\@journalname{\@latex at warning@no at line{%
+    No \noexpand\journalname given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+  \def\@journalvolume{\@latex at warning@no at line{%
+    No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+  \def\@journalnumber{\@latex at warning@no at line{%
+    No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+  \def\@issue{\@latex at warning@no at line{%
+    No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+  \def\@journalyear{\@latex at warning@no at line{%
+    No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+  \def\@journalwebsite{\@latex at warning@no at line{%
+    No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected at xdef\@thanks{%
+  \@thanks\protect\footnotetext[\the\c at footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+  \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+  \def\@collectiontitle{\@latex at warning@no at line{%
+    No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+  \def\@collectioneditor{\@latex at warning@no at line{%
+    No \noexpand\collectioneditor given}}
+\renewcommand*{\title}[2][]{%
+  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
+    \edef\title{\noexpand\@dblarg
+  \expandafter\noexpand\csname\string\title\endcsname}
+    \def\@headtitle{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given \MessageBreak%
+            See the class documentation for explanation}}
+    \def\@title{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given\MessageBreak%
+            See the class documentation for explanation}}
+    \def\@author{--missing author--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\author\space given\MessageBreak%
+            See the class documentation for explanation}}
+\newcommand*\l at title[2]{%
+  \ifnum \c at tocdepth >\m at ne
+    \addpenalty{-\@highpenalty}%
+    \vskip 1.0ex \@plus\p@
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \advance\leftskip1em
+      \hskip -\leftskip
+      #1\nobreak%
+    \ifsuftesi at dottedtoc\dotfill%
+      \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
+        \else
+          \ifsuftesi at raggedtoc%
+            \nobreak\hskip1em #2 \hfill\null\par
+              \else
+                \ifsuftesi at pagelefttoc
+              \ClassError{suftesi}
+                {\MessageBreak
+                You can not use tocstyle=leftpage\MessageBreak
+                  with structure=collection}
+                {You can not use tocstyle=leftpage\MessageBreak
+                  with structure=collection}
+            \else
+          \nobreak\hfill #2\par
+        \fi
+      \fi
+    \fi
+      \penalty\@highpenalty
+    \endgroup
+  \fi}
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb at xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if at twocolumn
+      \ifnum \col at number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@ % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks%
+  \endgroup
+   \setcounter{section}{0}%
+   \global\let\and\relax
+   \let\thanks\@gobble}
+\AtBeginDocument{\def\@maketitle{%
+  \refstepcounter{article}
+  \SUF at chaptersize
+   \SUF at authortitle@align
+    \let\footnote\thanks
+     \parindent=0pt
+    {\SUF at second}%
+   \label{begin:\thearticle}
+   \@ifundefined{Hy at raisedlink}{\let\texorpdfstring\@firstoftwo}{%
+    \xdef\@currentHref{title.\thearticle}%
+     \Hy at raisedlink{\hyper at anchorstart{\@currentHref}\hyper at anchorend}%
+    }%
+   \csname toc at entry@\endcsname
+    \begingroup%
+    \let\thanks\@gobble
+    \addcontentsline{toc}{title}{%
+    {\SUF at tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
+    {\SUF at tocTIT@font{\@headtitle}}}
+    \endgroup%
+    \par\nobreak\vspace{2ex}
+    {\SUF at first%
+    \vskip1.5cm}}%
+    }
+\newenvironment{article}
+  {\begingroup
+  \setcounter{section}{0}
+  \setcounter{footnote}{0}
+  \setcounter{figure}{0}
+  \setcounter{table}{0}}
+  {\label{end:\thearticle}
+    \cleardoublepage
+      \global\let\@thanks\@empty
+    \endgroup}
+\newcommand{\collectiontitlepage}{%
+  \thispagestyle{empty}%
+    \begingroup
+     \centering
+       \vspace*{\stretch{1}}
+
+       {\SUF at chaptersize\@collectiontitle\par}
+         \vskip5ex
+
+       \@collectioneditor
+       \vspace*{\stretch{3}}
+
+    \endgroup
+  \clearpage}
+\def\frontispiece{\collectiontitlepage}
+  \setcounter{tocdepth}{0}
+  \renewcommand\thesection{%
+          \@arabic\c at section}
+  \renewcommand\thesubsection{%
+          \thesection.\@arabic\c at subsection}
+  \renewcommand\thesubsubsection{%
+          \thesubsection.\@arabic\c at subsubsection}
+  \renewcommand\theparagraph{%
+          \thesubsubsection.\@arabic\c at paragraph}
+  \renewcommand\thesubparagraph{%
+          \theparagraph.\@arabic\c at subparagraph}
+  \else
+\fi
+\def\isbn#1{\gdef\@isbn{#1}}
+\def\@issn{\@latex at warning@no at line{%
+  No \noexpand\isbn given}}
+\def\doi#1{\gdef\@doi{#1}}
+\def\@doi{\@latex at warning@no at line{%
+  No \noexpand\doi given}}
+\def\isbn#1{\gdef\@issn{#1}}
+\def\@issn{\@latex at warning@no at line{%
+  No \noexpand\isbn given}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\edef\title{\noexpand\@dblarg
+  \expandafter\noexpand\csname\string\title\endcsname}
+\def\@headtitle{--missing title--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given \MessageBreak%
+            See the class documentation for explanation}}
+\def\@title{--missing title--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given\MessageBreak%
+            See the class documentation for explanation}}
+\def\@author{--missing author--%
+           \protect\ClassWarningNoLine{suftesi}{%
+            No \string\author\space given\MessageBreak%
+            See the class documentation for explanation}}
+\ifSUF at titlepage
+  \renewcommand\maketitle{%
+  \begin{titlepage}
+    \let\footnotesize\small
+    \let\footnoterule\relax
+    \let \footnote \thanks
+    \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+    \null\vfil
+    \vskip 60\p@
+    \begin{center}%
+      {\SUF at first\par}%
+      \vskip 3em%
+      {\lineskip .75em%
+        \begin{tabular}[t]{c}%
+          \SUF at second
+        \end{tabular}\par}%
+        \vskip 1.5em%
+      {\SUF at datefont\@date\par}%
+    \end{center}\par
+    \@thanks
+    \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@date\@empty
+  \global\let\date\relax
+  \global\let\and\relax}
+\else
+\renewcommand\maketitle{\par
+   \begingroup
+     \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
+     \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+     \long\def\@makefntext##1{\parindent 1em\noindent
+             \hb at xt@1.8em{%
+                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+     \if at twocolumn
+       \ifnum \col at number=\@ne
+         \@maketitle
+       \else
+         \twocolumn[\@maketitle]%
+       \fi
+     \else
+       \newpage
+       \global\@topnum\z@% Prevents figures from going at top of page.
+       \@maketitle
+     \fi
+     \thispagestyle{plain}\@thanks
+   \endgroup
+   \setcounter{footnote}{0}%
+   \global\let\thanks\relax
+   \global\let\maketitle\relax
+   \global\let\@maketitle\relax
+   \global\let\@thanks\@empty
+   \global\let\@date\@empty
+   \global\let\date\relax
+   \global\let\and\relax}
+\def\@maketitle{%
+   \newpage
+   \null
+   \vskip 2em%
+   \begin{center}%
+   \let \footnote \thanks
+     {\SUF at first\par}%
+     \vskip 1.5em%
+     {\lineskip .5em%
+       \begin{tabular}[t]{c}%
+        \SUF at second\par
+       \end{tabular}\par}%
+     \vskip 1em%
+     {\SUF at datefont\@date\par}%
+   \end{center}%
+   \par
+   \vskip 1.5em}
+\fi
+\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
+\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
+\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
+\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
+\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
+\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
+\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
+\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
+\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
+\Cauthor{}
+\Ctitle{}
+\Csubtitle{}
+\Ceditor{}
+\Cfoot{}
+\Cpagecolor{gray!30}
+\Ctextcolor{white}
+\Cfootcolor{black}
+\AtBeginDocument{
+\@ifpackageloaded{tikz}{%
+\newcommand\makecover[1][]{%
+\begin{titlepage}
+\begin{tikzpicture}[overlay,remember picture]
+  \draw[draw=none,fill=\@Cpagecolor]
+    (current page.north west) rectangle (current page.south east);
+  \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
+  \draw[draw=none,fill=gray,#1]
+    (c)  circle (.38\paperwidth) ;
+  \node[anchor=center] at (c) (author) {%
+\parbox{.7\paperwidth}{%
+  \centering
+    \ifx\@Cauthor\@empty
+     \else
+       {\scshape\color{\@Ctextcolor}\@Cauthor\\}
+       \vspace*{\baselineskip}
+     \fi
+
+     \ifx\@Ctitle\@empty
+     \else
+     {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
+     \fi
+
+    \ifx\@Csubtitle\@empty
+     \else
+       {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
+     \fi
+
+    \ifx\@Ceditor\@empty
+     \else
+       {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
+     \fi}
+};
+\ifx\@Cfoot\@empty\else
+  \node[xshift=.5\paperwidth,yshift=1cm,
+    align=center,text=\@Cfootcolor,anchor=south]
+  at (current page.south west) {\@Cfoot};
+\fi
+\end{tikzpicture}
+\end{titlepage}
+}
+}
+{\def\makecover{\ClassError{suftesi}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}}}
+}
+\AtBeginDocument{%
+\@ifpackagewith{frontespizio}{suftesi}{%
+\ifsuftesi at periodical
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at periodicalaureo
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at compact
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at compactaureo
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi at supercompact
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at supercompactaureo
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketa
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketb
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi at pocketc
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\@ifpackageloaded{frontespizio}{%
+\ifsuftesi at periodical
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at periodicalaureo
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at compact
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at compactaureo
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at supercompact
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at supercompactaureo
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketa
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketb
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi at pocketc
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\relax}}}
+\newcommand{\colophon}[3][]{%
+  \thispagestyle{empty}
+  \null
+    \vfill
+     \def\next{#2}
+         \ifx\next\@empty\else
+            \noindent Copyright \copyright{} \the\year~#2\\[1ex]
+          Tutti i diritti riservati
+        \fi
+  \vfill
+  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
+     \def\next{#1}
+        \ifx\next\@empty\else su #1
+      \fi usando la classe \textsf{suftesi} di
+      Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
+      \cleardoublepage}
+\newcommand{\bookcolophon}[2]{%
+  \thispagestyle{empty}
+  \null
+    \vfill
+            \noindent #1
+  \vfill
+  {\small\noindent #2\par}
+      \cleardoublepage}
+\newcommand{\artcolophon}[1]{%
+\thispagestyle{empty}
+  \null
+    \vfill
+  {\small\noindent #1\par}}
+\newcommand{\finalcolophon}[1]{%
+\thispagestyle{empty}
+  \null\vspace*{\stretch{1}}
+  \begin{center}
+  \begin{minipage}{.5\textwidth}
+  \centering\small #1
+  \end{minipage}
+  \end{center}
+    \vspace*{\stretch{6}}}
+\ifsuftesi at FSPL
+\newcommand{\FSPLcolophon}[1][\the\year]{%
+\begingroup
+\thispagestyle{empty}
+\null\vspace{\stretch{1}}
+\noindent \hskip-.5em\cc #1 \@author%
+\vskip1ex
+
+\small\noindent This work is licensed under the Creative Commons
+Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+To view a copy of this license,
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+
+\endgroup
+
+\begingroup
+\footnotesize
+
+\null\vspace{\stretch{1}}
+
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
+Janusz M.~Nowacki.
+
+\endgroup
+
+\clearpage}
+\else
+\def\FSPLcolophon{%
+ \ClassError{suftesi}
+   {\noexpand\FSPLcolophon is defined\MessageBreak
+     only for the FSPL styles}
+   {\noexpand\FSPLcolophon is defined\MessageBreak
+     only for the FSPL styles}}
+\fi
 \newenvironment{bibliografia}{%
   \ifsuftesi at article
     \section*{\refname}
@@ -3378,6 +3333,22 @@
       \let\makelabel\itlabel}}
   {\endlist}
 \ifsuftesi at article
+\def\chapterintro{%
+\ClassError{suftesi}
+  {Command \noexpand\chapterintro is undefined\MessageBreak
+     using 'structure=article'}
+  {Command \noexpand\chapterintro is undefined\MessageBreak
+     using 'structure=article'}}
+\else
+\def\chapterintro{\@ifstar{%
+  \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
+\def\@chapterintro{\phantomsection
+  \if at tempswa\section*{\SUF at fchapterintroname}\fi
+  \addcontentsline{toc}{section}{\SUF at fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF at fchapterintroname{#1}}
+\chapterintroname{Introduzione}
+\fi
+\ifsuftesi at article
 \renewcommand\frontmatter{\ClassError{suftesi}
   {Command \noexpand\frontmatter is undefined\MessageBreak
      using 'structure=article'}
@@ -3404,8 +3375,6 @@
 \let\hemph\emph
 \unless\ifPDFTeX% if xetex or luatex
   \let\@afterindenttrue\@afterindentfalse
-    \else
-  \relax
 \fi
 \frenchspacing
 \endinput



More information about the tex-live-commits mailing list.