suftesi (21dec20)

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

1 files changed, 595 insertions, 513 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index edf2bdaa5ca..4cf27c69715 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -26,7 +26,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2020/06/26 v2.9.10 A class for typesetting theses, books and articles]
+    [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@compatibility
 \newif\ifsuftesi@nofont
@@ -99,15 +99,15 @@
 \define@choicekey{}{structure}[\val\nr]
     {book,article,collection}[book]{%
 \ifcase\nr\relax
-\def\SUF@chapswitch{\thechapter.}
+  \def\SUF@chapswitch{\thechapter.}
 \or
-\suftesi@articletrue
-\@titlepagefalse
-\def\SUF@chapswitch{}
+  \suftesi@articletrue
+  \@titlepagefalse
+  \def\SUF@chapswitch{}
 \or
-\suftesi@collectiontrue
-  \setkeys{}{headerstyle=authortitleinner}
-\def\SUF@chapswitch{}
+  \suftesi@collectiontrue
+    \setkeys{}{headerstyle=authortitleinner}
+  \def\SUF@chapswitch{}
 \fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
@@ -121,10 +121,48 @@
 \or
   \setkeys{}{structure=collection}
 \fi}
+\define@choicekey{}{defaultfont}[\val\nr]{%
+none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\ifcase\nr\relax
+  \suftesi@nofonttrue
+\or
+  \suftesi@cochinealtrue
+\or
+  \suftesi@libertinetrue
+\or
+  \suftesi@palatinotrue
+\or
+  \suftesi@standardtrue
+\or
+  \suftesi@compatibilitytrue
+\fi}
+\define@choicekey{}{mathfont}[\val\nr]{%
+none,minimal,extended}[minimal]{%
+\ifcase\nr\relax
+  \suftesi@mathminimalfalse
+  \suftesi@mathextendedfalse
+\or
+  \suftesi@mathminimaltrue
+\or
+  \suftesi@mathextendedtrue
+\fi}
+\define@choicekey{}{greekfont}[\val\nr]{%
+none,artemisia,porson,bodoni,cbgreek}[none]{%
+\ifcase\nr\relax
+\suftesi@greekfontfalse
+\or
+  \suftesi@greekfonttrue\suftesi@artemisiatrue
+\or
+  \suftesi@greekfonttrue\suftesi@porsontrue
+\or
+  \suftesi@greekfonttrue\suftesi@bodonitrue
+\or
+  \suftesi@greekfonttrue\suftesi@cbgreektrue
+\fi}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
     {standard,standardaureo,periodical,compact,compactaureo,supercompact,
-    supercompactaureo,periodicalaureo}[standard]{%
+    supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@partsize}{\Large}
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -257,192 +295,182 @@
     marginratio=    2:3,
     marginparwidth= 62pt,
     marginparsep=   10pt}
-\or
+\or% pocketa
+\suftesi@supercompactaureotrue
+  \DeclareRobustCommand{\SUF@partsize}{\large}
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
+  \geometry{
+    heightrounded,
+    includeheadfoot=false,
+    textheight=     153mm,
+    textwidth=      102mm,
+    paperwidth=     135mm,
+    paperheight=    208mm,
+    hmarginratio=    1:1,
+    vmarginratio=    2:3,
+    marginparwidth= 12mm,
+    marginparsep=   7pt}
+\or% pocketb
+\suftesi@supercompactaureotrue
+  \DeclareRobustCommand{\SUF@partsize}{\large}
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
+  \geometry{
+     heightrounded,
+     includeheadfoot=false,
+     textheight=     165mm,
+     textwidth=      99mm,
+     paperwidth=     140mm,
+     paperheight=    210mm,
+     hmarginratio=    1:1,
+     vmarginratio=    2:3,
+     marginparwidth= 15mm,
+     marginparsep=   7pt}
+\or% pocketc
+\suftesi@supercompactaureotrue
+  \DeclareRobustCommand{\SUF@partsize}{\large}
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
+    \geometry{
+     heightrounded,
+     includeheadfoot=false,
+     textheight=     150mm,
+     textwidth=      90mm,
+     paperwidth=     116mm,
+     paperheight=    193mm,
+     hmarginratio=    1:1,
+     vmarginratio=    2:3,
+     marginparwidth= 8mm,
+     marginparsep=   7pt}
 \fi}
 \define@choicekey{}{partstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@PARTSwitch{\filright}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@PARTSwitch{\filcenter}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@PARTSwitch{\filleft}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numpar
   \def\SUF@lr@PARTSwitch{\filright}
   \suftesi@numparparttrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@PARTSwitch{\filcenter}
   \suftesi@numparparttrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@PARTSwitch{\filleft}
   \suftesi@numparparttrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{chapstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@CHAPSwitch{\filright}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@CHAPSwitch{\filcenter}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numparchap
   \def\SUF@lr@CHAPSwitch{\filright}
   \suftesi@numparchaptrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@CHAPSwitch{\filcenter}
   \suftesi@numparchaptrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
   \suftesi@numparchaptrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{secstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SECSwitch{\filright}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SECSwitch{\filcenter}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SECSwitch{\filleft}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numparsec
   \def\SUF@lr@SECSwitch{\filright}
   \suftesi@numparsectrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SECSwitch{\filcenter}
   \suftesi@numparsectrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SECSwitch{\filleft}
   \suftesi@numparsectrue
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSECSwitch{\filright}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SUBSECSwitch{\filcenter}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SUBSECSwitch{\filleft}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSUBSECSwitch{\filright}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SUBSUBSECSwitch{\filleft}
-  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@PART@StyleSwitch{\relax}
+  \def\SUF@PART@StyleSwitch{\relax}
 \or
-\def\SUF@PART@StyleSwitch{\itshape}
+  \def\SUF@PART@StyleSwitch{\itshape}
 \or
-\def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@CHAP@StyleSwitch{\relax}
+  \def\SUF@CHAP@StyleSwitch{\relax}
 \or
-\def\SUF@CHAP@StyleSwitch{\itshape}
+  \def\SUF@CHAP@StyleSwitch{\itshape}
 \or
-\def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
-\def\SUF@SEC@StyleSwitch{\relax}
+  \def\SUF@SEC@StyleSwitch{\relax}
 \or
-\def\SUF@SEC@StyleSwitch{\itshape}
+  \def\SUF@SEC@StyleSwitch{\itshape}
 \or
-\def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@SUBSEC@StyleSwitch{\relax}
+  \def\SUF@SUBSEC@StyleSwitch{\relax}
 \or
-\def\SUF@SUBSEC@StyleSwitch{\itshape}
+  \def\SUF@SUBSEC@StyleSwitch{\itshape}
 \or
-\def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@SUBSUBSEC@StyleSwitch{\relax}
-\or
-\def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
-\or
-\def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
-\fi}
-\define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF@tocCHAP@font{\relax}
-\or
-\def\SUF@tocCHAP@font{\itshape}
-\or
-\def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps}
-\fi}
-\define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
-\def\SUF@tocSEC@font{\relax}
-\or
-\def\SUF@tocSEC@font{\itshape}
-\or
-\def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
-\fi}
-\define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF@tocSUBSEC@font{\relax}
-\or
-\def\SUF@tocSUBSEC@font{\itshape}
-\or
-\def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
-\fi}
-\define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF@tocSUBSUBSEC@font{\relax}
-\or
-\def\SUF@tocSUBSUBSEC@font{\itshape}
-\or
-\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
-\fi}
-\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF@tocAUT@font{\relax}
+  \def\SUF@SUBSUBSEC@StyleSwitch{\relax}
 \or
-\def\SUF@tocAUT@font{\itshape}
+  \def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
 \or
-\def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
+  \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define@choicekey{}{smallcapsstyle}[\val\nr]
+{low,upper}[low]{%
 \ifcase\nr\relax
-\def\SUF@tocTIT@font{\relax}
-\or
-\def\SUF@tocTIT@font{\itshape}
+  \def\suftesi@MakeTextLowercase{\MakeLowercase}
+  \def\suftesi@MakeTextTOCLowercase{\lowercase}
 \or
-\def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
+  \def\suftesi@MakeTextLowercase{\relax}
+  \def\suftesi@MakeTextTOCLowercase{\relax}
 \fi}
 \define@choicekey{}{partnumstyle}[\val\nr]
-    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
@@ -463,8 +491,8 @@
   \def\SUF@dotpart{.}
 \fi}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-    dotarabic,dotroman,dotRoman}[arabic]{%
-  \ifcase\nr\relax
+dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
@@ -494,10 +522,10 @@
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
   \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
-  \fi}
+\fi}
 \define@choicekey{}{secnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-  \ifcase\nr\relax
+\ifcase\nr\relax
   \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
@@ -527,10 +555,10 @@
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
   \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
-  \fi}
+\fi}
 \define@choicekey{}{subsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-  \ifcase\nr\relax
+\ifcase\nr\relax
   \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
   \def\SUF@dotsubsec{}
   \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
@@ -554,10 +582,10 @@
   \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
   \def\SUF@dotsubsec{.}
   \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-  \fi}
+\fi}
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-  \ifcase\nr\relax
+\ifcase\nr\relax
   \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
   \def\SUF@dotsubsubsec{}
   \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
@@ -581,42 +609,133 @@
   \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
   \def\SUF@dotsubsubsec{.}
   \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-  \fi}
-\define@choicekey{}{smallcapsstyle}[\val\nr]
-    {low,upper}[low]{%
+\fi}
+\define@choicekey{}{tocstyle}[\val\nr]{%
+standard,dotted,ragged,leftpage}[standard]{%
 \ifcase\nr\relax
-  \def\suftesi@MakeTextLowercase{\MakeLowercase}
-  \def\suftesi@MakeTextTOCLowercase{\lowercase}
+  \def\SUF@titlerule{\titlerule*{}}
+  \def\SUF@chaptitlerule{\titlerule*{}}
 \or
-  \def\suftesi@MakeTextLowercase{\relax}
-  \def\suftesi@MakeTextTOCLowercase{\relax}
+\suftesi@dottedtoctrue
+  \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+  \def\SUF@chaptitlerule{\titlerule*{}}
+\or
+\suftesi@raggedtoctrue
+  \def\SUF@titlerule{\hspace{1em}}
+  \def\SUF@chaptitlerule{\hspace{1em}}
+\or
+\suftesi@pagelefttoctrue
+\fi}
+\define@choicekey{}{compacttoc}[\val\nr]{%
+sec,subsec,subsubsec}[sec]{%
+\ifcase\nr\relax
+  \suftesi@toccompactsectrue
+  \suftesi@toccompactsubsectrue
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\hskip.5em}
+  \def\suf@ssscorrect{\hskip.5em}
+  \def\suf@ctocdotsec{.}
+  \def\suf@ctocdotssec{}
+  \def\suf@ctocdotsssec{}
+\or
+  \suftesi@toccompactsubsectrue
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\hskip.5em}
+  \def\suf@ctocdotssec{.}
+  \def\suf@ctocdotsssec{}
+\or
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\relax}
+  \def\suf@ctocdotsssec{.}
+\fi}
+\define@choicekey{}{twocolcontents}[\val\nr]{%
+toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\ifcase\nr\relax
+  \suftesi@twocolumntoctrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\fi
+}
+\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF@tocPART@font{\relax}
+\or
+ \def\SUF@tocPART@font{\itshape}
+\or
+ \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@tocCHAP@font{\relax}
+\or
+  \def\SUF@tocCHAP@font{\itshape}
+\or
+  \def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+  \def\SUF@tocSEC@font{\relax}
+\or
+  \def\SUF@tocSEC@font{\itshape}
+\or
+  \def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@tocSUBSEC@font{\relax}
+\or
+  \def\SUF@tocSUBSEC@font{\itshape}
+\or
+  \def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@tocSUBSUBSEC@font{\relax}
+\or
+  \def\SUF@tocSUBSUBSEC@font{\itshape}
+\or
+  \def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@tocAUT@font{\relax}
+\or
+  \def\SUF@tocAUT@font{\itshape}
+\or
+  \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+  \def\SUF@tocTIT@font{\relax}
+\or
+  \def\SUF@tocTIT@font{\itshape}
+\or
+  \def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
-\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{\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}}
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
      authortitlecenter}[inner]{%
@@ -661,40 +780,39 @@
 \define@choicekey{}{liststyle}[\val\nr]
     {bulged,aligned,indented}[bulged]{%
 \ifcase\nr\relax
-    \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
-    \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
-    \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
-    \setlist[itemize,1]{leftmargin=0pt}
-    \setlist[itemize,2]{leftmargin=1.3\parindent}
-    \setlist[itemize,3]{leftmargin=1.3\parindent}
-\or
-    \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
-    \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
-    \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
-    \setlist[itemize,1]{leftmargin=1\parindent}
-    \setlist[itemize,2]{leftmargin=1.5\parindent}
-    \setlist[itemize,3]{leftmargin=1.5\parindent}
-\or
-    \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
-    \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
-    \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
-    \setlist[itemize,1]{leftmargin=2\parindent}
-    \setlist[itemize,2]{leftmargin=2.5\parindent}
-    \setlist[itemize,3]{leftmargin=2.5\parindent}
+  \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
+  \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
+  \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
+  \setlist[itemize,1]{leftmargin=0pt}   \setlist[itemize,2]{leftmargin=1.3\parindent}
+  \setlist[itemize,3]{leftmargin=1.3\parindent}
+\or
+  \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
+  \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
+  \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
+  \setlist[itemize,1]{leftmargin=1\parindent}
+  \setlist[itemize,2]{leftmargin=1.5\parindent}
+  \setlist[itemize,3]{leftmargin=1.5\parindent}
+\or
+  \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
+  \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
+  \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
+  \setlist[itemize,1]{leftmargin=2\parindent}
+  \setlist[itemize,2]{leftmargin=2.5\parindent}
+  \setlist[itemize,3]{leftmargin=2.5\parindent}
 \fi}
 \define@choicekey{}{quotestyle}[\val\nr]
     {center,right}[center]{%
 \ifcase\nr\relax
-\def\SUF@quote@style{\rightmargin=\parindent}
+  \def\SUF@quote@style{\rightmargin=\parindent}
 \or
-\def\SUF@quote@style{}
+  \def\SUF@quote@style{}
 \fi}
 \define@choicekey{}{quotesize}[\val\nr]
     {footnotesize,small}[footnotesize]{%
 \ifcase\nr\relax
-\def\SUF@quotation@size{\footnotesize}
+  \def\SUF@quotation@size{\footnotesize}
 \or
-\def\SUF@quotation@size{\small}
+  \def\SUF@quotation@size{\small}
 \fi}
 \define@choicekey{}{footnotestyle}[\val\nr]
     {bulged,hung,dotted,superscript}[bulged]{%
@@ -738,114 +856,6 @@
 \or
   \renewcommand\marginpar[2][]{}
 \fi}
-\define@choicekey{}{tocstyle}[\val\nr]{%
-    standard,dotted,ragged,leftpage}[standard]{%
-\ifcase\nr\relax
-  \def\SUF@titlerule{\titlerule*{}}
-  \def\SUF@chaptitlerule{\titlerule*{}}
-\or
-\suftesi@dottedtoctrue
-  \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
-  \def\SUF@chaptitlerule{\titlerule*{}}
-\or
-\suftesi@raggedtoctrue
-  \def\SUF@titlerule{\hspace{1em}}
-  \def\SUF@chaptitlerule{\hspace{1em}}
-\or
-\suftesi@pagelefttoctrue
-\fi}
-\define@choicekey{}{compacttoc}[\val\nr]{%
-  sec,subsec,subsubsec}[sec]{%
-  \ifcase\nr\relax
-  \suftesi@toccompactsectrue
-  \suftesi@toccompactsubsectrue
-  \suftesi@toccompactsubsubsectrue
-  \def\suf@sscorrect{\hskip.5em}
-  \def\suf@ssscorrect{\hskip.5em}
-    \def\suf@ctocdotsec{.}
-    \def\suf@ctocdotssec{}
-    \def\suf@ctocdotsssec{}
-\or
-  \suftesi@toccompactsubsectrue
-  \suftesi@toccompactsubsubsectrue
-  \def\suf@sscorrect{\relax}
-  \def\suf@ssscorrect{\hskip.5em}
-    \def\suf@ctocdotssec{.}
-    \def\suf@ctocdotsssec{}
-\or
-  \suftesi@toccompactsubsubsectrue
-  \def\suf@sscorrect{\relax}
-  \def\suf@ssscorrect{\relax}
-    \def\suf@ctocdotsssec{.}
-  \fi}
-\define@choicekey{}{twocolcontents}[\val\nr]{%
-    toc,lof,lot,toclof,toclot,loflot,all}[all]{%
-\ifcase\nr\relax
-  \suftesi@twocolumntoctrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumnloftrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumnlottrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumntoctrue
-  \suftesi@twocolumnloftrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumntoctrue
-  \suftesi@twocolumnlottrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumnloftrue
-  \suftesi@twocolumnlottrue
-  \setkeys{}{tocstyle=ragged}
-\or
-  \suftesi@twocolumntoctrue
-  \suftesi@twocolumnloftrue
-  \suftesi@twocolumnlottrue
-  \setkeys{}{tocstyle=ragged}
-\fi
-}
-\define@choicekey{}{defaultfont}[\val\nr]{%
-    none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
-\ifcase\nr\relax
-  \suftesi@nofonttrue
-\or
-  \suftesi@cochinealtrue
-\or
-  \suftesi@libertinetrue
-\or
-  \suftesi@palatinotrue
-\or
-  \suftesi@standardtrue
-\or
-  \suftesi@compatibilitytrue
-\fi}
-\define@choicekey{}{mathfont}[\val\nr]{%
-    none,minimal,extended}[minimal]{%
-\ifcase\nr\relax
-  \suftesi@mathminimalfalse
-  \suftesi@mathextendedfalse
-\or
-  \suftesi@mathminimaltrue
-\or
-  \suftesi@mathextendedtrue
-\fi}
-\define@choicekey{}{greekfont}[\val\nr]{%
-    none,artemisia,porson,bodoni,cbgreek}[none]{%
-\ifcase\nr\relax
-\suftesi@greekfontfalse
-\or
-\suftesi@greekfonttrue\suftesi@artemisiatrue
-\or
-\suftesi@greekfonttrue\suftesi@porsontrue
-\or
-\suftesi@greekfonttrue\suftesi@bodonitrue
-\or
-\suftesi@greekfonttrue\suftesi@cbgreektrue
-\fi}
 \define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
 \ifcase\nr\relax
   \suftesi@partpagetrue
@@ -857,6 +867,7 @@
 \ifcase\nr\relax
   \suftesi@draftdatetrue
 \or
+  \relax
 \fi}
 \define@choicekey{}{version}[\val\nr]
     {screen,cscreen,draft,final}[draft]{%
@@ -866,6 +877,7 @@
   \suftesi@screentrue
   \suftesi@screencenteredtrue
 \or
+  \relax
 \or
   \AtBeginDocument{\crop[off]}
 \fi}
@@ -1129,24 +1141,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \define@choicekey{}{revauthortitle}[\val\nr]
     {true,false}[false]{%
 \ifcase\nr\relax
-\suftesi@reverseauthortitletrue
-\or\relax
+  \suftesi@reverseauthortitletrue
+\or
+  \relax
 \fi}
 \define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@titlefont@Switch{\relax}
+  \def\SUF@titlefont@Switch{\relax}
 \or
-\def\SUF@titlefont@Switch{\itshape}
+  \def\SUF@titlefont@Switch{\itshape}
 \or
-\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
-\def\SUF@authorfont@Switch{\relax}
+  \def\SUF@authorfont@Switch{\relax}
 \or
-\def\SUF@authorfont@Switch{\itshape}
+  \def\SUF@authorfont@Switch{\itshape}
 \or
-\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
+  \def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \ExecuteOptionsX<>{
   structure=book,
@@ -1185,6 +1198,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   tocauthorfont=roman,
   revauthortitle=false,
   papertitlestyle=left,
+  tocpartfont=roman,
   tocchapfont=roman,
   tocsecfont=roman,
   tocsubsecfont=roman,
@@ -1214,8 +1228,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \RequirePackage{emptypage}
 \RequirePackage{microtype}
 \RequirePackage{color}
-\definecolor{sufred}{rgb}{0.5,0,0}
-\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+  \definecolor{sufred}{rgb}{0.5,0,0}
+  \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{iftex}
   \ifLuaTeX
     \RequirePackage{luatex85}
@@ -1229,12 +1243,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \newcommand*\crop[1][]{}
     \ifsuftesi@screencentered
       \geometry{hmarginratio=1:1}
-    \else
-  \fi
+    \fi
 \else
   \RequirePackage[a4,cam,center]{crop}
 \fi
-\unless\ifPDFTeX%if xelatex or lualatex
+\unless\ifPDFTeX
 \AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
@@ -1266,83 +1279,83 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \ifsuftesi@standard
   \RequirePackage{lmodern}
     \ifsuftesi@greekfont
-      \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}%
-        \suftesi@greekfontfalse
-          \else\suftesi@greekfontfalse\fi
+     \ClassWarningNoLine{suftesi}{%
+       Unused 'greekfont' option}%
+       \suftesi@greekfontfalse
+         \else\suftesi@greekfontfalse\fi
 \else
   \ifsuftesi@compatibility
-      \RequirePackage[osf,sc]{mathpazo}
-      \RequirePackage[scaled=0.8]{beramono}
-        \renewcommand{\sfdefault}{iwona}
-      \ifsuftesi@greekfont
-      \ifsuftesi@bodoni
-      \gdef\SUFfntscale{0.96}
-      \else
-      \ifsuftesi@artemisia
-      \gdef\SUFfntscale{0.97}
-      \else
-      \ifsuftesi@porson
-      \gdef\SUFfntscale{1.18}
-      \else
-      \ifsuftesi@cbgreek
-        \def\lmfntscale{1.06}
-      \else
-      \fi
-      \fi
-      \fi
-      \fi
-      \else
-      \ClassWarningNoLine{suftesi}{\MessageBreak
-      If you need the Greek font remember\MessageBreak
-      to set one of the following options:\MessageBreak
-      greekfont=artemisia,\MessageBreak
-      greekfont=porson,\MessageBreak
-      greekfont=cbgreek}
-      \fi
+    \RequirePackage[osf,sc]{mathpazo}
+    \RequirePackage[scaled=0.8]{beramono}
+    \renewcommand{\sfdefault}{iwona}
+    \ifsuftesi@greekfont
+    \ifsuftesi@bodoni
+    \gdef\SUFfntscale{0.96}
+    \else
+    \ifsuftesi@artemisia
+    \gdef\SUFfntscale{0.97}
+    \else
+    \ifsuftesi@porson
+    \gdef\SUFfntscale{1.17}
+    \else
+    \ifsuftesi@cbgreek
+    \def\lmfntscale{1.06}
+    \else
+    \fi
+    \fi
+    \fi
+    \fi
+    \else
+    \ClassWarningNoLine{suftesi}{\MessageBreak
+    If you need the Greek font remember\MessageBreak
+    to set one of the following options:\MessageBreak
+    greekfont=artemisia,\MessageBreak
+    greekfont=porson,\MessageBreak
+    greekfont=cbgreek}
+    \fi
 \else
   \ifsuftesi@palatino
     \RequirePackage[full]{textcomp}
-         \RequirePackage{newpxtext}
-         \RequirePackage[scaled=1.06]{biolinum}
-         \RequirePackage[varqu,varl]{inconsolata}
-         \ifsuftesi@mathextended
-         \RequirePackage{amsthm}
-         \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalpha}
-         \else
-         \ifsuftesi@mathminimal
-         \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \else
-         \fi
-         \fi
-         \useosf
-         \useproportional
-      \ifsuftesi@greekfont
-      \ifsuftesi@bodoni
-      \gdef\SUFfntscale{0.96}
-      \else
-      \ifsuftesi@artemisia
-      \gdef\SUFfntscale{0.97}
-      \else
-      \ifsuftesi@porson
-      \gdef\SUFfntscale{1.18}
-      \else
-      \ifsuftesi@cbgreek
-        \def\lmfntscale{1.06}
-      \else
-      \fi
-      \fi
-      \fi
-      \fi
-      \else
-      \ClassWarningNoLine{suftesi}{\MessageBreak
-      If you need the Greek font remember\MessageBreak
-      to set one of the following options:\MessageBreak
-      greekfont=artemisia,\MessageBreak
-      greekfont=porson,\MessageBreak
-      greekfont=cbgreek}
-      \fi
+    \RequirePackage{newpxtext}
+    \RequirePackage[scaled=1.06]{biolinum}
+    \RequirePackage[varqu,varl]{inconsolata}
+    \ifsuftesi@mathextended
+    \RequirePackage{amsthm}
+    \RequirePackage[bigdelims,vvarbb]{newpxmath}
+    \RequirePackage[cal=boondoxo]{mathalpha}
+    \else
+    \ifsuftesi@mathminimal
+    \RequirePackage[bigdelims,vvarbb]{newpxmath}
+    \else
+    \fi
+    \fi
+    \useosf
+    \useproportional
+    \ifsuftesi@greekfont
+    \ifsuftesi@bodoni
+    \gdef\SUFfntscale{0.96}
+    \else
+    \ifsuftesi@artemisia
+    \gdef\SUFfntscale{0.97}
+    \else
+    \ifsuftesi@porson
+    \gdef\SUFfntscale{1.17}
+    \else
+    \ifsuftesi@cbgreek
+    \def\lmfntscale{1.06}
+    \else
+    \fi
+    \fi
+    \fi
+    \fi
+    \else
+    \ClassWarningNoLine{suftesi}{\MessageBreak
+    If you need the Greek font remember\MessageBreak
+    to set one of the following options:\MessageBreak
+    greekfont=artemisia,\MessageBreak
+    greekfont=porson,\MessageBreak
+    greekfont=cbgreek}
+    \fi
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
@@ -1358,49 +1371,49 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \else
     \fi
     \fi
-         \useosf
-      \ifsuftesi@bodoni
-      \gdef\SUFfntscale{0.9}
-      \else
-      \ifsuftesi@artemisia
-      \gdef\SUFfntscale{0.91}
-      \else
-      \ifsuftesi@porson
-      \gdef\SUFfntscale{1.1}
-      \else
-      \fi
-      \fi
-      \fi
+    \useosf
+    \ifsuftesi@bodoni
+    \gdef\SUFfntscale{0.9}
+    \else
+    \ifsuftesi@artemisia
+    \gdef\SUFfntscale{0.91}
+    \else
+    \ifsuftesi@porson
+    \gdef\SUFfntscale{1.1}
+    \else
+    \fi
+    \fi
+    \fi
 \else
   \ifsuftesi@cochineal
     \RequirePackage{textcomp}
-        \RequirePackage{cochineal}
-        \RequirePackage[varqu,varl,var0]{inconsolata}
-        \RequirePackage{biolinum}
-        \ifsuftesi@mathextended
-        \RequirePackage{amsthm}
-        \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalpha}
-        \else
-        \ifsuftesi@mathminimal
-        \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \else
-        \fi
-        \fi
-        \useosf
-        \useproportional
-      \ifsuftesi@bodoni
-      \gdef\SUFfntscale{0.9}
-      \else
-      \ifsuftesi@artemisia
-      \gdef\SUFfntscale{0.905}
-      \else
-      \ifsuftesi@porson
-      \gdef\SUFfntscale{1.1}
-      \else
-      \fi
-      \fi
-      \fi
+    \RequirePackage{cochineal}
+    \RequirePackage[varqu,varl,var0]{inconsolata}
+    \RequirePackage{biolinum}
+    \ifsuftesi@mathextended
+    \RequirePackage{amsthm}
+    \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+    \RequirePackage[cal=boondoxo]{mathalpha}
+    \else
+    \ifsuftesi@mathminimal
+    \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+    \else
+    \fi
+    \fi
+    \useosf
+    \useproportional
+    \ifsuftesi@bodoni
+    \gdef\SUFfntscale{0.9}
+    \else
+    \ifsuftesi@artemisia
+    \gdef\SUFfntscale{0.905}
+    \else
+    \ifsuftesi@porson
+    \gdef\SUFfntscale{1.1}
+    \else
+    \fi
+    \fi
+    \fi
     \else
     \fi
     \fi
@@ -1427,12 +1440,13 @@ quotesize,footnotestyle,liststyle,captionstyle}
         \fi
       \fi
     \fi
-\AtEndPreamble{ 
+\AtEndPreamble{
   \substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
   \DeclareRobustCommand{\greektext}{%
-   \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
-   \def\encodingdefault{LGR}}
-  \DeclareTextFontCommand{\textgreek}{\greektext}}
+    \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
+    \def\encodingdefault{LGR}}
+  \DeclareTextFontCommand{\textgreek}{\greektext}
+}
 \ifsuftesi@cbgreek
    \else
 \DeclareFontFamily{LGR}{bodoni}{}
@@ -1479,7 +1493,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \else
 \fi
 \fi
-\RequirePackage{titlesec}
+\RequirePackage[newparttoc]{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \unless\ifPDFTeX% if xetex or luatex
@@ -1562,8 +1576,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 {1em}
 {\SUF@SUBSUBSEC@StyleSwitch}
   \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
-  \fi
-}
+  \fi}
 \SUF@default@CHAPTER
 \SUF@default@SECTIONS
 \ifsuftesi@periodical
@@ -1601,57 +1614,101 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \fi
 \ifsuftesi@article
 \def\chapter#1{\ClassError{suftesi}
-  {\noexpand\chapter level is undefined
-     using 'structure=article'}
-  {\noexpand\chapter level is undefined
-     using 'structure=article'}}
-  \setcounter{tocdepth}{3}
-    \setcounter{secnumdepth}{3}
-       \renewcommand\thesection{%
-              \@arabic\c@section}
-      \renewcommand\thesubsection{%
-              \thesection.\@arabic\c@subsection}
-      \renewcommand\thesubsubsection{%
-              \thesubsection.\@arabic\c@subsubsection}
-      \renewcommand\theparagraph{%
-              \thesubsubsection.\@arabic\c@paragraph}
-      \renewcommand\thesubparagraph{%
-              \theparagraph.\@arabic\c@subparagraph}
+{\noexpand\chapter level is undefined
+using 'structure=article'}
+{\noexpand\chapter level is undefined
+using 'structure=article'}}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\renewcommand\thesection{%
+\@arabic\c@section}
+\renewcommand\thesubsection{%
+\thesection.\@arabic\c@subsection}
+\renewcommand\thesubsubsection{%
+\thesubsection.\@arabic\c@subsubsection}
+\renewcommand\theparagraph{%
+\thesubsubsection.\@arabic\c@paragraph}
+\renewcommand\thesubparagraph{%
+\theparagraph.\@arabic\c@subparagraph}
+\renewcommand\part{%
 \ifsuftesi@partpage
-  \relax
-    \else
-  \titleclass{\part}{straight}
-  \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\if@openright
+\cleardoublepage
+\else
+\clearpage
 \fi
-\ifsuftesi@numparpart
-\titleformat{\part}[display]
-  {\SUF@partsize\SUF@lr@PARTSwitch}
-  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
-  {2ex}
-  {\SUF@PART@StyleSwitch}
+\thispagestyle{plain}%
+\fi 
+\if@twocolumn
+\onecolumn
+\@tempswatrue
 \else
-\titleformat{\part}[hang]
-  {\SUF@partsize\SUF@lr@PARTSwitch}
-  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
-  {1em}
-  {\SUF@PART@StyleSwitch}
+\@tempswafalse
+\fi
+\ifsuftesi@partpage
+\null\vfil
+\fi
+\secdef\@part\@spart}
 \fi
+
+\def\@part[#1]#2{%
+\ifnum \c@secnumdepth >-2\relax
+\refstepcounter{part}%
+\addcontentsline{toc}{part}{\normalfont\normalsize
+\SUF@tocpartname\hskip.5em{\SUF@tocPARTnum@font\SUF@thepart}%
+\SUF@dotpart\hspace{1em}\SUF@tocPART@font#1}%
 \else
+\addcontentsline{toc}{part}{\normalfont\normalsize
+\SUF@tocPART@font#1}%
+\fi
+\markboth{}{}%
+{\SUF@lr@PARTSwitch\SUF@partsize
+\interlinepenalty \@M
+\ifnum \c@secnumdepth >-2\relax
+\noindent\partname\hskip.5em{\SUF@PART@font\SUF@thepart}\SUF@dotpart
 \ifsuftesi@numparpart
-\titleformat{\part}[display]
-  {\SUF@partsize\SUF@lr@PARTSwitch}
-  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
-  {2ex}
-  {\SUF@PART@StyleSwitch}
+\par
+\vskip2ex
 \else
-\titleformat{\part}[hang]
-  {\SUF@partsize\SUF@lr@PARTSwitch}
-  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
-  {1em}
-  {\SUF@PART@StyleSwitch}
-\fi
+\hspace{1em}
 \fi
+\noindent\SUF@PART@StyleSwitch#2\par}%
+\@endpart}
+
+\def\@spart#1{%
+{\SUF@lr@PARTSwitch\SUF@partsize
+\interlinepenalty \@M
+\noindent\SUF@PART@StyleSwitch#1\par}%
+\@endpart}
 
+\ifsuftesi@article
+\def\@endpart{%
+\ifsuftesi@partpage
+\vfil\newpage
+\if@twoside
+\if@openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\fi
+\if@tempswa
+\twocolumn
+\fi}
+\else
+\def\@endpart{\vfil\newpage
+\if@twoside
+\if@openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if@tempswa
+\twocolumn
+\fi}
+\fi
 \titleformat{\paragraph}[runin]
   {}
   {\theparagraph}
@@ -1670,68 +1727,64 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
-    \section*{#1}%
-    \markboth{#1}{#1}}
-  \defbibheading{shorthands}[\losname]{%
-    \section*{#1}%
-    \markboth{#1}{#1}}
+\section*{#1}%
+\@mkboth{#1}{#1}}
+  \defbibheading{biblist}[\biblistname]{%
+\section*{#1}%
+\@mkboth{#1}{#1}}
   \defbibheading{bibintoc}[\refname]{%
-    \section*{#1}%
-    \addcontentsline{toc}{section}{#1}%
-    \markboth{#1}{#1}}
-  \defbibheading{losintoc}[\losname]{%
-    \section*{#1}%
-    \addcontentsline{toc}{section}{#1}%
-    \markboth{#1}{#1}}
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\@mkboth{#1}{#1}}
+  \defbibheading{biblistintoc}[\biblistname]{%
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\refname]{%
-    \section{#1}%
-    \if@twoside\markright{#1}\fi}
-  \defbibheading{losnumbered}[\losname]{%
-    \section{#1}%
-    \if@twoside\markright{#1}\fi}
+\section{#1}}
+  \defbibheading{biblistnumbered}[\biblistname]{%
+\section{#1}}
   \defbibheading{subbibliography}[\refname]{%
-    \subsection*{#1}}
+\subsection*{#1}}
   \defbibheading{subbibintoc}[\refname]{%
-    \subsection*{#1}%
-    \addcontentsline{toc}{subsection}{#1}}
+\subsection*{#1}%
+\addcontentsline{toc}{subsection}{#1}}
   \defbibheading{subbibnumbered}[\refname]{%
-    \subsection{#1}}}%
-    {\relax}%
+\subsection{#1}}
 }%
+{\relax}}
 \else
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
-    \chapter*{#1}%
-    \markboth{#1}{#1}}
-  \defbibheading{shorthands}[\losname]{%
-    \chapter*{#1}%
-    \markboth{#1}{#1}}
+\chapter*{#1}%
+\@mkboth{#1}{#1}}
+  \defbibheading{biblist}[\biblistname]{%
+\chapter*{#1}%
+\@mkboth{#1}{#1}}
   \defbibheading{bibintoc}[\bibname]{%
-    \chapter*{#1}%
-    \addcontentsline{toc}{chapter}{#1}%
-    \markboth{#1}{#1}}
-  \defbibheading{losintoc}[\losname]{%
-    \chapter*{#1}%
-    \addcontentsline{toc}{chapter}{#1}%
-    \markboth{#1}{#1}}
+\chapter*{#1}%
+\addcontentsline{toc}{chapter}{#1}%
+\@mkboth{#1}{#1}}
+  \defbibheading{biblistintoc}[\biblistname]{%
+\chapter*{#1}%
+\addcontentsline{toc}{chapter}{#1}%
+\@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\bibname]{%
-    \chapter{#1}%
-    \if@twoside\markright{#1}\fi}
-  \defbibheading{losnumbered}[\losname]{%
-    \chapter{#1}%
-    \if@twoside\markright{#1}\fi}
+\chapter{#1}}
+  \defbibheading{biblistnumbered}[\biblistname]{%
+\chapter{#1}}
   \defbibheading{subbibliography}[\refname]{%
-    \section*{#1}%
-    \if@twoside\markright{#1}\fi}
+\section*{#1}%
+\if@twoside\markright{#1}\fi}
   \defbibheading{subbibintoc}[\refname]{%
-    \section*{#1}%
-    \addcontentsline{toc}{section}{#1}%
-    \if@twoside\markright{#1}\fi}
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\if@twoside\markright{#1}\fi}
   \defbibheading{subbibnumbered}[\refname]{%
-    \section{#1}}}
-    {\relax}%
+\section{#1}}
 }%
+{\relax}}
 \fi
 \newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
 \newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
@@ -2243,9 +2296,6 @@ quotesize,footnotestyle,liststyle,captionstyle}
    \let\item\@idxitem}
   {\if@restonecol\onecolumn\else\clearpage\fi}
 \RequirePackage{appendix}
-\renewcommand{\appendixpagename}{Appendici}
-\renewcommand{\appendixtocname}{Appendici}
-\renewcommand{\appendixname}{Appendice}
 \noappendicestocpagenum
 \def\appendicesname{%
   \ClassError{suftesi}%
@@ -2405,8 +2455,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
     \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
-  \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
-  \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+  \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
+  \fancyhead[CE]{\footnotesize\breakinbodyfalse%
     \SUF@LR@MarkSwitch}
   \fancyfoot[C]{\footnotesize\SUF@thepage}%
   }%
@@ -2415,8 +2465,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \fancyfoot[RE,LO]{%
     \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
   \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
-  \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
-  \fancyhead[RE]{\footnotesize\xheadbreakfalse%
+  \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
+  \fancyhead[RE]{\footnotesize\breakinbodyfalse%
     \SUF@LR@MarkSwitch}
   }%
 \ifsuftesi@article
@@ -2662,14 +2712,6 @@ Janusz M.~Nowacki.
 \setlength\SUF@label@tab
     {\SUF@label@sec}
 }
-\titlecontents{part}
-  [0em]
-  {\addvspace{3ex}\partname\hspace*{.5em}}
-  {\makebox[\SUF@label@part][l]{%
-    \thecontentslabel}\hspace*{1em}}
-  {}
-  {}
-  [\addvspace{1ex}]
 \ifsuftesi@pagelefttoc
 \contentsmargin{0pt}
 \AtBeginDocument{
@@ -3057,6 +3099,36 @@ Janusz M.~Nowacki.
     \if@restonecol\twocolumn\fi
     }
 \fi
+\newcommand{\tocpartname}[1]{\def\SUF@tocpartname{#1}}
+  \tocpartname{\partname}
+\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}}
+\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}}
+\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF@PART@font{#1}}
+  \partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
+\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{\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}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF@tocPARTnum@font{#1}}
+  \tocpartnumfont{}
+\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}}
 \ifsuftesi@article
 \def\chapterintro{%
 \ClassError{suftesi}
@@ -3073,22 +3145,32 @@ Janusz M.~Nowacki.
 \newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
 \chapterintroname{Introduzione}
 \fi
-\newif\ifheadbreak\headbreakfalse
-  \DeclareRobustCommand{\headbreak}
-    {\ifheadbreak\\\else\fi}
-\newif\ifxheadbreak\xheadbreaktrue
-  \def\xheadbreakNL{\ifxheadbreak\newline\else\fi}
-  \def\xheadbreakBB{\ifxheadbreak\\\else\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\headbreaktrue\xheadbreakfalse%
-  \origtableofcontents\endgroup}
+\renewcommand{\tableofcontents}{%
+  \begingroup
+    \breakintoctrue\breakinbodyfalse%
+      \origtableofcontents
+  \endgroup}
+\DeclareRobustCommand{\headbreak}
+  {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+  {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+  {\ifbreakinbody\newline\else\fi}
 \newenvironment{bibliografia}{%
   \ifsuftesi@article
     \section*{\refname}
      \addcontentsline{toc}{section}{\refname}
   \else
-  \chapter{\bibname}%
+    \chapter{\bibname}%
   \fi
       \normalfont \list{}{%
       \setlength{\itemindent}{-\parindent}