suftesi (24jan21)

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

1 files changed, 353 insertions, 354 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 4cf27c69715..2c74099654f 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -26,7 +26,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
+    [2021/01/24 v3.0 A class for typesetting theses, books and articles]
+^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts.
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@compatibility
 \newif\ifsuftesi@nofont
@@ -121,8 +122,8 @@
 \or
   \setkeys{}{structure=collection}
 \fi}
-\define@choicekey{}{defaultfont}[\val\nr]{%
-none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\define@choicekey{}{defaultfont}[\val\nr]
+    {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
 \ifcase\nr\relax
   \suftesi@nofonttrue
 \or
@@ -136,8 +137,8 @@ none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
 \or
   \suftesi@compatibilitytrue
 \fi}
-\define@choicekey{}{mathfont}[\val\nr]{%
-none,minimal,extended}[minimal]{%
+\define@choicekey{}{mathfont}[\val\nr]
+    {none,minimal,extended}[minimal]{%
 \ifcase\nr\relax
   \suftesi@mathminimalfalse
   \suftesi@mathextendedfalse
@@ -146,10 +147,10 @@ none,minimal,extended}[minimal]{%
 \or
   \suftesi@mathextendedtrue
 \fi}
-\define@choicekey{}{greekfont}[\val\nr]{%
-none,artemisia,porson,bodoni,cbgreek}[none]{%
+\define@choicekey{}{greekfont}[\val\nr]
+    {none,artemisia,porson,bodoni,cbgreek}[none]{%
 \ifcase\nr\relax
-\suftesi@greekfontfalse
+  \suftesi@greekfontfalse
 \or
   \suftesi@greekfonttrue\suftesi@artemisiatrue
 \or
@@ -161,8 +162,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \fi}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,standardaureo,periodical,compact,compactaureo,supercompact,
-    supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
+    {standard,standardaureo,periodical,periodicalaureo,compact,compactaureo,
+    supercompact,supercompactaureo,pocketa,pocketb,pocketc}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@partsize}{\Large}
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -211,6 +212,23 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
     marginparwidth= 26mm,
     marginparsep=   10pt}
 \or
+\suftesi@periodicalaureotrue
+  \DeclareRobustCommand{\SUF@partsize}{\large}
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
+  \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
+  \geometry{
+    heightrounded,
+    includeheadfoot=true,
+    textwidth=      120mm,
+    textheight=     194mm,
+    paperwidth=     17cm,
+    paperheight=    24cm,
+    marginratio=    2:3,
+    marginparwidth= 62pt,
+    marginparsep=   10pt}
+\or
 \suftesi@compacttrue
   \DeclareRobustCommand{\SUF@partsize}{\large}
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
@@ -278,23 +296,6 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
     marginratio=    1:1,
     marginparwidth= 11mm,
     marginparsep=   7pt}
-\or
-\suftesi@periodicalaureotrue
-  \DeclareRobustCommand{\SUF@partsize}{\large}
-  \DeclareRobustCommand{\SUF@chaptersize}{\large}
-  \DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
-  \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
-  \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
-  \geometry{
-    heightrounded,
-    includeheadfoot=true,
-    textwidth=      120mm,
-    textheight=     194mm,
-    paperwidth=     17cm,
-    paperheight=    24cm,
-    marginratio=    2:3,
-    marginparwidth= 62pt,
-    marginparsep=   10pt}
 \or% pocketa
 \suftesi@supercompactaureotrue
   \DeclareRobustCommand{\SUF@partsize}{\large}
@@ -321,16 +322,16 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \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}
+    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}
@@ -350,8 +351,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
      marginparwidth= 8mm,
      marginparsep=   7pt}
 \fi}
-\define@choicekey{}{partstyle}[\val\nr]{%
-    left,center,right,parleft,parcenter,parright}[left]{%
+\define@choicekey{}{partstyle}[\val\nr]
+    {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@PARTSwitch{\filright}
 \or
@@ -368,8 +369,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \def\SUF@lr@PARTSwitch{\filleft}
   \suftesi@numparparttrue
 \fi}
-\define@choicekey{}{chapstyle}[\val\nr]{%
-    left,center,right,parleft,parcenter,parright}[left]{%
+\define@choicekey{}{chapstyle}[\val\nr]
+    {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@CHAPSwitch{\filright}
 \or
@@ -386,8 +387,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \def\SUF@lr@CHAPSwitch{\filleft}
   \suftesi@numparchaptrue
 \fi}
-\define@choicekey{}{secstyle}[\val\nr]{%
-    left,center,right,parleft,parcenter,parright}[left]{%
+\define@choicekey{}{secstyle}[\val\nr]
+    {left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SECSwitch{\filright}
 \or
@@ -404,7 +405,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \def\SUF@lr@SECSwitch{\filleft}
   \suftesi@numparsectrue
 \fi}
-\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
+\define@choicekey{}{subsecstyle}[\val\nr]
+    {left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSECSwitch{\filright}
 \or
@@ -412,7 +414,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@lr@SUBSECSwitch{\filleft}
 \fi}
-\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
+\define@choicekey{}{subsubsecstyle}[\val\nr]
+    {left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSUBSECSwitch{\filright}
 \or
@@ -420,7 +423,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@lr@SUBSUBSECSwitch{\filleft}
 \fi}
-\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{partfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@PART@StyleSwitch{\relax}
 \or
@@ -428,7 +432,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{chapfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@CHAP@StyleSwitch{\relax}
 \or
@@ -436,7 +441,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define@choicekey{}{secfont}[\val\nr]
+    {roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
   \def\SUF@SEC@StyleSwitch{\relax}
 \or
@@ -444,7 +450,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{subsecfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@SUBSEC@StyleSwitch{\relax}
 \or
@@ -452,7 +459,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
 \or
   \def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{subsubsecfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@SUBSUBSEC@StyleSwitch{\relax}
 \or
@@ -461,7 +469,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{smallcapsstyle}[\val\nr]
-{low,upper}[low]{%
+    {low,upper}[low]{%
 \ifcase\nr\relax
   \def\suftesi@MakeTextLowercase{\MakeLowercase}
   \def\suftesi@MakeTextTOCLowercase{\lowercase}
@@ -470,7 +478,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \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{}
@@ -490,8 +498,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{%
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
 \fi}
-\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
+\define@choicekey{}{chapnumstyle}[\val\nr]
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
@@ -524,7 +532,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{secnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
@@ -557,7 +565,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{subsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
   \def\SUF@dotsubsec{}
@@ -584,7 +592,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
   \def\SUF@dotsubsubsec{}
@@ -610,8 +618,8 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@dotsubsubsec{.}
   \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
-\define@choicekey{}{tocstyle}[\val\nr]{%
-standard,dotted,ragged,leftpage}[standard]{%
+\define@choicekey{}{tocstyle}[\val\nr]
+    {standard,dotted,ragged,leftpage}[standard]{%
 \ifcase\nr\relax
   \def\SUF@titlerule{\titlerule*{}}
   \def\SUF@chaptitlerule{\titlerule*{}}
@@ -626,8 +634,8 @@ standard,dotted,ragged,leftpage}[standard]{%
 \or
 \suftesi@pagelefttoctrue
 \fi}
-\define@choicekey{}{compacttoc}[\val\nr]{%
-sec,subsec,subsubsec}[sec]{%
+\define@choicekey{}{compacttoc}[\val\nr]
+    {sec,subsec,subsubsec}[sec]{%
 \ifcase\nr\relax
   \suftesi@toccompactsectrue
   \suftesi@toccompactsubsectrue
@@ -650,8 +658,8 @@ sec,subsec,subsubsec}[sec]{%
   \def\suf@ssscorrect{\relax}
   \def\suf@ctocdotsssec{.}
 \fi}
-\define@choicekey{}{twocolcontents}[\val\nr]{%
-toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\define@choicekey{}{twocolcontents}[\val\nr]
+    {toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \ifcase\nr\relax
   \suftesi@twocolumntoctrue
   \setkeys{}{tocstyle=ragged}
@@ -678,17 +686,18 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
   \suftesi@twocolumnloftrue
   \suftesi@twocolumnlottrue
   \setkeys{}{tocstyle=ragged}
-\fi
-}
-\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\fi}
+\define@choicekey{}{tocpartfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
- \def\SUF@tocPART@font{\relax}
+  \def\SUF@tocPART@font{\relax}
 \or
- \def\SUF@tocPART@font{\itshape}
+  \def\SUF@tocPART@font{\itshape}
 \or
- \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps}
+  \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{tocchapfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@tocCHAP@font{\relax}
 \or
@@ -696,7 +705,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \or
   \def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define@choicekey{}{tocsecfont}[\val\nr]
+    {roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
   \def\SUF@tocSEC@font{\relax}
 \or
@@ -704,7 +714,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \or
   \def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{tocsubsecfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@tocSUBSEC@font{\relax}
 \or
@@ -712,7 +723,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \or
   \def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{tocsubsubsecfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@tocSUBSUBSEC@font{\relax}
 \or
@@ -720,7 +732,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \or
   \def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{tocauthorfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@tocAUT@font{\relax}
 \or
@@ -728,7 +741,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \or
   \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
-\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define@choicekey{}{toctitlefont}[\val\nr]
+    {roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
   \def\SUF@tocTIT@font{\relax}
 \or
@@ -737,8 +751,7 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
   \def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
 \define@choicekey{}{headerstyle}[\val\nr]
-    {inner,center,plain,authortitleinner,
-     authortitlecenter}[inner]{%
+    {inner,center,plain,authortitleinner,authortitlecenter}[inner]{%
 \ifcase\nr\relax
   \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
   \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
@@ -783,7 +796,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
   \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,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*.}
@@ -817,15 +831,15 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \define@choicekey{}{footnotestyle}[\val\nr]
     {bulged,hung,dotted,superscript}[bulged]{%
 \ifcase\nr\relax
-    \renewcommand\@makefntext{%
-      \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+  \renewcommand\@makefntext{%
+    \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
 \or
-    \renewcommand\@makefntext{%
-      \leftskip=1em\hskip-1.5em%
-        \makebox[1em][r]{\@thefnmark}\hskip.5em}
+  \renewcommand\@makefntext{%
+    \leftskip=1em\hskip-1.5em%
+      \makebox[1em][r]{\@thefnmark}\hskip.5em}
 \or
-    \renewcommand\@makefntext{%
-         \@thefnmark.\hskip.5em}
+  \renewcommand\@makefntext{%
+    \@thefnmark.\hskip.5em}
 \or
   \renewcommand\@makefntext{%
     \textsuperscript{\@thefnmark}\hskip.3em}
@@ -843,20 +857,20 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
     {standard,sanserif,italic,smallcaps}[standard]{%
 \ifcase\nr\relax
 \or
-   \captionsetup{font+=sf}
+  \captionsetup{font+=sf}
 \or
-   \captionsetup{font+=it}
+  \captionsetup{font+=it}
 \or
-   \captionsetup{labelfont=sc}
-\fi
-}
+  \captionsetup{labelfont=sc}
+\fi}
 \define@choicekey{}{marginpar}[\val\nr]
     {true,false}[true]{%
 \ifcase\nr\relax
 \or
   \renewcommand\marginpar[2][]{}
 \fi}
-\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
+\define@choicekey{}{partpage}[\val\nr]
+    {true,false}[true]{%
 \ifcase\nr\relax
   \suftesi@partpagetrue
 \or
@@ -883,9 +897,9 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \fi}
 \define@choicekey{}{crop}[\val\nr]
     {true,false}[true]{%
-\ClassWarningNoLine{suftesi}{%
-  'crop' option is deprecated.\MessageBreak
-  Use 'version' option instead}
+  \ClassWarningNoLine{suftesi}{%
+    'crop' option is deprecated.\MessageBreak
+    Use 'version' option instead}
 \ifcase\nr\relax
   \setkeys{}{version=draft}
 \or
@@ -1078,59 +1092,56 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%
-    pagelayout=periodicalaureo,
-    style=roman5,
-    chapnumstyle=roman,
-    headerstyle=inner,
-    footnotestyle=hung,
-    liststyle=indented,
-    tocstyle=leftpage}
+  pagelayout=periodicalaureo,
+  style=roman5,
+  chapnumstyle=roman,
+  headerstyle=inner,
+  footnotestyle=hung,
+  liststyle=indented,
+  tocstyle=leftpage}
 \disable@keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+    {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+    subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+    subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+    secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+    quotesize,footnotestyle,liststyle,captionstyle}
 \or
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%
-    pagelayout=periodicalaureo,
-    style=italic5,
-    chapnumstyle=roman,
-    headerstyle=inner,
-    headerfont=italic,
-    footnotestyle=hung,
-    liststyle=indented,
-    tocstyle=leftpage}
+  pagelayout=periodicalaureo,
+  style=italic5,
+  chapnumstyle=roman,
+  headerstyle=inner,
+  headerfont=italic,
+  footnotestyle=hung,
+  liststyle=indented,
+  tocstyle=leftpage}
 \disable@keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+    {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+    subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% quotesize,footnotestyle,liststyle,captionstyle}
 \or
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%
-    pagelayout=periodicalaureo,
-    style=smallcaps5,
-    chapnumstyle=roman,
-    headerstyle=inner,
-    headerfont=smallcaps,
-    secfont=smallcaps,
-    footnotestyle=hung,
-    liststyle=indented,
-    tocstyle=leftpage}
+  pagelayout=periodicalaureo,
+  style=smallcaps5,
+  chapnumstyle=roman,
+  headerstyle=inner,
+  headerfont=smallcaps,
+  secfont=smallcaps,
+  footnotestyle=hung,
+  liststyle=indented,
+  tocstyle=leftpage}
 \disable@keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+    {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+    subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+    subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+    secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+    quotesize,footnotestyle,liststyle,captionstyle}
 \fi}
-\define@choicekey{}{papertitlestyle}[\val\nr]{%
-    left,center,right}[left]{%
+\define@choicekey{}{papertitlestyle}[\val\nr]
+    {left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@coll@titleSwitch{\filright}
 \or
@@ -1145,7 +1156,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \or
   \relax
 \fi}
-\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{titlefont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@titlefont@Switch{\relax}
 \or
@@ -1153,7 +1165,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \or
   \def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
 \fi}
-\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define@choicekey{}{authorfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
   \def\SUF@authorfont@Switch{\relax}
 \or
@@ -1231,10 +1244,10 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \definecolor{sufred}{rgb}{0.5,0,0}
   \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{iftex}
-  \ifLuaTeX
-    \RequirePackage{luatex85}
-    \else
-  \fi
+\ifLuaTeX
+  \RequirePackage{luatex85}
+ \else
+\fi
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
  \else
@@ -1244,8 +1257,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \ifsuftesi@screencentered
       \geometry{hmarginratio=1:1}
     \fi
-\else
-  \RequirePackage[a4,cam,center]{crop}
+  \else
+ \RequirePackage[a4,cam,center]{crop}
 \fi
 \unless\ifPDFTeX
 \AtBeginDocument{%
@@ -1263,18 +1276,17 @@ quotesize,footnotestyle,liststyle,captionstyle}
     * load either 'fontspec' or 'mathspec'\MessageBreak
     * For using suftesi with LuaLaTeX\MessageBreak
     * load 'fontspec' \MessageBreak
-    ************************************}}
-  }
-\else% if pdftex
+    ************************************}}}
+\else
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
 \ifsuftesi@nofont
-    \ifsuftesi@greekfont
-      \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}%
-        \suftesi@greekfontfalse
-          \else\suftesi@greekfontfalse\fi
+\ifsuftesi@greekfont
+  \ClassWarningNoLine{suftesi}{%
+    Unused 'greekfont' option}%
+    \suftesi@greekfontfalse
+      \else\suftesi@greekfontfalse\fi
 \else
 \ifsuftesi@standard
   \RequirePackage{lmodern}
@@ -1445,8 +1457,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \DeclareRobustCommand{\greektext}{%
     \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
     \def\encodingdefault{LGR}}
-  \DeclareTextFontCommand{\textgreek}{\greektext}
-}
+  \DeclareTextFontCommand{\textgreek}{\greektext}}
 \ifsuftesi@cbgreek
    \else
 \DeclareFontFamily{LGR}{bodoni}{}
@@ -1494,16 +1505,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \fi
 \fi
 \RequirePackage[newparttoc]{titlesec}
-    \newlength{\sectionsep}
-    \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\unless\ifPDFTeX% if xetex or luatex
+  \newlength{\sectionsep}
+  \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
+\unless\ifPDFTeX
   \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextTOCLowercase{#1}}
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
-\else% if pdftex
+\else
   \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextTOCLowercase{\textls*{#1}}}%
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
@@ -1533,48 +1544,48 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \fi}
 \def\SUF@default@SECTIONS{
 \ifsuftesi@numparsec
-\titleformat{\section}[display]
-{\SUF@sectionsize\SUF@lr@SECSwitch}
-{\SUF@thesection\SUF@dotsec}
-{0ex}
-{\SUF@SEC@StyleSwitch}
+  \titleformat{\section}[display]
+    {\SUF@sectionsize\SUF@lr@SECSwitch}
+    {\SUF@thesection\SUF@dotsec}
+    {0ex}
+    {\SUF@SEC@StyleSwitch}
   \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
-\titleformat{\section}[hang]
-{\SUF@sectionsize\SUF@lr@SECSwitch}
-{\SUF@thesection\SUF@dotsec}
-{1em}
-{\SUF@SEC@StyleSwitch}
+  \titleformat{\section}[hang]
+    {\SUF@sectionsize\SUF@lr@SECSwitch}
+    {\SUF@thesection\SUF@dotsec}
+    {1em}
+    {\SUF@SEC@StyleSwitch}
   \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi@numparsubsec
-\titleformat{\subsection}[display]
-{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-{\textnormal\SUF@thesubsection\SUF@dotsubsec}
-{0ex}
-{\SUF@SUBSEC@StyleSwitch}
+  \titleformat{\subsection}[display]
+    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+    {\textnormal\SUF@thesubsection\SUF@dotsubsec}
+    {0ex}
+    {\SUF@SUBSEC@StyleSwitch}
   \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
-\titleformat{\subsection}[hang]
-{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-{\textnormal\SUF@thesubsection\SUF@dotsubsec}
-{1em}
-{\SUF@SUBSEC@StyleSwitch}
+  \titleformat{\subsection}[hang]
+    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+    {\textnormal\SUF@thesubsection\SUF@dotsubsec}
+    {1em}
+    {\SUF@SUBSEC@StyleSwitch}
   \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi@numparsubsubsec
-\titleformat{\subsubsection}[display]
-{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
-{0ex}
-{\SUF@SUBSUBSEC@StyleSwitch}
+  \titleformat{\subsubsection}[display]
+    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+    {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+    {0ex}
+    {\SUF@SUBSUBSEC@StyleSwitch}
   \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
-\titleformat{\subsubsection}[hang]
-{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
-{1em}
-{\SUF@SUBSUBSEC@StyleSwitch}
+  \titleformat{\subsubsection}[hang]
+    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+    {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+    {1em}
+    {\SUF@SUBSUBSEC@StyleSwitch}
   \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
   \fi}
 \SUF@default@CHAPTER
@@ -1614,100 +1625,100 @@ 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'}}
+  {\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}
+  \@arabic\c@section}
 \renewcommand\thesubsection{%
-\thesection.\@arabic\c@subsection}
+  \thesection.\@arabic\c@subsection}
 \renewcommand\thesubsubsection{%
-\thesubsection.\@arabic\c@subsubsection}
+  \thesubsection.\@arabic\c@subsubsection}
 \renewcommand\theparagraph{%
-\thesubsubsection.\@arabic\c@paragraph}
+  \thesubsubsection.\@arabic\c@paragraph}
 \renewcommand\thesubparagraph{%
-\theparagraph.\@arabic\c@subparagraph}
+  \theparagraph.\@arabic\c@subparagraph}
 \renewcommand\part{%
-\ifsuftesi@partpage
-\if@openright
-\cleardoublepage
-\else
-\clearpage
-\fi
-\thispagestyle{plain}%
-\fi 
-\if@twocolumn
-\onecolumn
-\@tempswatrue
-\else
-\@tempswafalse
-\fi
-\ifsuftesi@partpage
-\null\vfil
-\fi
-\secdef\@part\@spart}
+  \ifsuftesi@partpage
+  \if@openright
+  \cleardoublepage
+  \else
+  \clearpage
+  \fi
+  \thispagestyle{plain}%
+  \fi
+  \if@twocolumn
+  \onecolumn
+  \@tempswatrue
+  \else
+  \@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
-\par
-\vskip2ex
-\else
-\hspace{1em}
-\fi
-\noindent\SUF@PART@StyleSwitch#2\par}%
-\@endpart}
+  \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
+    \par
+    \vskip2ex
+    \else
+    \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}
+  {\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}
+  \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}
+  \if@twoside
+  \if@openright
+  \null
+  \thispagestyle{empty}%
+  \newpage
+  \fi
+  \fi
+  \if@tempswa
+  \twocolumn
+  \fi}
 \fi
 \titleformat{\paragraph}[runin]
   {}
@@ -1727,63 +1738,61 @@ using 'structure=article'}}
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
-\section*{#1}%
-\@mkboth{#1}{#1}}
+    \section*{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{biblist}[\biblistname]{%
-\section*{#1}%
-\@mkboth{#1}{#1}}
+    \section*{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{bibintoc}[\refname]{%
-\section*{#1}%
-\addcontentsline{toc}{section}{#1}%
-\@mkboth{#1}{#1}}
+    \section*{#1}%
+    \addcontentsline{toc}{section}{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{biblistintoc}[\biblistname]{%
-\section*{#1}%
-\addcontentsline{toc}{section}{#1}%
-\@mkboth{#1}{#1}}
+    \section*{#1}%
+    \addcontentsline{toc}{section}{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\refname]{%
-\section{#1}}
+    \section{#1}}
   \defbibheading{biblistnumbered}[\biblistname]{%
-\section{#1}}
+    \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}}
-}%
+    \subsection{#1}}}
 {\relax}}
 \else
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
-\chapter*{#1}%
-\@mkboth{#1}{#1}}
+    \chapter*{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{biblist}[\biblistname]{%
-\chapter*{#1}%
-\@mkboth{#1}{#1}}
+    \chapter*{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{bibintoc}[\bibname]{%
-\chapter*{#1}%
-\addcontentsline{toc}{chapter}{#1}%
-\@mkboth{#1}{#1}}
+    \chapter*{#1}%
+    \addcontentsline{toc}{chapter}{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{biblistintoc}[\biblistname]{%
-\chapter*{#1}%
-\addcontentsline{toc}{chapter}{#1}%
-\@mkboth{#1}{#1}}
+    \chapter*{#1}%
+    \addcontentsline{toc}{chapter}{#1}%
+    \@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\bibname]{%
-\chapter{#1}}
+    \chapter{#1}}
   \defbibheading{biblistnumbered}[\biblistname]{%
-\chapter{#1}}
+    \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}}
-}%
+    \section{#1}}}
 {\relax}}
 \fi
 \newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
@@ -1977,7 +1986,7 @@ using 'structure=article'}}
    \global\let\@date\@empty
    \global\let\date\relax
    \global\let\and\relax}
-     \def\@maketitle{%
+\def\@maketitle{%
    \newpage
    \null
    \vskip 2em%
@@ -2191,15 +2200,15 @@ using 'structure=article'}}
     \fi\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}
+  {\begingroup
+  \setcounter{section}{0}
+  \setcounter{footnote}{0}
+  \setcounter{figure}{0}
+  \setcounter{table}{0}}
+  {\label{end:\thearticle}
+    \cleardoublepage
+      \global\let\@thanks\@empty
+    \endgroup}
 \newcommand{\frontispiece}{%
   \thispagestyle{empty}%
     \begingroup
@@ -2212,7 +2221,7 @@ using 'structure=article'}}
        \@collectioneditor
        \vspace*{\stretch{3}}
 
-  \endgroup
+    \endgroup
   \clearpage}
   \setcounter{tocdepth}{0}
   \renewcommand\thesection{%
@@ -2331,8 +2340,7 @@ using 'structure=article'}}
   \fi
   \if@tempswa
   \twocolumn
-  \fi
-}
+  \fi}
 \renewcommand{\@sec@pppage}{%
   \par
   \addvspace{4ex}%
@@ -2348,8 +2356,7 @@ using 'structure=article'}}
   \fi
   \nobreak
   \vskip 3ex
-  \@afterheading
-}
+  \@afterheading}
 \def\suf@appendixtoc{%
   \ifsuftesi@pagelefttoc
   \titlecontents{chapter}
@@ -2410,8 +2417,7 @@ using 'structure=article'}}
     \SUF@tocSEC@font}
   {\ifsuftesi@article\SUF@chaptitlerule%
     \else\SUF@titlerule\fi\contentspage}
-  \fi
-}
+  \fi}
 \ifsuftesi@article
 \renewcommand\appendix{\par
   \suf@appendixtoc%
@@ -2458,8 +2464,7 @@ using 'structure=article'}}
   \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
   \fancyhead[CE]{\footnotesize\breakinbodyfalse%
     \SUF@LR@MarkSwitch}
-  \fancyfoot[C]{\footnotesize\SUF@thepage}%
-  }%
+  \fancyfoot[C]{\footnotesize\SUF@thepage}}
 \fancypagestyle{sufdefault}{%
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
@@ -2467,19 +2472,18 @@ using 'structure=article'}}
   \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
   \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
   \fancyhead[RE]{\footnotesize\breakinbodyfalse%
-    \SUF@LR@MarkSwitch}
-  }%
+    \SUF@LR@MarkSwitch}}
 \ifsuftesi@article
-        \ifsuftesi@authortitle
-        \def\SUF@LR@MarkSwitch{\SUF@leftmark}
-        \else
-        \def\SUF@LR@MarkSwitch{\SUF@rightmark}
-        \fi
+  \ifsuftesi@authortitle
+    \def\SUF@LR@MarkSwitch{\SUF@leftmark}
+  \else
+    \def\SUF@LR@MarkSwitch{\SUF@rightmark}
+  \fi
 \else
-        \def\SUF@LR@MarkSwitch{\SUF@leftmark}
+  \def\SUF@LR@MarkSwitch{\SUF@leftmark}
 \fi
 \def\SUF@leftrightmark{%
- \if@mainmatter\leftmark\else\rightmark\fi}
+  \if@mainmatter\leftmark\else\rightmark\fi}
 \pagestyle{sufdefault}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
@@ -2521,7 +2525,7 @@ using 'structure=article'}}
 \def\thefootnote{\@fnsymbol\c@footnote}%
 \else\fi
 \newcommand*\xfootnote[1][*]{%
-    \xdef\@thefnmark{#1}%
+  \xdef\@thefnmark{#1}%
     \@footnotemark\@footnotetext}
 \def\SUF@mpsetup{%
   \itshape
@@ -2536,19 +2540,19 @@ using 'structure=article'}}
      {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
 \AtBeginDocument{%
 \@ifpackageloaded{todonotes}{%
-\renewcommand{\@todonotes@drawMarginNoteWithLine}{%
-\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
-    \node [coordinate] (inText) {};%
-\end{tikzpicture}%
-\oldmarginpar[{% Draw note in left margin
-    \@todonotes@drawMarginNote%
-    \@todonotes@drawLineToLeftMargin%
-}]{% Draw note in right margin
-    \@todonotes@drawMarginNote%
-    \@todonotes@drawLineToRightMargin%
-}%
-}%
-}
+  \renewcommand{\@todonotes@drawMarginNoteWithLine}{%
+    \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+      \node [coordinate] (inText) {};%
+    \end{tikzpicture}%
+      \oldmarginpar[{% Draw note in left margin
+      \@todonotes@drawMarginNote%
+      \@todonotes@drawLineToLeftMargin%
+      }]{% Draw note in right margin
+      \@todonotes@drawMarginNote%
+      \@todonotes@drawLineToRightMargin%
+      }
+    }
+  }
 {\relax}}
 \ifsuftesi@collection
   \newenvironment{abstract}{%
@@ -2585,7 +2589,7 @@ using 'structure=article'}}
         \quotation
       \fi}
       {\if@twocolumn\else\endquotation\fi}
-\fi
+  \fi
 \fi
 \newcommand\abstractname{Abstract}
 \newcommand{\colophon}[3][]{%
@@ -2669,9 +2673,7 @@ Janusz M.~Nowacki.
 \newcommand*{\toclabelwidth}[2]{%
   \AtBeginDocument{
     \addtolength{\csname SUF@label@#1\endcsname}{#2}%
-    \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}%
-  }
-}
+    \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}}
 \newcommand{\adjtoclabelsep}{\hskip.2em plus 1pt minus 1pt}
 \newcommand{\adjtocpagesep}{\hskip.5em plus 2pt minus 1pt}
 \newcommand{\toclabelspace}{%
@@ -2686,7 +2688,7 @@ Janusz M.~Nowacki.
     See package documentation for details}}
 \newlength{\SUF@tochang}
 \setlength{\SUF@tochang}{3em}
-\AtBeginDocument{
+\AtBeginDocument{%
 \newlength\SUF@label@part
 \newlength\SUF@label@sec
 \newlength\SUF@label@subsec
@@ -2710,11 +2712,10 @@ Janusz M.~Nowacki.
 \setlength\SUF@label@fig
     {\SUF@label@sec}
 \setlength\SUF@label@tab
-    {\SUF@label@sec}
-}
+    {\SUF@label@sec}}
 \ifsuftesi@pagelefttoc
 \contentsmargin{0pt}
-\AtBeginDocument{
+\AtBeginDocument{%
 \newlength\SUF@tochang@chap
 \newlength\SUF@tochang@sec
 \newlength\SUF@tochang@subsec
@@ -2762,8 +2763,7 @@ Janusz M.~Nowacki.
 \setlength\SUF@addto@tochang@fig
     {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
 \setlength\SUF@addto@tochang@tab
-    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
-}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}}
 \titlecontents{chapter}
   [\SUF@tochang@chap]
   {\addvspace{2ex}}
@@ -2865,7 +2865,7 @@ Janusz M.~Nowacki.
   {}
   {}
 \else
-\AtBeginDocument{
+\AtBeginDocument{%
 \newlength\SUF@tocindent@chap
 \newlength\SUF@tocindent@sec
 \newlength\SUF@tocindent@subsec
@@ -2906,8 +2906,7 @@ Janusz M.~Nowacki.
     {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
 \setlength\SUF@tocindent@tab
     {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
-\fi
-}
+\fi}
 \titlecontents{chapter}
   [\SUF@tocindent@chap]
   {\addvspace{2ex}}