suftesi (9feb20)

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

4 files changed, 403 insertions, 229 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 243d1d378a2..14b155c2f60 100644
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/templates.zip b/Master/texmf-dist/doc/latex/suftesi/templates.zip
new file mode 100644
index 00000000000..831e7bf5f53
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/templates.zip
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 1c39a5238eb..5a37ee830ee 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -67,7 +67,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2020/01/29 v2.9.3 A class for typesetting theses, books and articles]
+    [2020/02/04 v2.9.5 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -175,7 +175,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4902}
+% \CheckSum{5108}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -193,6 +193,8 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}.}
+% \changes{v2.9.4}{2020/01/01}{Updated documentation.}
 % \changes{v2.9.3}{2020/01/29}{Updated documentation.}
 % \changes{v2.9.2}{2019/10/26}{Added \cmd{protect} to \cmd{SUF@thechapter} and \cmd{SUF@thesection} in the definitions of \cmd{chaptermark} and \cmd{sectionmark} to correct a bug when loading \texttt{greek} option with \sty{babel}}
 % \changes{v2.9.1}{2018/11/09}{Added \sty{libertinust1math} package for Libertine font. Added \sty{luatex85} for Lua\TeX{} engine}
@@ -360,7 +362,7 @@
 %\fontsize{9.5}{11.5}\selectfont
 %\begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{7.6cm}}
 %\toprule
-%&\textrm{Global}&{caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks}, 
+%&\textrm{Global}& appendix, {caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks}, 
 %{fancyhdr}, {fixltxhyph}, {fontenc}, {geometry}, {iftex},
 %{microtype}, {multicol}, {titlesec}, {titletoc}, {xkeyval}, (cclicenses)\\\midrule
 %&\textrm{pdf\LaTeX{} only}&fontenc, substitutefont\\\midrule
@@ -652,6 +654,32 @@
 %To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
 %
 %
+% \subsection{Appendices}
+% Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment. 
+%\begin{latexcode}
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\renewcommand{\appendixname}{Appendix}
+%\addappheadtotoc
+%
+%\begin{document}
+%...
+%\appendixpage
+%
+%\begin{appendices}
+%	
+%  \chapter{First appendix}
+%    Lorem ipsum
+%	
+%  \chapter{First appendix}
+%    Lorem ipsum
+%	
+%\end{appendices}
+%\end{document}
+%\end{verbatim}
+%\end{latexcode}
+% 
+%
 % \section{Options}\label{sec:options}
 %
 % \subsection{Layout}\label{sec:page-styles}
@@ -797,7 +825,8 @@
 %     \item[dotroman] As \opt{roman} but followed by a dot.
 %     \item[dotRoman] As \opt{Roman} but followed by a dot.
 %   \end{valuelist}
-%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+%   \opt{subsec}, \opt{subsubsec}.
 % \end{optionlist}
 %
 %
@@ -1201,9 +1230,69 @@
 %     inside the text}
 %\end{verbatim}
 % \end{latexcode}
-%
 % \end{ltxsyntax}
 %
+% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
+% \subsection{Section titles}\label{sec:secfont}
+% \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section titles and numbers.}
+%
+% The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing  accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on. 
+%
+%\begin{ltxsyntax}
+% \cmditem{<level>font}{definition}\hfill(default=\texttt{empty})
+%
+% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
+%
+%\begin{latexcode}
+%\begin{verbatim}
+% \chapfont{\bfseries\sffamily\scshape\Huge}
+% \secfont{\sffamily\fontsize{15.5}{17.5}}
+%\end{verbatim}
+%\end{latexcode}
+%
+% \cmditem{<level>numfont}{definition}\hfill(default=\texttt{empty})
+%
+% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
+%
+%\begin{latexcode}
+%\begin{verbatim}
+%\chapnumfont{%
+%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
+%\color{gray}\arabic{chapter}\hskip-15cm}
+%\end{verbatim}
+%\end{latexcode}
+% Combining these commands you can get something like this (or something worse/better):
+%\begin{latexcode}
+%\begin{verbatim}
+%\documentclass[pagelayout=periodicalaureo,11pt,
+%version=cscreen,chapstyle=parright]{suftesi}
+%
+%\chapfont{\bfseries\sffamily\scshape\LARGE}
+%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
+%
+%\chapnumfont{\hskip1cm\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%\chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}\hskip-1cm}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%
+%\begin{document}
+%
+%\chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
+%
+%\section{Dolor sit amet}	
+%\lipsum[1-2]
+%
+%\section{Lorem ipsum dolor sit amet}
+%\subsection{Dolor sit amet}
+%\lipsum[1]
+%
+%\end{document}
+%\end{verbatim}
+%\end{latexcode}
+%\end{ltxsyntax}
+%
 % \subsection{Miscellaneous}
 %
 % \begin{ltxsyntax}
@@ -1262,37 +1351,6 @@
 %
 %\end{ltxsyntax}
 %
-% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-%
-% \section{Sections font}\label{sec:secfont}
-%
-% \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section/number title}
-% 
-%
-%\begin{ltxsyntax}
-% \cmditem{<level>font}{commands}\hfill(default=\texttt{empty})
-%
-% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
-%
-%\begin{latexcode}
-%\begin{verbatim}
-% \chapfont{\bfseries\sffamily\scshape\Huge}
-%\end{verbatim}
-%\end{latexcode}
-%
-%^^A \cmditem{{level}numfont}{commands}\hfill(default=\texttt{empty})
-%
-% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. Note that you have to adjust the spacing accordingly. For example, with the default chapter style:
-%
-%\begin{latexcode}
-%\begin{verbatim}
-%\chapnumfont{%
-   %\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-   %\color{gray}\arabic{chapter}\hskip-15cm}
-%\end{verbatim}
-%\end{latexcode}
-%
-%\end{ltxsyntax}
 %
 % \section{Collections}\label{sec:collection}
 %
@@ -1398,6 +1456,21 @@
 % \cmditem{collectioneditor}{The Editor(s)} 
 %
 % Sets the editor(s) of the collection.
+%
+% \cmditem{titlefont}{definition}\hfill(default=\texttt{empty})
+%
+% \changes{v2.9.4}{2020/001/29}{New commands to change the font of the title of the articles and of the author's name in the collections}
+%
+% \cmditem{authorfont}{definition}\hfill(default=\texttt{empty})
+%
+% Changes the font of the title of the articles and of the author's name. For example:
+%
+%\begin{latexcode}
+%\begin{verbatim}
+% \titlefont{\bfseries\sffamily\scshape}	
+% \authorfont{\itshape\sffamily}
+%\end{verbatim}
+%\end{latexcode}
 %\end{ltxsyntax}
 %
 % \section{Known issues}
@@ -1714,13 +1787,16 @@
 \define@choicekey{}{structure}[\val\nr]
     {book,article,collection}[book]{%
 \ifcase\nr\relax
-\disable@keys{}{secnumstyle}
+%^^A\disable@keys{}{secnumstyle}
+\def\SUF@chapswitch{\thechapter.}
 \or
 \suftesi@articletrue
 \@titlepagefalse
+\def\SUF@chapswitch{}
 \or
 \suftesi@collectiontrue
   \setkeys{}{headerstyle=authortitleinner}
+\def\SUF@chapswitch{}
 \fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
@@ -2011,6 +2087,14 @@
 %    \end{macrocode}
 % \subsection*{TOC font}
 %    \begin{macrocode}
+%^^A\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+%^^A\ifcase\nr\relax
+%^^A\def\SUF@tocPART@font{\relax}
+%^^A\or
+%^^A\def\SUF@tocPART@font{\itshape}
+%^^A\or
+%^^A\def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps}
+%^^A\fi}
 \define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
 \def\SUF@tocCHAP@font{\relax}
@@ -2068,27 +2152,27 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{}
+%^^A  \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{\scshape\@roman}
+%^^A  \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{\@Roman}
+%^^A  \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{}
+%^^A  \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
+%^^A  \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{\@Roman}
+%^^A  \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Chapter number style}
@@ -2099,32 +2183,32 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{}
+  \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{}
+  \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Section number style}
@@ -2132,35 +2216,35 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
-  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{}
+  \def\SUF@SEC@thecontentslabel{\thecontentslabel}
 \or
-  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}}
   \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
-  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{}
+  \def\SUF@SEC@thecontentslabel{\thecontentslabel}
 \or
-  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}}
   \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Subsection number style}
@@ -2168,29 +2252,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \define@choicekey{}{subsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 	\ifcase\nr\relax
-	\def\SUF@thesubsection{\arabic{subsection}}
+	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
 	\def\SUF@dotsubsec{}
-	\def\SUF@toclabelnum{}
+	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
 	\or
-	\def\SUF@thesubsection{\textsc{\roman{subsection}}}
+	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
 	\def\SUF@dotsubsec{}
-	\def\SUF@toclabelnum{\scshape\@roman}
+	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 	\or
-	\def\SUF@thesubsection{\Roman{subsection}}
+	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
 	\def\SUF@dotsubsec{}
-	\def\SUF@toclabelnum{\@Roman}
+	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 	\or
-	\def\SUF@thesubsection{\arabic{subsection}}
+	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
 	\def\SUF@dotsubsec{.}
-	\def\SUF@toclabelnum{}
+	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
 	\or
-	\def\SUF@thesubsection{\textsc{\roman{subsection}}}
+	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
 	\def\SUF@dotsubsec{.}
-	\def\SUF@toclabelnum{\scshape\@roman}
+	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 	\or
-	\def\SUF@thesubsection{\Roman{subsection}}
+	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
 	\def\SUF@dotsubsec{.}
-	\def\SUF@toclabelnum{\@Roman}
+	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 	\fi}
 %    \end{macrocode}
 % \subsubsection*{Sub-subsection number style}
@@ -2198,29 +2282,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 	\ifcase\nr\relax
-	\def\SUF@thesubsubsection{\arabic{subsubsection}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
 	\def\SUF@dotsubsubsec{}
-	\def\SUF@toclabelnum{}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
 	\or
-	\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
 	\def\SUF@dotsubsubsec{}
-	\def\SUF@toclabelnum{\scshape\@roman}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 	\or
-	\def\SUF@thesubsubsection{\Roman{subsubsection}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
 	\def\SUF@dotsubsubsec{}
-	\def\SUF@toclabelnum{\@Roman}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 	\or
-	\def\SUF@thesubsubsection{\arabic{subsubsection}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
 	\def\SUF@dotsubsubsec{.}
-	\def\SUF@toclabelnum{}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
 	\or
-	\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
 	\def\SUF@dotsubsubsec{.}
-	\def\SUF@toclabelnum{\scshape\@roman}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 	\or
-	\def\SUF@thesubsubsection{\Roman{subsubsection}}
+	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
 	\def\SUF@dotsubsubsec{.}
-	\def\SUF@toclabelnum{\@Roman}
+	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 	\fi}
 %    \end{macrocode}
 % This option controls the style of small capitals used in the 
@@ -2247,6 +2331,23 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
 \newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
 \newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
+%
+\newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}}
+%
+%^^A\newcommand{\tocpartfont}[1]{\def\SUF@tocPART@font{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
+
+%^^A\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+
+%
 %    \end{macrocode}
 % \subsection*{Headers}
 %
@@ -2836,6 +2937,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsection*{Execute and process options}
 %    \begin{macrocode}
 \ExecuteOptionsX<>{
+  structure=book,
   captionstyle=standard,
   marginpar=true,
   parindent=compact,
@@ -4111,49 +4213,99 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 %    \end{macrocode}
 % \subsection*{Appendix}
 %    \begin{macrocode}
-\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
-    \appendicesname{Appendici}
-    \newcommand{\appendixpage}{\SUF@appendixpage}
-\def\SUF@appendixpage{%
-  \@mainmattertrue
-    \titlecontents{part}                                                  
-      [0em]                                                                    
-      {\addvspace{3ex}}
-      {}
-      {}
-      {}
-      [\addvspace{1ex}]
-\let\contentspage\relax
-    \cleardoublepage
-       \thispagestyle{empty}
-         \addcontentsline{toc}{part}{\SUF@appendices}
-     \begingroup
-       \centering
-          \null\vfil
-        {\LARGE\SUF@appendices\par}
-          \vfil
-   \endgroup
-    \cleardoublepage
-\titlecontents{part}                                                  
-   [0em]                                                                    
-  {\addvspace{3ex}\partname~}                                                 
-  {\makebox[\SUF@label@part][l]{%
-    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}                                                    
-  {}                                                                      
-  {}
-  [\addvspace{1ex}]
+% \changes{v2.9.5}{2020/02/04}{New mechanism for the appendices through the \sty{appendix} package.}
+\RequirePackage{appendix}
+\renewcommand{\appendixpagename}{Appendici}
+\renewcommand{\appendixtocname}{Appendici}
+\renewcommand{\appendixname}{Appendice}   
+\noappendicestocpagenum
+\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+%^^A\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
+%^^A    \appendicesname{Appendici}
+%^^A    \newcommand{\appendixpage}{\SUF@appendixpage}
+%^^A\def\SUF@appendixpage{%
+%^^A  \@mainmattertrue
+%^^A    \titlecontents{part}                                                  
+%^^A      [0em]                                                                    
+%^^A      {\addvspace{3ex}}
+%^^A      {}
+%^^A      {}
+%^^A      {}
+%^^A      [\addvspace{1ex}]
+%^^A\let\contentspage\relax
+%^^A    \cleardoublepage
+%^^A       \thispagestyle{empty}
+%^^A         \addcontentsline{toc}{part}{\SUF@appendices}
+%^^A     \begingroup
+%^^A       \centering
+%^^A          \null\vfil
+%^^A        {\LARGE\SUF@appendices\par}
+%^^A          \vfil
+%^^A   \endgroup
+%^^A    \cleardoublepage
+%^^A\titlecontents{part}                                                  
+%^^A   [0em]                                                                    
+%^^A  {\addvspace{3ex}\partname~}                                                 
+%^^A  {\makebox[\SUF@label@part][l]{%
+%^^A  \thecontentslabel}\hspace*{1em}}   
+%^^A  {}                                                                      
+%^^A  {}
+%^^A  [\addvspace{1ex}]
+%^^A}
+\renewcommand{\@chap@pppage}{%
+	\clear@ppage
+	\thispagestyle{plain}%
+	\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+	\null\vfil
+	\markboth{}{}%
+	{\centering
+		\interlinepenalty \@M
+		\normalfont
+		\SUF@chaptersize\appendixpagename\par}%
+	\if@dotoc@pp
+	\addappheadtotoc
+	\fi
+	\vfil\newpage
+	\if@twoside
+	\if@openright
+	\null
+	\thispagestyle{empty}%
+	\newpage
+	\fi
+	\fi
+	\if@tempswa
+	\twocolumn
+	\fi
+}
+\renewcommand{\@sec@pppage}{%
+	\par
+	\addvspace{4ex}%
+	\@afterindentfalse
+	{\parindent \z@ \raggedright
+		\interlinepenalty \@M
+		\normalfont
+		\SUF@chaptersize\appendixpagename%
+		\markboth{}{}\par}%
+	\if@dotoc@pp
+	\addappheadtotoc
+	\fi
+	\nobreak
+	\vskip 3ex
+	\@afterheading
 }
 \ifsuftesi@article
   \renewcommand\appendix{\par
     \setcounter{section}{0}%
     \setcounter{subsection}{0}%
-    \gdef\SUF@thesection{\@Alph\c@section}}
+    \gdef\SUF@thesection{\@Alph\c@section}%
+    \gdef\SUF@HEAD@thesection{\@Alph\c@section}}
 \else
   \renewcommand\appendix{\par
     \setcounter{chapter}{0}%
     \setcounter{section}{0}%
     \gdef\@chapapp{\appendixname}%
-    \gdef\SUF@thechapter{\@Alph\c@chapter}}
+    \gdef\SUF@thechapter{\@Alph\c@chapter}%
+    \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}}
 \fi
 %    \end{macrocode}
 % \subsection*{Headings}
@@ -4523,7 +4675,7 @@ Janusz M. Nowacki.
   [0em]
   {\addvspace{3ex}\partname\hspace*{.5em}}
   {\makebox[\SUF@label@part][l]{%
-    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
+    \thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
@@ -4595,7 +4747,7 @@ Janusz M. Nowacki.
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF@addto@tochang@chap%
       \makebox[\SUF@label@chap][l]{%
-        \SUF@toclabelnum\thecontentslabel}\hspace*{1em}%
+        \SUF@CHAP@thecontentslabel}\hspace*{1em}%
           \SUF@tocCHAP@font}
   {\hskip-\SUF@tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
@@ -4607,9 +4759,10 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@sec][l]{%
-    \ifsuftesi@article\SUF@toclabelnum%
-     \else\fi\thecontentslabel}\hspace*{1em}%
+%^^A    \makebox[\SUF@label@sec][l]{%
+%^^A    \ifsuftesi@article\SUF@toclabelnum%
+%^^A     \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
        \SUF@tocSEC@font}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
@@ -4620,7 +4773,7 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSEC@font}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
@@ -4631,7 +4784,7 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSUBSEC@font}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
@@ -4725,7 +4878,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF@tocindent@chap%
-    \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
+    \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}%
     \hspace*{1em}%
       \SUF@tocCHAP@font}
   {\hskip-\SUF@tocindent@chap%
@@ -4736,9 +4889,10 @@ Janusz M. Nowacki.
   [\SUF@tocindent@sec]
   {}
   {\hskip-\dimexpr(\SUF@label@sec+1em)%
-    \makebox[\SUF@label@sec][l]{%
-    \ifsuftesi@article\SUF@toclabelnum%
-      \else\fi\thecontentslabel}\hspace*{1em}%
+%^^A    \makebox[\SUF@label@sec][l]{%
+%^^A    \ifsuftesi@article\SUF@toclabelnum%
+%^^A      \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
         \SUF@tocSEC@font}
   {\hskip-\dimexpr(\SUF@label@sec+1em)%
     \SUF@tocSEC@font}
@@ -4748,7 +4902,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@subsec]
   {}
   {\hskip-\dimexpr(\SUF@label@subsec+1em)%
-    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSEC@font}
   {\hskip-\dimexpr(\SUF@label@subsec+1em)%
     \SUF@tocSUBSEC@font}
@@ -4757,7 +4911,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@subsubsec]
   {}
   {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
-    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSUBSEC@font}
   {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
     \SUF@tocSUBSUBSEC@font}
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 4bd843329d5..78c01dde37c 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,10 +19,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2020/01/29 v2.9.3 A class for typesetting theses, books and articles]
+    [2020/02/04 v2.9.5 A class for typesetting theses, books and articles]
 
-   %\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-   %\color{gray}\arabic{chapter}\hskip-15cm}
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
@@ -97,13 +95,15 @@
 \define@choicekey{}{structure}[\val\nr]
     {book,article,collection}[book]{%
 \ifcase\nr\relax
-\disable@keys{}{secnumstyle}
+\def\SUF@chapswitch{\thechapter.}
 \or
 \suftesi@articletrue
 \@titlepagefalse
+\def\SUF@chapswitch{}
 \or
 \suftesi@collectiontrue
   \setkeys{}{headerstyle=authortitleinner}
+\def\SUF@chapswitch{}
 \fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
@@ -434,27 +434,21 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
-  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
-  \def\SUF@toclabelnum{\@Roman}
 \fi}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
 dotarabic,dotroman,dotRoman}[arabic]{%
@@ -462,119 +456,119 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{}
+  \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{}
+  \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
-  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{}
+  \def\SUF@SEC@thecontentslabel{\thecontentslabel}
 \or
-  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}}
   \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
-  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{}
+  \def\SUF@SEC@thecontentslabel{\thecontentslabel}
 \or
-  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}}
   \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{\scshape\@roman}
+  \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
-  \def\SUF@toclabelnum{\@Roman}
+  \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{subsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
-\def\SUF@thesubsection{\arabic{subsection}}
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
 \def\SUF@dotsubsec{}
-\def\SUF@toclabelnum{}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
 \or
-\def\SUF@thesubsection{\textsc{\roman{subsection}}}
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
 \def\SUF@dotsubsec{}
-\def\SUF@toclabelnum{\scshape\@roman}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-\def\SUF@thesubsection{\Roman{subsection}}
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
 \def\SUF@dotsubsec{}
-\def\SUF@toclabelnum{\@Roman}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
-\def\SUF@thesubsection{\arabic{subsection}}
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
 \def\SUF@dotsubsec{.}
-\def\SUF@toclabelnum{}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
 \or
-\def\SUF@thesubsection{\textsc{\roman{subsection}}}
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
 \def\SUF@dotsubsec{.}
-\def\SUF@toclabelnum{\scshape\@roman}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-\def\SUF@thesubsection{\Roman{subsection}}
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
 \def\SUF@dotsubsec{.}
-\def\SUF@toclabelnum{\@Roman}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
-\def\SUF@thesubsubsection{\arabic{subsubsection}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
 \def\SUF@dotsubsubsec{}
-\def\SUF@toclabelnum{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
 \or
-\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
 \def\SUF@dotsubsubsec{}
-\def\SUF@toclabelnum{\scshape\@roman}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-\def\SUF@thesubsubsection{\Roman{subsubsection}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
 \def\SUF@dotsubsubsec{}
-\def\SUF@toclabelnum{\@Roman}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
-\def\SUF@thesubsubsection{\arabic{subsubsection}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
 \def\SUF@dotsubsubsec{.}
-\def\SUF@toclabelnum{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
 \or
-\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
 \def\SUF@dotsubsubsec{.}
-\def\SUF@toclabelnum{\scshape\@roman}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
 \or
-\def\SUF@thesubsubsection{\Roman{subsubsection}}
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
 \def\SUF@dotsubsubsec{.}
-\def\SUF@toclabelnum{\@Roman}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{smallcapsstyle}[\val\nr]
     {low,upper}[low]{%
@@ -594,6 +588,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
 \newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
 \newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
+
+\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
      authortitlecenter}[inner]{%
@@ -1112,6 +1118,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \ExecuteOptionsX<>{
+  structure=book,
   captionstyle=standard,
   marginpar=true,
   parindent=compact,
@@ -2200,49 +2207,66 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
                 \columnsep 35\p@
                 \let\item\@idxitem}
                {\if@restonecol\onecolumn\else\clearpage\fi}
-\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
-    \appendicesname{Appendici}
-    \newcommand{\appendixpage}{\SUF@appendixpage}
-\def\SUF@appendixpage{%
-  \@mainmattertrue
-    \titlecontents{part}
-      [0em]
-      {\addvspace{3ex}}
-      {}
-      {}
-      {}
-      [\addvspace{1ex}]
-\let\contentspage\relax
-    \cleardoublepage
-       \thispagestyle{empty}
-         \addcontentsline{toc}{part}{\SUF@appendices}
-     \begingroup
-       \centering
-          \null\vfil
-        {\LARGE\SUF@appendices\par}
-          \vfil
-   \endgroup
-    \cleardoublepage
-\titlecontents{part}
-   [0em]
-  {\addvspace{3ex}\partname~}
-  {\makebox[\SUF@label@part][l]{%
-    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
-  {}
-  {}
-  [\addvspace{1ex}]
+\RequirePackage{appendix}
+\renewcommand{\appendixpagename}{Appendici}
+\renewcommand{\appendixtocname}{Appendici}
+\renewcommand{\appendixname}{Appendice}
+\noappendicestocpagenum
+\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+\renewcommand{\@chap@pppage}{%
+\clear@ppage
+\thispagestyle{plain}%
+\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+\null\vfil
+\markboth{}{}%
+{\centering
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize\appendixpagename\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\vfil\newpage
+\if@twoside
+\if@openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if@tempswa
+\twocolumn
+\fi
+}
+\renewcommand{\@sec@pppage}{%
+\par
+\addvspace{4ex}%
+\@afterindentfalse
+{\parindent \z@ \raggedright
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize\appendixpagename%
+\markboth{}{}\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\nobreak
+\vskip 3ex
+\@afterheading
 }
 \ifsuftesi@article
   \renewcommand\appendix{\par
     \setcounter{section}{0}%
     \setcounter{subsection}{0}%
-    \gdef\SUF@thesection{\@Alph\c@section}}
+    \gdef\SUF@thesection{\@Alph\c@section}%
+    \gdef\SUF@HEAD@thesection{\@Alph\c@section}}
 \else
   \renewcommand\appendix{\par
     \setcounter{chapter}{0}%
     \setcounter{section}{0}%
     \gdef\@chapapp{\appendixname}%
-    \gdef\SUF@thechapter{\@Alph\c@chapter}}
+    \gdef\SUF@thechapter{\@Alph\c@chapter}%
+    \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}}
 \fi
 \RequirePackage{fancyhdr}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2528,7 +2552,7 @@ Janusz M. Nowacki.
   [0em]
   {\addvspace{3ex}\partname\hspace*{.5em}}
   {\makebox[\SUF@label@part][l]{%
-    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
+    \thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
@@ -2591,7 +2615,7 @@ Janusz M. Nowacki.
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF@addto@tochang@chap%
       \makebox[\SUF@label@chap][l]{%
-        \SUF@toclabelnum\thecontentslabel}\hspace*{1em}%
+        \SUF@CHAP@thecontentslabel}\hspace*{1em}%
           \SUF@tocCHAP@font}
   {\hskip-\SUF@tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
@@ -2603,9 +2627,7 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@sec][l]{%
-    \ifsuftesi@article\SUF@toclabelnum%
-     \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
        \SUF@tocSEC@font}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
@@ -2616,7 +2638,7 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSEC@font}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
@@ -2627,7 +2649,7 @@ Janusz M. Nowacki.
   {}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSUBSEC@font}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
@@ -2715,7 +2737,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF@tocindent@chap%
-    \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
+    \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}%
     \hspace*{1em}%
       \SUF@tocCHAP@font}
   {\hskip-\SUF@tocindent@chap%
@@ -2726,9 +2748,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@sec]
   {}
   {\hskip-\dimexpr(\SUF@label@sec+1em)%
-    \makebox[\SUF@label@sec][l]{%
-    \ifsuftesi@article\SUF@toclabelnum%
-      \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
         \SUF@tocSEC@font}
   {\hskip-\dimexpr(\SUF@label@sec+1em)%
     \SUF@tocSEC@font}
@@ -2738,7 +2758,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@subsec]
   {}
   {\hskip-\dimexpr(\SUF@label@subsec+1em)%
-    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSEC@font}
   {\hskip-\dimexpr(\SUF@label@subsec+1em)%
     \SUF@tocSUBSEC@font}
@@ -2747,7 +2767,7 @@ Janusz M. Nowacki.
   [\SUF@tocindent@subsubsec]
   {}
   {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
-    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
       \SUF@tocSUBSUBSEC@font}
   {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
     \SUF@tocSUBSUBSEC@font}