suftesi (21may20)

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

4 files changed, 1795 insertions, 1364 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 02e73f34abb..9cbbbd45808 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
index e3f0f25ca3c..31431b941e8 100644
--- a/Master/texmf-dist/doc/latex/suftesi/templates.zip
+++ 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 8faa427e855..cdeca22b56a 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -4,28 +4,34 @@
 \input docstrip
 \preamble
 
- Copyright 2009-2020 by Ivan Valbusa
+The 'suftesi' document class 
+Copyright (C) 2009-2020 Ivan Valbusa
+<ivan dot valbusa at gmail dot com> 
 
- This program is provided under the terms of the
- LaTeX Project Public License distributed from CTAN
- archives in directory macros/latex/base/lppl.txt.
+All rights reserved.
 
- Author: Ivan Valbusa
-         ivan dot valbusa at univr dot it
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version. 
+The latest version of this license is in
+   http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
 
- This work has the LPPL maintenance status "author-maintained".
+This work consists of all files listed in README
 
-\endpreamble
+This work has the LPPL maintenance status "author-maintained".
 
+\endpreamble
 \keepsilent
 \askforoverwritefalse
 
 \Msg{*** Generating the class file ***}
-\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
-   \nopreamble\nopostamble
-   \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
- }
- 
+\generate{
+  \file{suftesi.cls}{\from{suftesi.dtx}{class}}
+  \nopreamble\nopostamble
+  \file{suftesi.bib}{\from{suftesi.dtx}{bib}}} 
+
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
@@ -40,26 +46,9 @@
 \Msg{*}
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
-
 \endgroup
 %</internal>
-%
-% Copyright (C) 2009-2020 by Ivan Valbusa 
-% <ivan dot valbusa at univr dot it>
-% -------------------------------------------------------
-% 
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work consists of all files listed in README
-%
 % \fi
-%
 % \iffalse
 %<*driver>
 \ProvidesFile{suftesi.dtx}
@@ -67,87 +56,79 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
+    [2020/05/21 v2.9.9 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\documentclass[10pt]{ltxdoc}
+\documentclass[12pt]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[greek.ancient,english]{babel}
-% fonts and colors
-\usepackage{cochineal}
-\usepackage[varqu,varl,var0]{inconsolata}
-\usepackage{biolinum}
-\usepackage{amsthm}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+%--------------------------------------------------------
+% GRAPHICS
+%--------------------------------------------------------
 \usepackage[svgnames]{xcolor}
 \definecolor{philA}{named}{DarkRed}
 \definecolor{philB}{named}{NavyBlue}
 \definecolor{sufred}{rgb}{0.5,0,0}
 \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
-\usepackage{metalogo}
-\usepackage{guit}
+\usepackage{tikz}
+\usetikzlibrary{shadows}
+\usepackage[framemethod=TikZ]{mdframed}
+\mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
+%--------------------------------------------------------
+% DOC FACILITIES
+%--------------------------------------------------------
+\usepackage{metalogo,hologo}
+\usepackage{guit}% before ltxdockit but after xcolor!
 \usepackage[final]{microtype}
-% doc facilities
 \let\cs\relax
 \let\cmd\relax
 \usepackage{ltxdockit}
-\usepackage{siunitx}
+%--------------------------------------------------------
+% FONTS
+%--------------------------------------------------------
+\usepackage{cochineal}
 % To use the cochineal inside the document we have to define the family
 % because the .fd files of the font refer to conditionals 
 % defined in 'cochineal.sty’:
 \DeclareFontFamily{T1}{Cochineal-LF}{}
 \DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
-	<-> s*[1.0] Cochineal-Roman-osf-t1}{}
-% layout
+  <-> s*[1.0] Cochineal-Roman-osf-t1}{}
+\usepackage[varqu,varl,var0]{inconsolata}
+\usepackage{biolinum}
+\usepackage{amsthm}
+\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cal=boondoxo]{mathalpha}
+%--------------------------------------------------------
+% LAYOUT
+%--------------------------------------------------------
+\usepackage[skip=1.5ex]{parskip}
 \setcounter{tocdepth}{3}
 \usepackage{geometry}
 \geometry{
-	a4paper,
-	margin=3cm,
-	headheight=15pt,
-	ignoreall,
-	heightrounded}
+  a4paper,
+  margin=3cm,
+  %paperwidth=128mm,
+  %paperheight=96mm,
+  %margin=1cm,
+  headheight=15pt,
+  ignoreall,
+  heightrounded}
 \usepackage{sectsty}
 \allsectionsfont{\sffamily}
-\usepackage{fancyhdr}
-\fancyhf{}
-\fancyhead[L]{© 2009-\the\year\quad Ivan Valbusa}
-\fancyfoot[L]{\textsf{suftesi} 
-	\fileversion{}~--~\filedate}
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyhead[R]{\thepage}
-\pagestyle{fancy}
-% Graphics
-\usepackage[framemethod=TikZ]{mdframed}
-  \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
-\usepackage{tikz}
-  \usetikzlibrary{shadows}
-\usepackage{afterpage}
-% Tables
+% --------------------------------------------------------
+% OTHER PACKAGES
+% --------------------------------------------------------
+\usepackage[autostyle]{csquotes}
+\usepackage[style=philosophy-classic,backend=biber]{biblatex}
+\addbibresource{suftesi.bib}
 \usepackage{array}
 \usepackage{booktabs}
 \usepackage{multirow}
-% Bibliography
-\usepackage[autostyle]{csquotes}
-\usepackage[style=philosophy-classic,backend=biber]{biblatex}
-  \addbibresource{suftesi.bib}
-\usepackage{metalogo}
-\usepackage{guit}
-% Greek examples
-\def\latintxt{Aliquam auctor, pede consequat
-  laoreet varius, eros tellus maris quam, pellentesque hendrerit.}  
-\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
-  nibh est placerat.}
-\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
-ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
-ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
-\newcommand{\greekexample}[4]{%
-	\noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt}% 
-		{ \fontfamily{#2}\fontsize{#4}{13}\selectfont%
-		\textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
-% New commands
+\usepackage{siunitx}
+%--------------------------------------------------------
+% COMMANDS AND ENVIRONMENTS
+%--------------------------------------------------------
 \newcommand{\new}{\marginpar{\textcolor{red}{\textbf{NEW!}}}}
 \newcommand{\argstyle}{\itshape}
 \DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
@@ -156,85 +137,79 @@
   $\langle${\argstyle\rmfamily#1\kern0.12em}$\rangle$}
 \DeclareRobustCommand*{\arm}[1]{\ar{\meta{\argstyle#1}}}
 \DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
+\newcommand*{\OR}{${}\mid{}$}
 % New environments
-\newenvironment{ttquote}
-  {\begin{mdframed}[default]
-  \ttfamily\microtypesetup{activate=false}}
-  {\end{mdframed}}
-\newenvironment{latexcode}
-  {\begin{mdframed}[default]}
-  {\end{mdframed}}
+\newenvironment{ttquote}{%
+  \begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
+\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
 % Correct (?) \optitem to use \meta inside #2
 \makeatletter
 \renewcommand*{\ltd@ol@optitem}[3][]{%
   \ifblank{#1}
-    {\ltd@option{}{#2}{#3}{}}
-    {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
-\def\ltd@textverb#1{~#1~}
-\renewenvironment*{optionlist}
-{\list{}{%
-		\setlength{\labelwidth}{2.5cm}%
-		\setlength{\labelsep}{\z@}%
-		\setlength{\leftmargin}{2.5cm}%
-		\renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
-	\ltd@optionlist}
-{\endlist}
-\renewenvironment*{ltxsyntax}[1][3cm]
-{\list{}{%
-		\setlength{\labelwidth}{3cm}%
-		\setlength{\labelsep}{0pt}%
-		\setlength{\leftmargin}{#1}%
-		\renewcommand*{\makelabel}[1]{%
-			\hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}%
-	\let\csitem\ltd@csitem
-	\let\cmditem\ltd@cmditem
-	\let\envitem\ltd@envitem
-	\let\lenitem\ltd@csitem
-	\let\boolitem\ltd@boolitem
-	\let\cntitem\ltd@item
-	\let\optitem\ltd@item}
-{\endlist}
-{\endlist}
+  {\ltd@option{}{#2}{#3}{}}
+  {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
 \renewenvironment*{valuelist}[1][]
 {\list{}{%
-		\ifblank{#1}
-		{\setlength{\labelwidth}{5em}}
-		{\setlength{\labelwidth}{#1}}%
-		\setlength{\labelsep}{1em}%
-		\setlength{\leftmargin}{\labelwidth}%
-		\addtolength{\leftmargin}{\labelsep}%
-		\setlength{\itemsep}{0pt}%
-		\renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
+    \ifblank{#1}
+    {\setlength{\labelwidth}{5em}}
+    {\setlength{\labelwidth}{#1}}%
+    \setlength{\labelsep}{1em}%
+    \setlength{\leftmargin}{\labelwidth}%
+    \addtolength{\leftmargin}{\labelsep}%
+    \setlength{\itemsep}{0pt}%
+    \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
 {\endlist}
 \newcommand*{\valuelistfont}{%
-	\color{olive}\sffamily\displayverbfont}
+  \color{olive}\sffamily\displayverbfont}
 \renewcommand*{\optionlistfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 \renewcommand*{\ltxsyntaxlabelfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 \renewcommand*{\marglistfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 % Table of contents
 \renewcommand\tableofcontents{%
-	\setlength{\columnsep}{1cm}
-	{\centering      
-		\section*{\contentsname}%
-		\@mkboth{\contentsname}{\contentsname}}   
-	\thispagestyle{empty}
-	\begin{multicols}{2}
-		\@starttoc{toc}%
+  \setlength{\columnsep}{1cm}
+  {\centering      
+    \section*{\contentsname}%
+    \@mkboth{\contentsname}{\contentsname}}   
+  \thispagestyle{empty}
+  \begin{multicols}{2}
+    \@starttoc{toc}%
 \end{multicols}}
 \makeatother
-% hyperref setup
+% --------------------------------------------------------
+% GREEK EXAMPLES
+% --------------------------------------------------------
+\makeatletter
+\newcommand{\mygrsize}{\f@size}
+\makeatother
+\newcommand{\mygrpxsize}{12.5}
+\def\latintxt{Aliquam auctor, pede consequat
+  laoreet varius, eros tellus maris quam, pellentesque hendrerit.}  
+\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
+  nibh est placerat.}
+\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
+ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
+ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
+\newcommand{\greekexample}[4]{%
+  \noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt\ }% 
+    {\fontfamily{#2}\fontsize{#4}{13}\selectfont%
+    \textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
+% --------------------------------------------------------
+% HYPERREF SETUP
+% --------------------------------------------------------
 \usepackage{hyperref}
 \hypersetup{%
-	hidelinks,
+  hidelinks,
     pdftitle={User's Guide to \textsf{suftesi}},
     pdfsubject={A document class for typesetting theses, 
       books and articles},
     pdfauthor={Ivan Valbusa},
     pdfkeywords={thesis, humanities, books}}   
-
+% --------------------------------------------------------
+% FINAL SETTINGS
+% --------------------------------------------------------
 \EnableCrossrefs         
 \CodelineIndex
 \RecordChanges
@@ -246,7 +221,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{5277}
+% \CheckSum{5385}
 %
 % \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
@@ -264,6 +239,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.9.9}{2020/05/21}{Removed a bug with \cmd{appendix} and roman chapter numbers in table of contents. Updated documentation.}
 % \changes{v2.9.8}{2020/02/24}{Removed license restrictions. Updated documentation.}
 % \changes{v2.9.7}{2020/02/22}{New option \opt{fontisize}. The \opt{parindent} options now accepts arbitrary values. Updated documentation.}
 % \changes{v2.9.6a}{2020/02/11}{Maintenance release}
@@ -356,17 +332,62 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
+% \thispagestyle{empty}
+% \begin{tikzpicture}[overlay,remember picture]
+% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm) node[align=center,anchor=center] {%
+% Ivan Valbusa\\[1cm]
+% 
+%\Huge\color{gray}\bfseries \parbox{10cm}{\centering The \\{{\color{philA}\fontsize{30}{32}\textsf{suftesi}}\\ document class}}\\[1cm]
+% \color{black!60!Goldenrod}
+%
+%\normalsize \fileversion{} -- \filedate
+% 
+%};
+% \end{tikzpicture}
+% \clearpage\thispagestyle{empty}
+%
+% \null\vfill
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Legalese}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%	
+% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
+% \smallskip
+%
+% \noindent This package is author-maintained. 
+% Permission is granted to copy, distribute and/or modify this software 
+% under the terms of the \LaTeX{} Project Public License, version 1.3 or 
+% later (\url{http://latex-project.org/lppl}). 
+% This software is provided ``as is'', without warranty of any kind, 
+% either expressed or implied, including, but not limited to, the implied 
+% warranties of merchantability and fitness for a particular purpose.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Feedback}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% If you have any questions, feedback or requests please email 
+% me at \texttt{ivan dot valbusa at gmail dot com}. If you need specific 
+% features not already implemented, remember to attach the example files.
+%
+% \clearpage
+%
 % \begin{center}
-% {\color{philA}\bfseries 
-%   \Huge User's Guide to \textsf{suftesi}\\[3mm]}
-% {\large\itshape A document class for typesetting theses,  books and articles}
+% {\color{philA}\bfseries\sffamily 
+%   \Huge User's Guide to \texttt{suftesi}\\[3mm]}
+% {\large\bfseries\sffamily A document class for typesetting theses,  books and articles}
 % \vspace{.8cm}
 %
 % \normalsize\fileversion{} -- \filedate
 % \vspace{.7cm}
 %
 % Ivan Valbusa\\[2mm]
-%  \footnotesize\texttt{Ivan dot Valbusa at univr dot it}
+%  \footnotesize\texttt{ivan dot valbusa at gmail dot com}
 % \vspace{1cm}
 % \end{center} 
 % \begin{abstract}
@@ -376,70 +397,94 @@
 % provides a set of ``humanistic'' page layouts, title styles 
 % and heading styles to typeset books, articles and theses. 
 % The styles are very simple and sober and also have the aim of
-% finding an aesthetic harmony in the formal simplicity  \parencite[see][]{valbusa:20122}. They are
+% finding an aesthetic harmony in the formal simplicity  
+% \parencite[see][]{valbusa:20122}. They are
 % largely inspired by some interesting readings, particularly
-% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
+% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, 
+% \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
 % \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}.
 % \end{abstract}
 %
-% \tableofcontents
-%
-% \section*{Legalese}
-%
-% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
-% \smallskip
-%
-% \noindent This package is author-maintained. 
-% Permission is granted to copy, distribute and/or modify this software under the 
-% terms of the LaTeX Project Public License, version 1.3 or later (\url{http://latex-project.org/lppl}). 
-% This software is provided ``as is'', without warranty of any kind, either expressed or implied, 
-% including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \tableofcontents
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section*{A brief history}
+% \clearpage
 %
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona. 
 %
-% \section*{Acknowledgments}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{A brief history}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione 
+	% a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human 
+	% sciences}) which I held at the Graduate School of Human Sciences and Philosophy 
+% (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e 
+% \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 
+% 2010. Originally thought as a class to typeset theses, during these years 
+% it has developed many new features and styles. Finally it has become the 
+% referential class of the Joint Project \emph{Formal Style for PhD 
+	% Theses with \LaTeX} of the University of Verona. 
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Acknowledgments}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % I would like to thank Professors Paola Di~Nicola,
-% Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
-% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
-% I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
-
-% \section*{Feedback}
-%
-% \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
+% Director of the Graduate School, and Ugo Savardi who suggested to propose 
+% the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and 
+% Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; 
+% Catia Cordioli, for her help in the organization of the lessons; 
+% Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided 
+% the \TeX{}~Live~2009 \textsc{DVD}s.
+% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, 
+% for the \TeX pert support and his priceless ``magic formulas'', and Tommaso 
+% Gordini for his valuable advice in choosing and improving the class 
+% features during these years. I would finally thank all the participants 
+% to the course who patiently resisted the four intensive lessons. 
+% This work is dedicated to them.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Usage}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{Use}
+% The class can be loaded as usual with:
 %
-% The \sty{suftesi} class is called as usual by
 % \begin{ttquote}
 % \cmd{documentclass}\oarm{options}\{suftesi\}
 % \end{ttquote}
-% All the options defined by the class are in the \meta{key}=\meta{value} format.
-%
-% In addition to these you can also use the options defined by the standard \sty{book} class (on which \sty{suftesi} is based) except those modifying 
-% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are automatically disabled. The class loads the packages listed in table \ref{tab:pkgloaded}.
-%
-% \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
-% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX) and to select a main font. 
-%
+% All the options defined by the class are in 
+% the \meta{key}\texttt{=}\meta{value} format. In addition to these you can
+% also use the options defined by the standard 
+% \sty{book} class (on which \sty{suftesi} is based) except those modifying 
+% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper}, 
+%\opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are 
+% automatically disabled. The class loads the packages listed in 
+% the following table.
 %
 % \begin{table}[h]
 % \centering 
 % \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
 % \toprule
-% 					&	textrm{Global}					& 	appendix, caption, color, crop, enumitem, emptypage, 
-% 															fancyhdr, fixltxhyph, fontenc, geometry, iftex,
-% 															microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses)	\\\midrule
-% 					&	\textrm{pdf\LaTeX{} only}		&	fontenc, substitutefont											\\\midrule
-% 					&	\textrm{Lua\LaTeX{} only}		&	luatex85														\\\midrule
-% defaultfont~=		&	~standard						&	lmodern															\\
-% 					&	~palatino						&	textcomp, newpxtext, biolinum, inconsolata, newpxmath			\\
-% 					&	~libertine						&	textcomp, libertine, biolinum, inconsolata, newtxmath			\\
-% 					&	~cochineal						&	textcomp, cochineal, biolinum, inconsolata, newtxmath			\\
-% 					&	~compatibility					&	mathpazo, beramono												\\\midrule
-% mathfont~=		&	~extended						&	amsthm, mathalfa												\\\bottomrule
+%               &  \textrm{Global}           &   appendix, caption, color, crop, enumitem, emptypage, 
+%                               fancyhdr, fixltxhyph, fontenc, geometry, iftex,
+%                               microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses)            \\\midrule
+%               &  \textrm{pdf\LaTeX{} only} &  fontenc, substitutefont                                   \\\midrule
+%               &  \textrm{Lua\LaTeX{} only} &  luatex85                                                  \\\midrule
+% defaultfont~=                              &  ~standard                                   &  lmodern    \\
+%               &  ~palatino                 &  textcomp, newpxtext, biolinum, inconsolata, newpxmath     \\
+%               &  ~libertine                &  textcomp, libertine, biolinum, inconsolata, newtxmath     \\
+%               &  ~cochineal                &  textcomp, cochineal, biolinum, inconsolata, newtxmath     \\
+%               &  ~compatibility            &  mathpazo, beramono                                        \\\midrule
+% mathfont~=    &  ~extended                 &  amsthm, mathalpha                                          \\\bottomrule
 % \end{tabular}
 % \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
 % \end{table}
@@ -447,68 +492,129 @@
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{Class features}
+% For using the class with the \XeTeX{} and \LuaTeX{} engines you need 
+% to load the \sty{fontspec} package (\sty{mathspec} is an alternative 
+% only for \XeTeX) and to select a main font. 
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Class features}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
-% The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at 
+% The \sty{suftesi} class provides a large set of options to customize 
+% the style of page, titles, headings and other text elements (see section 
+% \ref{sec:options}). The simplest way to get to know the class features 
+% is therefore to typeset one of the templates which you can find in the 
+% \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution 
+% \parencite[see also][]{valbusa:20122}. The class files as well as the 
+% templates are also available online on the CTAN’s website at 
 % \textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
 %
-% \subsection{Document structure}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Document structure}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
-% With \sty{suftesi} you can typeset book-style documents (with chapters), article-style documents (without chapters) and collections of papers (see section \ref{sec:collection}). The kind of document is set by the \opt{structure} option which defaults to \opt{book} (see section \ref{sec:options}).
-%
-% \begin{ttquote}
-% \cmd{documentclass}[structure=\meta{value},\meta{options}]\{suftesi\}
-% ^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\
-% ^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\}
-% \end{ttquote}
-%
-% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. It is not compatible with \sty{crop}.}
+% With \sty{suftesi} you can typeset book-style documents (with chapters), 
+% article-style documents (without chapters) and collections of papers 
+% (see section \ref{sec:collection}). The kind of document is set by the 
+% \opt{structure} option which defaults to \opt{book} (see section 
+% \ref{sec:options}).
+%
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer 
+% loaded. It is not compatible with \sty{crop}.}
 % 
-% \subsection{Page layouts}
-%
-% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset  A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts  the \opt{version=screen} and \opt{version=cscreen} options are particularly useful as they show the output in its real size. See section \ref{sec:page-styles} for details.
-%
-% \begin{table}[h]
-% \centering
-% \begin{tabular}{lcccccccl}
-% \toprule
-% 							&	\multicolumn{4}{c}{Dimensions(mm)}		&	\multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){6-9}
-% 							&	\multicolumn{2}{c}{Typeblock}&	\multicolumn{2}{c}{Page}&	\multicolumn{2}{c}{Margins}	
-% 							&	\multicolumn{2}{c}{Stock}\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}
-% Layout					&	w	&	h	&	w	&	h	&	t\,/\,b	&	i	\,/\,o	&	Typeblock									&	Page\\
-% \cmidrule(r){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}\cmidrule(r){1-1}
-% \opt{standard}			&	110	&	220	&	210	&	297	&	$1:2$	&	$1:2$		&	$1:2$										&	$1:\sqrt{2}$	\\
-% \opt{standardaureo}		&	136	&	220	&	210	&	297	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$1:\sqrt{2}$	\\
-% \opt{compact}				&	110	&	165	&	160	&	240	&	$2:3$	&	$2:3$		&	$2:3$										&	$2:3$			\\
-% \opt{compactaureo}		&	118	&	191	&	160	&	240	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$2:3$			\\
-% \opt{supercompact}		&	100	&	150	&	140	&	210	&	$2:3$	&	$2:3$		&	$2:3$										&	$2:3$			\\
-% \opt{supercompactaureo}	&	108	&	175	&	140	&	210	&	$1:1$	&	$1:1$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$2:3$			\\
-% \opt{periodical}			&	110	&	165	&	170	&	240	&	$2:3$	&	$2:3$		&	$2:3$										&	$1:\sqrt{2}$	\\
-% \opt{periodicalaureo}		&	120	&	194	&	170	&	240	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$1:\sqrt{2}$	\\
-% \bottomrule\\[-2ex]
-% \multicolumn{9}{r}{\footnotesize\textsuperscript{*}$5:8\approx1:1,618$}
-% \end{tabular}\\[-3ex]
-% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
-% \end{table}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Page layouts}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class provides eight page layouts which can be selected by the 
+% \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} 
+% layout (default) or \opt{standardaureo} layout are aimed to typeset 
+% A4 documents, while the other seven layouts are particularly suitable 
+% to typeset compact books, articles or theses. For these compact layouts 
+% the \opt{version=screen} and \opt{version=cscreen} options are particularly 
+% useful as they show the output in its real size. See section 
+% \ref{sec:page-styles} for details.
+%
+%\begin{table}[h]
+%\centering
+%\begin{tabular}{@{}lccccr@{\,$:$\,}lr@{\,$:$\,}lcr@{\,$:$\,}l@{}}
+%\toprule
+%                                     & 
+% \multicolumn{4}{c}{Dimensions (mm)} &
+% \multicolumn{7}{c}{Proportions}     \\
+% \cmidrule(lr){2-5}
+% \cmidrule(l){6-12}
+%                               &
+% \multicolumn{2}{c}{Typeblock} &
+% \multicolumn{2}{c}{Page}      & 
+% \multicolumn{4}{c}{Margins}   &
+% \multicolumn{3}{c}{Stock}     \\
+% \cmidrule(lr){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% Layout                        & w & h & w & h & 
+% \multicolumn{2}{c}{t\,/\,b}   & 
+% \multicolumn{2}{c}{i\,/\,o}   & 
+% Typeblock                     & 
+% \multicolumn{2}{c}{Page}      \\
+% \cmidrule(r){1-1}
+% \cmidrule(rl){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% \opt{standard}          & 110 & 220 & 210 & 297 & $1$ & $2$ & $1$ & $2$ & 1\,:\,2 & $1$ & $\sqrt{2}$ \\
+% \opt{standardaureo}     & 136 & 220 & 210 & 297 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $1$ & $\sqrt{2}$ \\
+% \opt{compact}           & 110 & 165 & 160 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{compactaureo}      & 118 & 191 & 160 & 240 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $2$ & $3$         \\
+% \opt{supercompact}      & 100 & 150 & 140 & 210 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{supercompactaureo} & 108 & 175 & 140 & 210 & $1$ & $1$ & $1$ & $1$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $2$ & $3$         \\
+% \opt{periodical}        & 110 & 165 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $1$ & $\sqrt{2}$ \\
+% \opt{periodicalaureo}   & 120 & 194 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $1$ & $\sqrt{2}$  \\
+%\bottomrule\\[-2ex]
+%\multicolumn{12}{r}{\footnotesize\textsuperscript{*}5\,:\,8\,$\approx$\,1\,:\,1,618}
+%\end{tabular}\\[-3ex]
+%\caption{The layouts of \sty{suftesi}}\label{tab:layouts}
+%\end{table}
+%
+% You can define your own layouts through the \cmd{geometry} command
+% and you can change the value of \cmd{baselineskip} too. For example 
+% you can resize the typeblock of the \texttt{supercompactaureo} layout 
+% to fit your particular needs. In this case remember to declare 
+% \cmd{normalsize} like in the following example:
 %
-% You can define your own layouts through the \cmd{geometry} command and you can change the value of \cmd{baselineskip} too. For example you can resize the typeblock of the \texttt{supercompactaureo} layout to fit your particular needs. In this case remember to declare \cmd{normalsize} like in the following example:
 % \begin{latexcode}
-% \begin{verbatim}
-% \linespread{0.95}
-% \normalsize
-% \geometry{
-% textheight=     162mm,
-% textwidth=      100mm,
-% paperwidth=     140mm,
-% paperheight=    210mm,
-% hmarginratio=    2:3,
-% vmarginratio=    1:1,
-% marginparwidth= 11mm,
-% marginparsep=   7pt,
-% ignoreall,
-% heightrounded}
-% \end{verbatim}
+%\begin{verbatim}
+%\linespread{0.95}
+%\normalsize
+%\geometry{
+%  textheight=     162mm,
+%  textwidth=      100mm,
+%  paperwidth=     140mm,
+%  paperheight=    210mm,
+%  hmarginratio=    2:3,
+%  vmarginratio=    1:1,
+%  marginparwidth= 11mm,
+%  marginparsep=   7pt,
+%  ignoreall,
+%  heightrounded}
+%\end{verbatim}
 % \end{latexcode}%
 % ^^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. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
 %
@@ -522,26 +628,62 @@
 % ^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
 % ^^A\end{figure}
 %
-% \subsection{Fonts}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
 % The default roman font is Cochineal by Michael Sharpe,
-% the sans serif font is Linux Biolinum O, designed by Philipp H. Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastina Kosch, a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion (Robert Slimbach). It is a very complete typeface and it offers full support for Greek and Cyrillic, real small caps (even in italic shape) and four figure styles. Moreover it provides support for mathematics through the \sty{newtxmath} package.
-%
-% The \opt{defaultfont}  option allows you to can change the default roman font to New PX (Palatino-like), Linux Libertine O, or Latin modern. 
-% You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} option which turns off the default font settings (see section \ref{sec:options} for details). 
-%
-% Today there are several Garamond-like fonts in TeX Live distribution. See, for example \textit{Garamond Libre} (Open Type only) and \textit{Cormorant Garamond}. The Bembo-like fonts \textit{Etbb} and \textit{fbb} should also be considered if you appreciate humanist fonts. In any case, before using a font, read the license carefully.
-%
-% Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at
-% \url{http://tug.org/fonts/getnonfreefonts/}.
-%
-%
-% \subsubsection[Mathematics]{Typesetting mathematics}
-%
-% The class loads by default a ‘minimal’ mathematical support for Cochineal (default), Linux Libertine O or New PX via the \sty{newtxmath} or \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. These non-standard fonts have a very good mathematical support but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details. 
-%
-% If some of the loaded packages conflict or if you simply want to change some of the default font settings you should first reset the font default with \opt{defaultfont=none} option and then load the packages in the right order and with your favorite options. 
+% the sans serif font is Linux Biolinum O, designed by Philipp H. 
+% Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata 
+% by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastian Kosch, 
+% a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion 
+% (Robert Slimbach). It is a very complete typeface and it offers full 
+% support for Greek and Cyrillic, real small caps (even in italic shape) 
+% and four figure styles. Moreover it provides support for mathematics 
+% through the \sty{newtxmath} package.
+%
+% The \opt{defaultfont}  option allows you to can change the default roman 
+% font to New PX (Palatino-like), Linux Libertine O, or Latin Modern. 
+% You can use other fonts as well, but in this case remember to load the 
+% \opt{defaultfont=none} option which turns off the default font settings 
+% (see section \ref{sec:options} for details). 
+%
+% Today there are several Garamond-like fonts in \TeX~Live distribution. 
+% See, for example Garamond Libre (OpenType only) and Cormorant Garamond. 
+% The Bembo-like fonts Etbb and fbb should also be considered if you 
+% appreciate humanist fonts. In any case, before using a font, read the 
+% license carefully.
+%
+% Another beautiful Garamond-like font, complete of real small caps, 
+% bold weight and mathematical support, is made available by the 
+% \sty{garamondx} package by Michael Sharpe, which provides an extension 
+% of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the 
+% package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. 
+% They are not distributed as part of \TeX~Live, but they may be downloaded 
+% using the \texttt{getnonfreefonts} script. See the instructions for 
+% installation at \url{http://tug.org/fonts/getnonfreefonts/}.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection[Mathematics]{Typesetting mathematics}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class loads by default a ‘minimal’ mathematical support for Cochineal 
+% (default), Linux Libertine O or New PX via the \sty{newtxmath} or 
+% \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} 
+% option is provided to extend or disable the support for mathematics when 
+% using these fonts. These non-standard fonts have a very good mathematical 
+% support but if you aim at typesetting high mathematics the Latin Modern 
+% font family remains, of course, the better choice: \opt{defaultfont=standard}. 
+% See section \ref{sec:fonts} for details. 
+%
+% If some of the loaded packages conflict or if you simply want to change 
+% some of the default font settings you should first reset the font default 
+% with \opt{defaultfont=none} option and then load the packages in the right 
+% order and with your favorite options. 
 % ^^AFor example, these are the codes loaded for the three non-standard fonts:
 % ^^A
 % ^^A\paragraph{defaultfont=cochineal}
@@ -557,7 +699,7 @@
 % ^^A\usepackage{cochineal}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-% ^^A\usepackge[cal=boondoxo]{mathalfa}
+% ^^A\usepackge[cal=boondoxo]{mathalpha}
 % ^^A\useosf
 % ^^A\useproportional
 % ^^A\end{verbatim}
@@ -573,7 +715,7 @@
 % ^^A\usepackage[varqu,varl]{inconsolata}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackage[bigdelims,vvarbb]{newpxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa} 
+% ^^A\usepackage[cal=boondoxo]{mathalpha} 
 % ^^A\useosf
 % ^^A\useproportional
 % ^^A\end{verbatim}
@@ -588,43 +730,90 @@
 % ^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa} 
+% ^^A\usepackage[cal=boondoxo]{mathalpha} 
 % ^^A\useosf
 % ^^A\end{verbatim}
 % ^^A\end{latexcode}
 % 
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection[Greek]{Typesetting Greek}
+% ^^A
+% ^^A ----------------------------------------------------------------
+% 
+% The Cochineal default font is complete of Greek and Cyrillic. Anyway 
+% the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) 
+% to select four different Greek fonts for use with the roman typeface
+% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} 
+% option, i.e. with Latin Modern font family which uses the CB Greek by default). 
+% These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) 
+% and CB Greek (by Claudio Beccari). You may, of course, choose a different font 
+% but in this case, as previously cleared, remember to load the 
+% \opt{defaultfont=none} option.
+%
+% \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]\vskip-\baselineskip
+% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{\mygrsize}
+% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{\mygrsize}
+% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{\mygrsize}
+% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{\mygrsize}
+% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{\mygrsize}
+% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{\mygrsize}
+% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{\mygrsize}
+% \greekexample{zplosf}{porson}{New PX/Porson}{\mygrsize}
+% \greekexample{zplosf}{lmr}{New PX/CB Greek}{\mygrpxsize}
+% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{\mygrsize}
+% \end{mdframed}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.6 \sty{suftesi} provides a command to print a simple 
+% cover page (figure \ref{fig:cover}), inspired by the Italian designer 
+% Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for 
+% the text and the circle as well as other graphical elements are partially 
+% customizable (see section \ref{sec:options} for details). The cover shown 
+% in figure \ref{fig:cover} is obtained with the following code:
+% \begin{latexcode}
+%\begin{verbatim}
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
+%\Cfootcolor{black}
+%
+%\makecover[ball color=DarkBlue,draw=none]
+%\end{verbatim}
+% \end{latexcode}
 %
+% To produce a complete book cover, with spine and dust jacket, you should 
+% take a look at the \sty{bookcover} package by Tibor Tómács.
 %
-% \subsubsection[Greek]{Typesetting Greek}
-% 
-% The Cochineal default font is complete of Greek and Cyrillic. Anyway the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) to select four different Greek fonts for use with the roman typeface
-% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) and CB Greek (by Claudio Beccari). You may, of course, choose a different font but in this case, as previously cleared, remember to load the \opt{defaultfont=none} option.
-% 
 %
-% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{10}
-% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{10}
-% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10}
-% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{10}
-% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{10}
-% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{10}
-% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10}
-% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10}
-% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{10}
-% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{10}
-% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{10}
-% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{10}
-% \greekexample{zplosf}{porson}{New PX/Porson}{10}
-% \greekexample{zplosf}{lmr}{New PX/CB Greek}{10.5}
-% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{10}
-%
-%
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
-% \draw[line width=.5mm,fill=white,text=black,draw=black!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\  St. Anford\\ University\\[1mm] * * * }};
-% \node[anchor=north west] at (-2.5cm,18cm) {%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The frontispiece} \enlargethispage{\baselineskip}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+%\begin{figure}
+%\begin{minipage}{.5\textwidth}
+%\centering
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=white,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
+%\draw[line width=.1mm,fill=black!70,text=white,draw=black!300] (-4.2,18.1) circle (13mm) node {\parbox{10mm}{\centering\tiny ---*---\\ St. Anford\\ University\\ ---*--- }};
+% \node[scale=0.4,anchor=north west] at (-2.5cm,19cm) {%
 %  \parbox{8cm}{%
 %    \small University of St. Anford\par
 %      \normalsize Department of Typography
@@ -655,18 +844,17 @@
 %
 % Thesis submitted in 2010
 % }
-%      };
-%
-% \end{tikzpicture}
-% \caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
-% \end{figure}
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
+% };
+%\end{tikzpicture}
+%\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
+%\end{minipage}
+%\begin{minipage}{.5\textwidth}
+%\centering  
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=gray!5,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
 % \node at (0,.65\textheight) (c) {};
 % \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
-% \node[anchor=center,text=white] at (c) {\parbox{6cm}{%
+% \node[scale=0.4,anchor=center,text=white] at (c) {\parbox{6cm}{%
 %  \centering
 %       {\scriptsize\scshape Bruce Lee\\}
 %       \vspace*{\baselineskip}
@@ -676,203 +864,212 @@
 %       {\smallskip\normalsize How to survive in the modern societies\\}
 %
 %       {\vspace*{2\baselineskip}\scriptsize edited by\\ Walker Texas Ranger\\}}};
-% \node[align=center] at (0,1) {\scriptsize \textcolor{black}{Punch Press}\\[1ex]\textcolor{black}{\fbox{§§§§}}\\};
-% \end{tikzpicture}
-% \caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
-% \end{figure}
-
-%
-% \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
-% \begin{latexcode}
-% \begin{verbatim}
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
-% \Cpagecolor{white!90!black}
-% \Ctextcolor{white}
-% \Cfootcolor{black}
-%
-% \makecover[ball color=DarkBlue,draw=none]
-% \end{verbatim}
-% \end{latexcode}
-%
-% To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
-%
-% \subsection{The frontispiece} \enlargethispage{\baselineskip}
-%
-% The class has an original frontispiece (see figure \ref{fig:frontispiece}) now directly available 
-% loading the \sty{frontespizio} package  
+% \node[align=center] at (0,2) {\scriptsize \textcolor{black}{Punch Press}\\\textcolor{black}{\bfseries P\&P}};
+%\end{tikzpicture}
+%\caption{A cover page of \sty{suftesi}}\label{fig:cover}
+%\end{minipage}
+%\end{figure}
+%
+% The class has an original frontispiece (see figure \ref{fig:frontispiece}) 
+% now directly available loading the \sty{frontespizio} package  
 % with the \opt{suftesi} option. It is meant only for Italian users
 % \parencite[see][version 1.4 or later]{Gregorio:frontespizio}:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage[suftesi]{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage[suftesi]{frontespizio}
+%\end{verbatim}
 % \end{latexcode}
-% Note that this frontispiece requires the use of a logo which could be restricted by some institutions. So before using it you have to be sure that you have the required permissions.
+% 
+% Note that this frontispiece requires the use of a logo which could be 
+% restricted by some institutions. So before using it you have to be sure 
+% that you have the required permissions.
 %
-% The \sty{frontespizio} package produces a frontispiece in the standard Computer Modern typeface. If you prefer a consistent font remember to load the needed packages or commands in the \cmd{Preambolo} command:
+% The \sty{frontespizio} package produces a frontispiece in the standard 
+% Computer Modern typeface. If you prefer a consistent font remember 
+% to load the needed packages or commands in the \cmd{Preambolo} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \begin{frontespizio} 
-%  \Preambolo{\usepackage[osf]{cochineal}}%  <===
-%  \Universita{Paperopoli} 
-%  \Dipartimento{Filosofia, Pedagogia e Psicologia} 
-%  \Corso[Laurea]{Filosofia} 
-%  \Annoaccademico{2030--2031} 
-%  \Titolo{La mia tesi:\\ una lunga serie di risultati\\
-%      difficilissimi e complicatissimi} 
-%  \Sottotitolo{Alcune considerazioni mutevoli} 
-%  \Candidato[vr12301231]{Paolo Rossi} 
-%  \Relatore{Guido Bianchi} 
-% \end{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{frontespizio} 
+% \Preambolo{\usepackage[osf]{cochineal}}%  <===
+% ...
+%\end{frontespizio}
+%\end{verbatim}
 % \end{latexcode}
 %
-%
-%
 % ^^A\subsection{Title page}
 % 
 % ^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of  the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
 %
-% \subsection{The 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. 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The appendices}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.9.5 the class relies on \sty{appendix} package to manage 
+% the appendices \parencite[see][]{wilson-robertson:appendix}. 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{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\renewcommand{\appendixname}{Appendix}
+%\addappheadtotoc
 %
-% \begin{document}
+%\begin{document}
 %...
-% \appendixpage
-%
-% \begin{appendices}
-%	
-%  \chapter{First appendix}
-%    Lorem ipsum
-%	
-%  \chapter{First appendix}
-%    Lorem ipsum
-%	
-% \end{appendices}
-% \end{document}
-% \end{verbatim}
+%\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}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Options}\label{sec:options}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \subsection{Layout}\label{sec:page-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Layout}\label{sec:page-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[book]{structure}{\opt{book}, \opt{article}, \opt{collection}}
+% \optitem[book]{structure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{structure}} 
-% \begin{valuelist}
-% \item[book] For typesetting texts with chapters.
-% \item[article] For typesetting articles or short theses 
-% (without chapters).
-% \item[collection] For typesetting journals or collections of articles (see section \ref{sec:collection}).
-% \end{valuelist}
-% \optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo},  \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo},  \opt{supercompact}, \opt{supercompactaureo}}
+%   \begin{valuelist}
+%     \item[book] For typesetting texts with chapters.
+%     \item[article] For typesetting articles or short theses 
+%     (without chapters).
+%     \item[collection] For typesetting journals or collections of articles 
+%     (see section \ref{sec:collection}).
+%   \end{valuelist}
+% \optitem[standard]{pagelayout}{\opt{standard}\OR\opt{standardaureo}%
+% \OR\opt{periodical}\OR\opt{periodicalaureo}\OR\opt{compact}\OR
+% \opt{compactaureo}\OR\opt{supercompact}\OR\opt{supercompactaureo}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
-% \begin{valuelist}
-% \item[standard]
-% Prints an A4 page with a 
-% typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[standard] Prints an A4 page with a 
+%      typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
+%   \end{valuelist}
 % With the following values the option prints the typeblock 
 % on a an A4 paper showing the crop marks which can be controlled 
 % by the \opt{version} option.
-% \begin{valuelist}
-% \item[periodical]
-% Prints a page  of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of  $\SI{11}{cm} \times \SI{16,5}{cm}$.
-% \item[periodicalaureo] The same of \opt{periodical} but with a 
-% \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$. 
-% \item[compact]
-% Prints a page  of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of $\SI{11}{cm} \times \SI{16,5}{cm}$. 
-% \item[compactaureo]
-% The same as \opt{compact} but with 
-% a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.% \item[supercompact]
-% Prints a page  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a typeblock of $\SI{10}{cm} \times \SI{15,5}{cm}$.
-% \item[supercompactaureo]
-% The same as \opt{supercompact} but with 
-% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[periodical]
+%     Prints a page  of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of  
+%     $\SI{11}{cm} \times \SI{16,5}{cm}$.
+%     \item[periodicalaureo] The same of \opt{periodical} but with a 
+%     \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$. 
+%     \item[compact]
+%     Prints a page  of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of 
+%     $\SI{11}{cm} \times \SI{16,5}{cm}$. 
+%     \item[compactaureo]
+%     The same as \opt{compact} but with 
+%     a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.
+%     \item[supercompact]
+%     Prints a page  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a typeblock of 
+%     $\SI{10}{cm} \times \SI{15,5}{cm}$.
+%     \item[supercompactaureo]
+%     The same as \opt{supercompact} but with 
+%     a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
+%   \end{valuelist}
 % The details of this option are shown in table \ref{tab:layouts}.
-% \optitem[final]{version}{\opt{screen}, \opt{cscreen}, \opt{draft}, \opt{final}}
-% \begin{valuelist}
-% \item[screen] Prints the \textsc{pdf} with its real dimensions.
-% \item[cscreen] The same as \opt{version=screen} but with a centered typeblock.
-% \end{valuelist}
-% These previous two options are provided to have a better view when you are 
-% typesetting and reading the \textsc{pdf} on the screen or for online publications. The following options meant for printed documents.
-% \begin{valuelist}
-% \item[draft] 
-% Prints the output on a A4 paper, showing the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \item[final] Prints the output on a A4 paper, hiding the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \end{valuelist}
-% Sometimes it is not desirable to have the crop marks on every page. In such a case you can use the \cmd{crop}|[off]| command after the first page of the document.
+% \optitem[final]{version}{\opt{screen}\OR\opt{cscreen}\OR\opt{draft}
+% \OR\opt{final}}
+% The following two options are provided to have a better view when 
+% you are typesetting and reading the \textsc{pdf} on the screen 
+% or for online publications. 
+%   \begin{valuelist}
+%     \item[screen] Prints the PDF with its real dimensions.
+%     \item[cscreen] The same as \opt{version=screen} but with a centered 
+%     typeblock.
+%   \end{valuelist}
+% The following two options are meant for printed documents.
+%   \begin{valuelist}
+%     \item[draft] 
+%     Prints the output on a A4 paper, showing the crop marks. 
+%     Useless with \opt{standard} and \opt{standardaureo} layouts.
+%     \item[final] Prints the output on a A4 paper, hiding the crop marks. 
+%     Useless with \opt{standard} and \opt{standardaureo} layouts.
+%   \end{valuelist}
+% Sometimes it is not desirable to have the crop marks on every page. 
+% In such a case you can use the \cmd{crop}|[off]| command 
+% after the first page of the document.
 % \end{optionlist}
 %
-% \subsection{Font}\label{sec:fonts}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Font}\label{sec:fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[10]{fontsize}{10, 10.1, 10.2...,11, 11.1, 11.2...}
-% Sets the main font sizes for the document, changing the \cmd{baselineskip} accordingly. It is based on the \sty{fontsize} package. Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default font size also with the option \opt{SizeFeatures} of \sty{fontspec}. For example:
+% \optitem[10\OR 10pt]{fontsize}{\meta{dimen}}
+% Sets the main font sizes for the document, changing the \cmd{baselineskip} 
+% accordingly (possible values: 10\OR 11pt\OR 10.7\OR 1.2ex\dots). It is based on the \sty{fontsize} package \parencite{Valbusa:fontsize}. 
+% Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default 
+% font size also with the option \opt{SizeFeatures} of \sty{fontspec}. 
+% For example:
+% 
 % \begin{latexcode}
-% \begin{verbatim}
-% \setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
-% \end{verbatim}
+%\begin{verbatim}
+%\setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
+%\end{verbatim}
 % \end{latexcode}
 %
-% \end{optionlist}
-% The first three options below are available only with \LaTeX.
-% Using \XeLaTeX{} or \LuaLaTeX{} 
-% the default font is the Computer Modern but you can change it through 
-% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family by Georg Duffner.
-% 
-% \begin{optionlist}
-% \optitem[cochineal]{defaultfont}{\opt{none}, \opt{cochineal}, \opt{libertine}, \opt{palatino}, \opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
+% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
 %   \begin{valuelist}
 %     \item[none] Does not load any font. Use this option 
-%		if you want full control over the font selection.
+%    if you want full control over the font selection. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX.
 %     \item[cochineal] Loads the Cochineal serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
 %     \item[libertine] Loads the Linux Libertine O serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
-%     \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisa} option offers a very good solution.
+%     \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisia} option offers a very good solution.
 % ^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text.
 %     \item[standard] Loads the \sty{lmodern} package: Latin Modern font family and CB Greek.
 %   \end{valuelist}
-% \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
+% \optitem[none]{greekfont}{\opt{none}\OR\opt{artemisia}\OR\opt{porson}\OR\opt{bodoni}\OR\opt{cbgreek}}
 % Actually useless  with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
-%     \item[none] Does not load any Greek font. 
+%     \item[none] Does not load any Greek font. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX. 
 %     \item[artemisia] Loads the Artemisia font by the Greek Font Society.
 %     \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font (\sty{suftesi} <v.2.4) has been written by Enrico 
-% Gregorio. Claudio Beccari successively added the code to improve the 
-% scale factor when using this greek font in combination with Palatino.}
+%     Gregorio. Claudio Beccari successively added the code to improve the 
+%     scale factor when using this greek font in combination with Palatino.}
 %     \item[bodoni] Loads the Bodoni font by the Greek Font Society.
 %     \item[cbgreek] Loads the standard CB~Greek font by Claudio Beccari.
 %   \end{valuelist}
 %
-% \optitem[minimal]{mathfont}{\opt{none},\opt{minimal},\opt{extended}}
+% \optitem[minimal]{mathfont}{\opt{none}\OR\opt{minimal}\OR\opt{extended}}
 % 
 % Available only with Cochineal, Libertine and New PX fonts.
 %   \begin{valuelist}
-%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX.
 %     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
-%     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalfa} packages. 
+%     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages. 
 %   \end{valuelist}
 % \end{optionlist}
 %
 % \begin{optionlist}
-% \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
+% \optitem[low]{smallcapsstyle}{\opt{low}\OR\opt{upper}}
 % Active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
 % With \XeLaTeX{} or \LuaLaTeX{} this option is effective only if a font selection command (such as \cmd{setmainfont}) is given.
 %   \begin{valuelist}
@@ -881,10 +1078,14 @@
 %   \end{valuelist}
 % \end{optionlist}
 %
-% 	\subsection{Titles}\label{sec:titles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Titles}\label{sec:titles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[roman]{\meta{level}font}{\opt{roman}, \opt{italic}, 
+% \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR 
 % \opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the \meta{level} title in roman.
@@ -894,8 +1095,8 @@
 %   \end{valuelist}
 %   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
 %   \opt{subsec}, \opt{subsubsec}.
-% \optitem[left]{\meta{level}style}{\opt{left}, \opt{center}, 
-% \opt{right}, \opt{parleft}, \opt{parcenter}, 
+% \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR 
+% \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR 
 % \opt{parright}}
 %   \begin{valuelist}
 %     \item[left] Aligns the \meta{level} title on the left.
@@ -909,9 +1110,10 @@
 %     \item[parcenter] As \opt{center} but with the title below the number.
 %     \item[parright] As \opt{right} but with the title below the number.
 %   \end{valuelist}
-%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
-% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}, 
-% \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, 
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+%   \opt{subsec}, \opt{subsubsec}.
+% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR 
+% \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
 % \opt{dotRoman}}
 %   \begin{valuelist}
 %     \item[arabic] Arabic \meta{level} number.
@@ -925,67 +1127,75 @@
 %   \opt{subsec}, \opt{subsubsec}.
 % \end{optionlist}
 %
-%
-% 	\subsection{Contents lists}\label{sec:toc}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Contents lists}\label{sec:toc}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, 
-% \opt{ragged}, \opt{leftpage}}
+% \optitem[standard]{tocstyle}{\opt{standard}\OR\opt{dotted}\OR
+% \opt{ragged}\OR\opt{leftpage}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
-%	\begin{valuelist}
-%		\item[standard] Prints a standard table of contents with
+%  \begin{valuelist}
+%    \item[standard] Prints a standard table of contents with
 %   page numbers on the right margin.
-%		\item[dotted] As the previous one but with dotted lines.
-%		\item[ragged] Aligns the table of contents on the left 
-%			as suggested by \textcite{Bringhurst:1992}.
-%		\item[leftpage] Prints a table of contents with page numbers 
+%    \item[dotted] As the previous one but with dotted lines.
+%    \item[ragged] Aligns the table of contents on the left 
+%      as suggested by \textcite{Bringhurst:1992}.
+%    \item[leftpage] Prints a table of contents with page numbers 
 %     on the left margin.
-%	\end{valuelist}
-% \optitem[sec]{compacttoc}{\opt{sec}, \opt{subsec}, 
+%  \end{valuelist}
+% \optitem[sec]{compacttoc}{\opt{sec}\OR\opt{subsec}\OR
 % \opt{subsubsec}}
-%	\begin{valuelist}
-%		\item[sec] Prints the sections, subsections and sub-subsections in a single paragraph. Note that in this case the option \opt{tocstyle=dotted} in uneffective as the dots are not printed for chapter entries.
-%		\item[subsec] Prints the subsections and sub-subsections in a single paragraph.
-%		\item[subsubsec] Prints the sub-subsections in a single paragraph.
-%	\end{valuelist}
-% \optitem[roman]{toc\meta{level}font}{\opt{roman}, \opt{italic}, 
+%  \begin{valuelist}
+%    \item[sec] Prints the sections, subsections and sub-subsections 
+%        in a single paragraph. Note that in this case the option 
+%        \opt{tocstyle=dotted} is uneffective as the dots are not printed for chapter entries.
+%    \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
+%    \item[subsubsec] Prints the sub-subsections in a single paragraph.
+%  \end{valuelist}
+% \optitem[roman]{toc\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
 % \opt{smallcaps}}
-%	\begin{valuelist}
+%  \begin{valuelist}
 %     \item[roman] Prints the \meta{level} TOC entry in roman.
 %     \item[italic] Prints the \meta{level} TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the \meta{level} TOC entry 
 %      in \textsc{\lsstyle spaced small caps}
-%	\end{valuelist}
+%  \end{valuelist}
 %   Where \meta{level} can be \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
-% \optitem[all]{twocolcontents}{\opt{toc}, \opt{lof}, 
-% \opt{lot}, \opt{toclof}, \opt{toclot}, \opt{loflot}, \opt{all}}
+% \optitem[all]{twocolcontents}{\opt{toc}\OR\opt{lof}\OR
+% \opt{lot}\OR\opt{toclof}\OR\opt{toclot}\OR\opt{loflot}\OR\opt{all}}
 % This option activates the \opt{tocstyle=ragged} option 
 % and disables the other values of \opt{tocstyle}.
-%	\begin{valuelist}
-%		\item[toc] Prints the table of contents in two columns.
-%		\item[lof] Prints the list of figures in two columns.
-%		\item[lot] Prints the list of tables in two columns.
-%		\item[toclof] Prints the table of contents 
+%  \begin{valuelist}
+%    \item[toc] Prints the table of contents in two columns.
+%    \item[lof] Prints the list of figures in two columns.
+%    \item[lot] Prints the list of tables in two columns.
+%    \item[toclof] Prints the table of contents 
 %    and the list of figures in two columns.
-%		\item[toclot] Prints the table of contents 
+%    \item[toclot] Prints the table of contents 
 %    and the list of tables in two columns.
-%		\item[loflot] Prints the list of figures 
+%    \item[loflot] Prints the list of figures 
 %    and the list of tables in two columns.
-%		\item[all] Prints all the contents lists in two columns.
-%	\end{valuelist}
+%    \item[all] Prints all the contents lists in two columns.
+%  \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Headings}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Headings}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
-% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
+% \optitem[inner]{headerstyle}{\opt{inner}\OR\opt{center}\OR
+% \opt{plain}\OR\opt{authortitleinner}\OR\opt{authortitlecenter}}
 %   \begin{valuelist}
 %     \item[inner] Prints the chapter title and the string ``Chapter~ 
 %     \meta{n}'' in the inner side 
-%      respectively of even and odd 
-%     headers, and the page number in the outer side.
+%      of even and odd 
+%     headers respectively, and the page number in the outer side.
 %     \item[center] Centers the header and footer and puts 
 %       the page number in the center of the footer.
 %     \item[plain] Prints no headers and puts the page number 
@@ -998,8 +1208,7 @@
 %     \item[authortitlecenter]
 %       As the previous one but with centered headers and footers.
 %   \end{valuelist}
-% \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, 
-% \opt{smallcaps}}
+% \optitem[roman]{headerfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the headers in roman.
 %     \item[italic] Prints the headers in \emph{italic}.
@@ -1007,139 +1216,155 @@
 %   \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Notes, lists, quotations}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Notes, lists, quotations}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
+% \optitem[center]{quotestyle}{\opt{center}\OR\opt{right}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} 
-% \begin{valuelist}
-% \item[center] 
-% Indents the block quotations
-% on both the left and right margins.
-% \item[right] 
-% Indents the block quotations
-% only on the left margin.
-% \end{valuelist}
-% \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}}
+%   \begin{valuelist}
+%     \item[center] 
+%      Indents the block quotations on both the left and right margins.
+%     \item[right] 
+%      Indents the block quotations only on the left margin.
+%   \end{valuelist}
+% \optitem[footnotesize]{quotesize}{\opt{footnotesize}\OR\opt{small}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
-% \begin{valuelist}
-% \item[footnotesize] 
-% Prints the block quotations 
-% in \cmd{footnotesize} size.
-% \item[small] 
-% Prints the block quotations 
-% in \cmd{small} size.
-% \end{valuelist}
-% \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung}, 
-% \opt{dotted}, \opt{superscript}}
+%   \begin{valuelist}
+%     \item[footnotesize] 
+%      Prints the block quotations in \cmd{footnotesize} size.
+%     \item[small] 
+%      Prints the block quotations in \cmd{small} size.
+%   \end{valuelist}
+% \optitem[bulged]{footnotestyle}{\opt{bulged}\OR\opt{hung}\OR
+% \opt{dotted}\OR\opt{superscript}}
 % \changes{v0.9b}{2012/09/23}{Changed \opt{standardfootnote} option 
 % and renamed to \opt{footnotestyle}}
-% \begin{valuelist}
-% \item[bulged] The footnote number protrudes beyond the left margin.
-% \item[hung] 
-% Indents the footnote text, so it will hang 
-% under the first line of the text. 
-% \item[dotted] 
-% The footnote number is aligned to the left margin
-% and followed by a dot. 
-% \item[superscript] 
-% Prints a superscript footnote number aligned to the left margin. 
-% \end{valuelist}
-% \boolitem[false]{fewfootnotes}
+%   \begin{valuelist}
+%     \item[bulged] The footnote number protrudes beyond the left margin.
+%     \item[hung] 
+%      Indents the footnote text, so it will hang 
+%       under the first line of the text. 
+%     \item[dotted] 
+%      The footnote number is aligned to the left margin
+%      and followed by a dot. 
+%     \item[superscript] 
+%      Prints a superscript footnote number aligned to the left margin. 
+%   \end{valuelist}
+% \optitem[false]{fewfootnotes}{\opt{true}\OR\opt{false}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{fewfootnotes}}
 % Uses symbols instead of numbers to mark footnotes.
 % It is active only in documents with 
 % three footnotes per page maximum. 
 % The symbol sequence is: *, **, ***. 
 % With more footnotes you should not need this option.
-% \optitem[bulged]{liststyle}{\opt{bulged}, \opt{aligned}, \opt{indented}}
-% \begin{valuelist}
-% \item[bulged]
-% The item number or symbol protrudes beyond the left margin.
-% \item[aligned]
-%  Aligns the lists to the left margin.
-% \item[indented]
+% \optitem[bulged]{liststyle}{\opt{bulged}\OR\opt{aligned}\OR\opt{indented}}
+%   \begin{valuelist}
+%     \item[bulged]
+%      The item number or symbol protrudes beyond the left margin.
+%     \item[aligned]
+%      Aligns the lists to the left margin.
+%     \item[indented]
 %  Prints standard indented lists.
-% \end{valuelist}
-% \optitem[standard]{captionstyle}{\opt{standard}, \opt{sanserif}, \opt{italic}, \opt{smallcaps}}
+%   \end{valuelist}
+% \optitem[standard]{captionstyle}{\opt{standard}\OR\opt{sanserif}\OR\opt{italic}\OR\opt{smallcaps}}
 % All these values print the caption in small size, changing the shape:
-% \begin{valuelist}
-% \item[standard] Prints the caption text and label in normal font.
-% \item[sanserif] Prints the caption text and label in \textsf{sanserif}.
-% \item[italic] Prints the caption text and label in \emph{italic}. 
-% \item[smallcaps] Prints only the caption label in \textsc{\lsstyle spaced small caps}.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[standard] 
+%      Prints the caption text and label in normal font.
+%     \item[sanserif] 
+%      Prints the caption text and label in \textsf{sanserif}.
+%     \item[italic] 
+%      Prints the caption text and label in \emph{italic}. 
+%     \item[smallcaps] 
+%      Prints only the caption label in \textsc{\lsstyle spaced small caps}.
+%   \end{valuelist}
 % \end{optionlist}
 %
-%
-% \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[\cmd{baselineskip}]{parindent}{\opt{1em}, \opt{1cm}, \opt{17pt}, \ldots}
+% \optitem[\cmd{baselineskip}]{parindent}{\meta{dimen}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
-% \begin{valuelist}
-% Sets the indentation of the first line of each paragraph except those following a section title. 
-% For backward compatibility you should use \opt{parindet=1em} or \opt{parindet=1.5} in place 
-% of \opt{parindet=compact} and \opt{parindet=wide} respectively.
-% \end{valuelist}
-% \boolitem[true]{marginpar}
-% \begin{valuelist}
-% \item[true] Prints the marginal notes.
-% \item[false] Hide the marginal notes.
-% \end{valuelist}
-% \boolitem[false]{partpage}
+%   \begin{valuelist}
+% Sets the indentation of the first line of each paragraph except those following a section title. You can use any unit recognized by \TeX{} (for example: \opt{1em}\OR\opt{1cm}\OR\opt{17pt}, \ldots).
+%   \end{valuelist}
+% \optitem[true]{marginpar}{\opt{true}\OR\opt{false}}
+%   \begin{valuelist}
+%     \item[true] Prints the marginal notes.
+%     \item[false] Hide the marginal notes.
+%   \end{valuelist}
+% \optitem[false]{partpage}{\opt{true}\OR\opt{false}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
 %  Active only with \opt{structure=article}.
-% \begin{valuelist}
-% \item[true] Prints the part title in a separate page as in 
-% \opt{structure=book}
-% \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
-% \end{valuelist}
-% \optitem[false]{draftdate}{\opt{true}, \opt{false}}
+%   \begin{valuelist}
+%     \item[true] Prints the part title in a separate page as in 
+%      \opt{structure=book}
+%     \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
+%   \end{valuelist}
+% \optitem[false]{draftdate}{\opt{true}\OR\opt{false}}
 % \changes{v1.0}{2012/10/14}{First stable release. Renamed option \opt{bozza} to \opt{draftdate}} 
 % If \opt{true} it prints the string ``Version of \meta{date}'' in the footer. 
 % It requires the \cmd{date}\ar{\meta{date}} command.
 % \end{optionlist}
 %
-% \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% These pre-defined styles are intended as shotrcuts to some groups of 
+% These pre-defined styles are intended as shortcuts to some groups of 
 % class options. Combining them
 % with \opt{chapnumstyle} options 
 % you can get up to 120 variants. 
 %
 % \begin{optionlist}
-% \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
+% \optitem[roman1]{style}{\opt{roman(1-6)}\OR\opt{italic(1-12)}\OR
 % \opt{smallcaps(1-6)}}
-% \begin{valuelist}
-% \item[roman(1-6)] The titles of chapters and headers are printed 
-% in roman. The number of the chapter is on the same line in styles 
-% 1-3 and above the title in styles 4-6.
-% The title can be printed on the left (styles 1 and 4), 
-% in the center (styles 2 and 5) or on the right (styles 3 and 6).
-% \item[italic(1-12)]
-% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  
-% in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
-% There are three position for the title and two positions for the number as above.
-% \item[smallcaps(1-12)]
-% The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}. 
-% The  title of the section is in \emph{italic}  in styles 1-6 and in 
-% \textsc{\lsstyle spaced small caps}  in styles 7-12.
-% There are three position for the title and two positions for the chapter as above.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[roman(1-6)] The titles of chapters and headers are printed 
+%      in roman. The number of the chapter is on the same line in styles 
+%      1-3 and above the title in styles 4-6.
+%      The title can be printed on the left (styles 1 and 4), 
+%      in the center (styles 2 and 5) or on the right (styles 3 and 6).
+%     \item[italic(1-12)]
+%      The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  
+%      in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
+%      There are three position for the title and two positions for the number as above.
+%     \item[smallcaps(1-12)]
+%      The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}. 
+%      The  title of sections is in \emph{italic}  in styles 1-6 and in 
+%      \textsc{\lsstyle spaced small caps}  in styles 7-12.
+%      There are three position for the title and two positions for the chapter as above.
+%   \end{valuelist}
 % \end{optionlist}
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{New commands}\label{sec:commands}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{New commands}\label{sec:commands}
-%
-% \subsection{Printing the cover page}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Composing and printing the cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{makecover}
 % \cmditem{makecover}[tikz options]
 %
 % Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz} 
-% and the optional arguments accepts the same options of the \cmd{draw} 
+% and the optional argument accepts the same options of the \cmd{draw} 
 % command of that package (see the examples below). Commands available:
 %
 % \cmditem{Cauthor}{text} 
@@ -1178,20 +1403,24 @@
 %
 % \end{ltxsyntax}
 % 
-% \subsubsection*{Some examples of cover pages}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection*{Some examples of cover pages}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % First you have to declare the informations you want to put in the cover page. It is better to give these informations in the preamble:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-%
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage{tikz}
+%
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
+%\end{verbatim}
 % \end{latexcode}
 %
 % Then you can print the cover page with:
@@ -1205,41 +1434,45 @@
 % \begin{ttquote}
 % \cmd{makecover}\oar{\meta{tikz options}}
 % \end{ttquote}
-
+%
 % You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-% \usetikzlibrary{shadows}
+%\begin{verbatim}
+%\usepackage{tikz}
+%\usetikzlibrary{shadows}
 %...
-% \begin{document}
-% \makecover[circular drop shadow]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[circular drop shadow]
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 %
 % There are thousands of possibilities. Here is another (not necessarily good) example:
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
+%\begin{verbatim}
+%\usepackage{tikz}
 %
-% \Cpagecolor{gray!30}
-% \Ctextcolor{blue!50}
-% \Cfootcolor{black}
+%\Cpagecolor{gray!30}
+%\Ctextcolor{blue!50}
+%\Cfootcolor{black}
 %
-% \begin{document}
-% \makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 % 
 %
-% \subsection{Printing the colophon} 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Printing the colophon} 
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
 % \begin{ltxsyntax}
 %
-% \cmditem{colophon}[OS]{name and surname}{additional info}
+% \cmditem{colophon}[OS]{name and surname}{additional infos}
 % 
 % This command is provided only for Italian documents. It prints a page with 
 % a copyright notice and the colophon in the bottom of the page. For different languages 
@@ -1247,19 +1480,21 @@
 % 
 % If you don't need the copyright notice, leave the second argument of 
 % the command empty:
+%
 % \begin{ttquote}
-% \cmd{colophon\oarm{OS}\ar{}\arm{additional info}}
+% \cmd{colophon\oarm{OS}\ar{}\arm{additional infos}}
 % \end{ttquote}
+%
 % With the \opt{article} document structure, you can use the \cmd{artcolophon} command 
 % (see below) 
 % as well as  the \cmd{thanks} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \author{Name Surname
-%  \thanks{This work has been typeset with \LaTeX, using the 
-%  \textsf{suftesi} class by Ivan Valbusa}.}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{Name Surname
+% \thanks{This work has been typeset with \LaTeX, using the 
+% \textsf{suftesi} class by Ivan Valbusa}.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{bookcolophon}{copyright notice}{attribution notice and 
@@ -1271,14 +1506,14 @@
 % The second one prints its content at the bottom. For example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \bookcolophon{%
-%    Copyright © 2007 by Ivan Valbusa}{%
-%    This work has been typeset with \LaTeX, using the  \textsf{suftesi} 
-%    class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is 
-%    Cochineal by Michael Sharpe and the sans serif font is Linux 
-%    Biolinum O by Philipp H. Poll.}
-% \end{verbatim}
+%\begin{verbatim}
+%\bookcolophon{%
+%   Copyright © 2007 by Ivan Valbusa}{%
+%   This work has been typeset with \LaTeX, using the  \textsf{suftesi} 
+%   class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is 
+%   Cochineal by Michael Sharpe and the sans serif font is Linux 
+%   Biolinum O by Philipp H. Poll.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
@@ -1289,21 +1524,21 @@
 % Here is an example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \artcolophon{%
-%    This work is licensed under the Creative Commons 
-%    Attribution-NonCommercial-NoDerivs 3.0 Unported 
-%    License. To view a copy of this license, visit
-%     \begin{center}
-%       http://creativecommons.org/licenses/by-nc-nd/3.0
-%     \end{center}
-%    or send a letter to Creative Commons, 444 
-%    Castro Street, Suite 900, Mountain View, 
-%    California, 94041, USA.\\[1ex]
-%
-%    Typeset with \LaTeX,  using the \textsf{suftesi} 
-%    class by Ivan Valbusa.}
-% \end{verbatim}
+%\begin{verbatim}
+%\artcolophon{%
+%   This work is licensed under the Creative Commons 
+%   Attribution-NonCommercial-NoDerivs 3.0 Unported 
+%   License. To view a copy of this license, visit
+%    \begin{center}
+%      http://creativecommons.org/licenses/by-nc-nd/3.0
+%    \end{center}
+%   or send a letter to Creative Commons, 444 
+%   Castro Street, Suite 900, Mountain View, 
+%   California, 94041, USA.\\[1ex]
+%
+%   Typeset with \LaTeX,  using the \textsf{suftesi} 
+%   class by Ivan Valbusa.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{finalcolophon}{colophon content}
@@ -1314,7 +1549,11 @@
 %
 % \end{ltxsyntax}
 %
-% \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{headbreak}
@@ -1322,91 +1561,99 @@
 % A manual break which is active for the table of contents but not in the text or in the headers.
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \headbreak{} 
-%     inside the table of contents}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \headbreak{} inside the table of contents}
+%\end{verbatim}
 % \end{latexcode}
 % \cmditem{xheadbreak}
 %
 % A manual break which is active in the text but not in the headers and in the table of contents.
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \xheadbreak{} 
-%     inside the text}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \xheadbreak{} inside the text}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% \subsection{Customizing titles}\label{sec:secfont}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Customizing titles}\label{sec:secfont}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
 % \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*{\meta{level}font}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}font}{definition}\hfill default:\texttt{empty}
 %
-% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
+% Changes the font of the \meta{level} title, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
-% \end{verbatim}
+%\begin{verbatim}
+%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
+%\end{verbatim}
 % \end{latexcode}
-% \cmditem*{\meta{level}numfont}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{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}. For example:
+% Changes the font of the \meta{level} number, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-%  \color{gray}\arabic{chapter}\hskip-15cm}
-% \end{verbatim}
+%\begin{verbatim}
+%\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}
+%\begin{verbatim}
+%\documentclass[pagelayout=periodicalaureo,11pt,
+%version=cscreen,chapstyle=parright]{suftesi}
 %
-% \usepackage{xcolor,lipsum}
+%\usepackage{xcolor,lipsum}
 %
-% \chapfont{\bfseries\sffamily\scshape\LARGE}
-% \secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
+%\chapfont{\bfseries\sffamily\scshape\LARGE}
+%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
 %
-% \chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
-% \color{gray}\arabic{chapter}}\hskip-1cm}
-% \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}
+%\begin{document}
 %
-% \chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
+%\chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
 %
-% \section{Dolor sit amet}	
-% \lipsum[1-2]
+%\section{Dolor sit amet}  
+%\lipsum[1-2]
 %
-% \section{Lorem ipsum dolor sit amet}
-% \subsection{Dolor sit amet}
-% \lipsum[1]
+%\section{Lorem ipsum dolor sit amet}
+%\subsection{Dolor sit amet}
+%\lipsum[1]
 %
-% \end{document}
-% \end{verbatim}
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-% \subsection{Miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{xfootnote}[symbol]{footnote text}
 % \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
 %
 % A command to print a footnote with a discretionary
-% symbols given in the optional argument (default=*).  
+% symbols given in the optional argument (default:\texttt{*}).  
 % It does not increment the footnote counter.
+%
 % \begin{ttquote}
-% \cmd{xfootnote}\oar{\em\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
 % \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
 % \end{ttquote}
 %
@@ -1425,14 +1672,12 @@
 % Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap},  \opt{sec},  \opt{subsec},  \opt{subsubsec},  \opt{par},  \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \toclabelwidth{chap}{1em}
-% \end{verbatim}
+%\begin{verbatim}
+%\toclabelwidth{chap}{1em}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-%
-%
 % \begin{ltxsyntax}
 %
 % \cmditem{chapterintro}
@@ -1440,83 +1685,90 @@
 % Prints an unnumbered introduction at the beginning of the chapter, 
 % with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
 %
-% \cmditem{chapterintroname}{name}\hfill(default=\texttt{Introduzione})
+% \cmditem{chapterintroname}{name}\hfill default:\texttt{Introduzione}
 %
 % Changes in \meta{name} the title printed by the \cmd{chapterintro} command.
 %
 % \cmditem{appendixpage}
 % 
-% Prints a page with the title provided by \cmd{appendixpagename} (default=\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
+% Prints a page with the title provided by \cmd{appendixpagename} (default:\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
 % \begin{latexcode}
-% \begin{verbatim}
-% \renewcommand{\appendixpagename}{Appendices}
-% \end{verbatim}
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\end{verbatim}
 % \end{latexcode}%
-% ^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
+% ^^A \cmditem{appendicesname}{name}\hfill default:\texttt{Appendici}
 % ^^A
 % ^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
 %
 % \end{ltxsyntax}
 %
-%
-% \section{Collections}\label{sec:collection}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Collections}\label{sec:collection}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % The \opt{collection} document structure is thought to create a collection of papers. Each paper has to be typeset in a separate \file{.tex} file inside the \env{article} environment:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \begin{article}
-% \author{Author}
-% \title{Title of the paper}
-%  % The abstract is optional.
-%  % \begin{abstract}
-%  %  The abstract
-%  % \end{abstract}
-%
-% \maketitle
-%
-%   Text of the paper
-% \end{article}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{article}
+%\author{Author}
+%\title{Title of the paper}
+% % The abstract is optional.
+% % \begin{abstract}
+% %  The abstract
+% % \end{abstract}
+%
+%\maketitle
+%
+%  Text of the paper
+%\end{article}
+%\end{verbatim}
 % \end{latexcode}
 % If the names of the papers are \file{article1.tex}, \file{article2.tex}, \file{article3.tex}, etc., then a minimal main file should be similar to this:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \documentclass[structure=collection]{suftesi}
-%
-% \begin{document}
-%  \input{article1}
-%  \input{article2}
-%  \input{article3}
-% \end{document}
-% \end{verbatim}
+%\begin{verbatim}
+%\documentclass[structure=collection]{suftesi}
+%
+%\begin{document}
+% \input{article1}
+% \input{article2}
+% \input{article3}
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 %
-% \subsection{Options}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Options}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as ``Table of Contents'', ``Index'', ``Bibliography'', etc.
+% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as \emph{Table of Contents}, \emph{Index}, \emph{Bibliography}, etc.
 %
 % \begin{optionlist}
-% \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \opt{right}}
+% \optitem[left]{papertitlestyle}{\opt{left}\OR\opt{center}\OR\opt{right}}
 %   \begin{valuelist}
 %     \item[left] Aligns the author-title block on the left.
 %     \item[center] Centers the author-title block. 
 %     \item[right] Aligns the author-title block on the right.
 %   \end{valuelist}
-% \optitem[false]{revauthortitle}{\opt{true}, \opt{false}}
+% \optitem[false]{revauthortitle}{\opt{true}\OR\opt{false}}
 %   \begin{valuelist}
 %     \item[true] Prints the author’s name below the title.
 %     \item[false] Prints the author’s name above the title.
 %   \end{valuelist}
-% \optitem[italic]{titlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[italic]{titlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the title of the articles in roman.
 %     \item[italic] Prints the  title of the articles in \emph{italic}.
 %     \item[smallcaps] Prints the  title of the articles 
 %      in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
-% \optitem[roman]{authorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{authorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the author's name in roman.
 %     \item[italic] Prints the author's name in \emph{italic}.
@@ -1526,28 +1778,33 @@
 %         to protect the \cmd{thanks} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \author{The Author\protect\thanks{...}}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{The Author\protect\thanks{...}}
+%\end{verbatim}
 % \end{latexcode}
-% \end{valuelist}
-% \optitem[italic]{toctitlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+%   \end{valuelist}
+% \optitem[italic]{toctitlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the title TOC entry in roman.
 %     \item[italic] Prints the  title TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the  title TOC entry  
 %      in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
-% \optitem[roman]{tocauthorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{tocauthorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the author’s name TOC entry in roman.
 %     \item[italic] Prints the  author’s name TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the  author’s name TOC entry  
 %      in \textsc{\lsstyle spaced small caps}. 
-% \end{valuelist}
+%   \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Commands} 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Commands} 
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
 % \begin{ltxsyntax} 
 %
 % \cmditem{frontispiece} 
@@ -1564,66 +1821,70 @@
 %
 % Sets the editor(s) of the collection.
 %
-% \cmditem{titlefont}{definition}\hfill(default=\texttt{empty})
+% \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})
+% \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}
+%\begin{verbatim}
+%\titlefont{\bfseries\sffamily\scshape}  
+%\authorfont{\itshape\sffamily}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-% \section{Known issues}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Known issues}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % A problem occurs with the article document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
 % \begin{latexcode}
-% \begin{verbatim}
-% \markboth{Section title}{Section title}
-% \part{The title of the part}
-% %
-% \section{Section title}
-% \end{verbatim}
+%\begin{verbatim}
+%\markboth{Section title}{Section title}
+%\part{The title of the part}
+%
+%\section{Section title}
+%\end{verbatim}
 % \end{latexcode}
-% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterapge} command:
+% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterpage} command:
 % \begin{latexcode}
-% \begin{verbatim}
-% \afterpage{
-%  \markboth{Section title}{Section title}
-%    \part{The title of the part}
-%   }
-% %
+%\begin{verbatim}
+%\afterpage{
+% \markboth{Section title}{Section title}
+%   \part{The title of the part}
+%  }
+%
 % \section{Section title}
-% \end{verbatim}
+%\end{verbatim}
 % \end{latexcode}
 %
-%
-%
-% \section{Backward compatibility}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Backward compatibility}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
 % \optitem{defaultfont}{\opt{compatibility}}
-% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (i.e. Artemisia) add the \opt{greekfont=artemisia} option.
-% \optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
+% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (GFS Artemisia) add the \opt{greekfont=artemisia} option.
+% \optitem[book]{documentstructure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
 % An alias for \opt{structure}
-% \boolitem[true]{crop}
-% \begin{valuelist}
-% \item[true] An alias for \opt{version=draft} option.
-% \item[false] An alias for \opt{version=center} option.
-% \end{valuelist}
-%
-%
-% \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
-% \end{optionlist}
+% \optitem[true]{crop}{\opt{true}\OR\opt{false}}
+%   \begin{valuelist}
+%     \item[true] An alias for \opt{version=draft} option.
+%     \item[false] An alias for \opt{version=center} option.
+%   \end{valuelist}
+% \optitem{parindent}{\opt{1em}, \opt{1.5em}}
+% An alias fo \opt{parindent=compact} and \opt{parindent=wide} respectively.
+% \optitem{style}{\opt{FSPLa}\OR\opt{FSPLb}\OR\opt{FSPLc}}
 % These styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the Verona University  (Italy).
-%
-% 
+% \end{optionlist}
 %
 % \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
 % \noindent The \cmd{FSPLcolophon}\ar{\meta{Name Surname}} command is provided to typeset the colophon according to these styles:
@@ -1646,10 +1907,9 @@
 % \bigskip
 %
 % \noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
-% \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, 
+% \emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
 % Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
-% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M. Nowacki.
-%
+% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M.~ Nowacki.
 %
 % \noindent\rule{\textwidth}{.4pt}
 %
@@ -1808,7 +2068,11 @@
 %
 % \StopEventually{\PrintChanges\PrintIndex}
 %
-% \section*{The Code}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{The Code}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % \addcontentsline{toc}{section}{The Code}
 % \iffalse
 %<*class>
@@ -2264,34 +2528,28 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Chapter number style}
 %    \begin{macrocode}
 \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{}
@@ -2321,13 +2579,13 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
   \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Section number style}
 %    \begin{macrocode}
 \define@choicekey{}{secnumstyle}[\val\nr]
-    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+  \ifcase\nr\relax
   \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
@@ -2357,67 +2615,67 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
   \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Subsection number style}
 %    \begin{macrocode}
 \define@choicekey{}{subsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-	\ifcase\nr\relax
-	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Sub-subsection number style}
 %    \begin{macrocode}
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-	\ifcase\nr\relax
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \fi}
 %    \end{macrocode}
 % This option controls the style of small capitals used in the 
 % title of chapters and sections using \opt{\meta{level}font=smallcaps} option:
@@ -2449,12 +2707,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \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}}
+\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}}
 %    \end{macrocode}
 % \subsection*{Headers}
 %
@@ -2620,29 +2884,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \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}
+  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}
+\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}
+\or
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\relax}
     \def\suf@ctocdotsssec{.}
-	\fi}
+  \fi}
 \define@choicekey{}{twocolcontents}[\val\nr]{%
     toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \ifcase\nr\relax
@@ -3246,7 +3510,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
          \ifsuftesi@mathextended
          \RequirePackage{amsthm}
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa} 
+         \RequirePackage[cal=boondoxo]{mathalpha} 
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
@@ -3283,18 +3547,18 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
-		\RequirePackage[sb]{libertine}
-		\RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
-		\ifsuftesi@mathextended
-		\RequirePackage{amsthm}
-		\RequirePackage{libertinust1math}
-		\RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalfa}
-		\else
-		\ifsuftesi@mathminimal
-		\RequirePackage{libertinust1math}
-		\else
-		\fi
-		\fi
+    \RequirePackage[sb]{libertine}
+    \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+    \ifsuftesi@mathextended
+    \RequirePackage{amsthm}
+    \RequirePackage{libertinust1math}
+    \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalpha}
+    \else
+    \ifsuftesi@mathminimal
+    \RequirePackage{libertinust1math}
+    \else
+    \fi
+    \fi
          \useosf
       \ifsuftesi@bodoni
       \gdef\SUFfntscale{0.9}
@@ -3317,7 +3581,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
         \ifsuftesi@mathextended
         \RequirePackage{amsthm}
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalfa}
+        \RequirePackage[cal=boondoxo]{mathalpha}
         \else
         \ifsuftesi@mathminimal
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
@@ -3475,84 +3739,84 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@default@SECTIONS{
 \ifsuftesi@numparsec
 % \titleformat{\section}[display]
-%	  {\SUF@sectionsize\SUF@lr@SECSwitch}
-%	  {\ifsuftesi@article\SUF@thesection
-%	    \else\thesection\fi\SUF@dotsec}
-%	  {0ex}
-%	  {\SUF@SEC@StyleSwitch}
+%    {\SUF@sectionsize\SUF@lr@SECSwitch}
+%    {\ifsuftesi@article\SUF@thesection
+%      \else\thesection\fi\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]	 
+  \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]   
 \else
 % \titleformat{\section}[hang]
-%	  {\SUF@sectionsize\SUF@lr@SECSwitch}
-%	  {\ifsuftesi@article\SUF@thesection
-%	    \else\thesection\fi\SUF@dotsec}
-%	  {1em}
-%	  {\SUF@SEC@StyleSwitch}
+%    {\SUF@sectionsize\SUF@lr@SECSwitch}
+%    {\ifsuftesi@article\SUF@thesection
+%      \else\thesection\fi\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]	  
+  \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]    
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifsuftesi@numparsubsec
 % \titleformat{\subsection}[display]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-%	  {\textnormal\thesubsection}
-%	  {0ex}
-%	  {\SUF@SUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+%    {\textnormal\thesubsection}
+%    {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]
+  \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 % \titleformat{\subsection}[hang]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-%	  {\textnormal\thesubsection}
-%	  {1em}
-%	  {\SUF@SUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+%    {\textnormal\thesubsection}
+%    {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]
+  \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifsuftesi@numparsubsubsec
 % \titleformat{\subsubsection}[display]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-%	  {\textnormal\thesubsubsection}
-%	  {0ex}
-%	  {\SUF@SUBSUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+%    {\textnormal\thesubsubsection}
+%    {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]  
+  \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
 \else
 % \titleformat{\subsubsection}[hang]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-%	  {\textnormal\thesubsubsection}
-%	  {1em}
-%	  {\SUF@SUBSUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+%    {\textnormal\thesubsubsection}
+%    {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]  
+  \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
   \fi
 }
 \SUF@default@CHAPTER
@@ -3582,7 +3846,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else%standard/standardaureo
   \titlespacing*{\chapter}{0em}{%
-     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}	
+     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}  
   \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
          \fi
        \fi
@@ -3601,16 +3865,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
      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\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}
 %    \end{macrocode}
 % The \opt{partpage} options allows you to print a standard part page
 % in \opt{article} mode.
@@ -3681,7 +3945,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 % so we must redefine them according to the styles of \sty{suftesi},
 % which does not use uppercase letters in the headings.
 %    \begin{macrocode}
-\ifsuftesi@article			
+\ifsuftesi@article      
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
@@ -3713,7 +3977,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \subsection{#1}}}%
     {\relax}%
 }%
-\else							
+\else              
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
@@ -4144,7 +4408,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
       \fi
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@ % Prevents figures from going at top of page.
       \@maketitle
     \fi
     \thispagestyle{plain}\@thanks%
@@ -4303,25 +4567,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %    \end{macrocode}
 %    \begin{macrocode}
 \renewenvironment{theindex}
-               {\if@twocolumn
-                  \@restonecolfalse
-                \else
-                  \@restonecoltrue
-                \fi
-                \ifsuftesi@article
-                \twocolumn[\section*{\indexname}]%
-                \else
-                \twocolumn[\@makeschapterhead{\indexname}]%
-                \fi
-                \@mkboth{\indexname}{\indexname}%
-                \thispagestyle{plain}%
-                \raggedright%
-                \parindent\z@
-                \parskip\z@ \@plus .3\p@\relax
-                \columnseprule \z@
-                \columnsep 35\p@
-                \let\item\@idxitem}
-               {\if@restonecol\onecolumn\else\clearpage\fi}
+  {\if@twocolumn
+     \@restonecolfalse
+   \else
+     \@restonecoltrue
+   \fi
+   \ifsuftesi@article
+   \twocolumn[\section*{\indexname}]%
+   \else
+   \twocolumn[\@makeschapterhead{\indexname}]%
+   \fi
+   \@mkboth{\indexname}{\indexname}%
+   \thispagestyle{plain}%
+   \raggedright%
+   \parindent\z@
+   \parskip\z@ \@plus .3\p@\relax
+   \columnseprule \z@
+   \columnsep 35\p@
+   \let\item\@idxitem}
+  {\if@restonecol\onecolumn\else\clearpage\fi}
 %    \end{macrocode}
 % \subsection*{Appendix}
 %    \begin{macrocode}
@@ -4338,7 +4602,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
     Redefine the \noexpand\appendixpagename command instead. 
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
-	{Command \noexpand\appendicesname undefined\MessageBreak
+  {Command \noexpand\appendicesname undefined\MessageBreak
     Redefine the \noexpand\appendixpagename command instead.
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
@@ -4347,8 +4611,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %     \newcommand{\appendixpage}{\SUF@appendixpage}
 % \def\SUF@appendixpage{%
 %   \@mainmattertrue
-%     \titlecontents{part}                                                  
-%       [0em]                                                                    
+%     \titlecontents{part}           
+%       [0em]                
 %       {\addvspace{3ex}}
 %       {}
 %       {}
@@ -4365,73 +4629,151 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %           \vfil
 %    \endgroup
 %     \cleardoublepage
-% \titlecontents{part}                                                  
-%    [0em]                                                                    
-%   {\addvspace{3ex}\partname~}                                                 
+% \titlecontents{part}           
+%    [0em]                
+%   {\addvspace{3ex}\partname~}          
 %   {\makebox[\SUF@label@part][l]{%
 %   \thecontentslabel}\hspace*{1em}}   
-%   {}                                                                      
+%   {}                  
 %   {}
 %   [\addvspace{1ex}]
 % }
 \renewcommand{\@chap@pppage}{%
-	\clear@ppage
-	\thispagestyle{plain}%
-	\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
-	\null\vfil
-	\markboth{}{}%
-	{\centering
-		\interlinepenalty \@M
-		\normalfont
-		\SUF@chaptersize
+  \clear@ppage
+  \thispagestyle{plain}%
+  \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+  \null\vfil
+  \markboth{}{}%
+  {\centering
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
-	\if@dotoc@pp
-	\addappheadtotoc
-	\fi
-	\vfil\newpage
-	\if@twoside
-	\if@openright
-	\null
-	\thispagestyle{empty}%
-	\newpage
-	\fi
-	\fi
-	\if@tempswa
-	\twocolumn
-	\fi
+  \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
+  \par
+  \addvspace{4ex}%
+  \@afterindentfalse
+  {\parindent \z@ \raggedright
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
-		\markboth{}{}\par}%
-	\if@dotoc@pp
-	\addappheadtotoc
-	\fi
-	\nobreak
-	\vskip 3ex
-	\@afterheading
+    \markboth{}{}\par}%
+  \if@dotoc@pp
+  \addappheadtotoc
+  \fi
+  \nobreak
+  \vskip 3ex
+  \@afterheading
+}
+%    \end{macrocode}
+% Within the appendices the chapter and section labels are literal. 
+% Using the \opt{chapnumstyle=Roman} or  \opt{chapnumstyle=roman} options, 
+% this label is passed as an argument to \cmd{@Roman} or \cmd{@roman}, 
+% which however accepts only integers. For this reason we must redefine 
+% all the occurrences of \cmd{titlecontents} in order to have \cmd{thecontentslabel} 
+% in place of \cmd{SUF@CHAP@thecontentslabel} or \cmd{SUF@SEC@thecontentslabel}.
+%    \begin{macrocode}
+\def\suf@appendixtoc{%
+  \ifsuftesi@pagelefttoc
+  \titlecontents{chapter}
+  [\SUF@tochang@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap%
+    \makebox[\SUF@label@chap][l]{%
+      \thecontentslabel}\hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
+  {}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tochang@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\SUF@tochang@sec]
+  {}
+  {\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]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\SUF@tochang@sec%
+    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \SUF@tocSEC@font}
+  {}
+  \fi
+  \else
+  \titlecontents{chapter}
+  [\SUF@tocindent@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tocindent@chap%
+    \makebox[\SUF@label@chap][l]{\thecontentslabel}%
+    \hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tocindent@chap%
+    \SUF@tocCHAP@font}
+  {\SUF@chaptitlerule\contentspage}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tocindent@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\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]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \SUF@tocSEC@font}
+  {\ifsuftesi@article\SUF@chaptitlerule%
+    \else\SUF@titlerule\fi\contentspage}
+  \fi
 }
 \ifsuftesi@article
-  \renewcommand\appendix{\par
-    \setcounter{section}{0}%
-    \setcounter{subsection}{0}%
-    \gdef\SUF@thesection{\@Alph\c@section}%
-    \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
-    \renewcommand{\thesection}{\@Alph\c@section}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\SUF@thesection{\@Alph\c@section}%
+  \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+  \renewcommand{\thesection}{\@Alph\c@section}}
 \else
-  \renewcommand\appendix{\par
-    \setcounter{chapter}{0}%
-    \setcounter{section}{0}%
-    \gdef\@chapapp{\appendixname}%
-    \gdef\SUF@thechapter{\@Alph\c@chapter}%
-    \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
-    \renewcommand{\thechapter}{\@Alph\c@chapter}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\SUF@thechapter{\@Alph\c@chapter}%
+  \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+  \renewcommand{\thechapter}{\@Alph\c@chapter}}
 \fi
 %    \end{macrocode}
 % \subsection*{Headings}
@@ -4449,11 +4791,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %    \begin{macrocode}
 \renewcommand{\chaptermark}[1]{%
   \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
-	\ifsuftesi@article
-	  \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
-	    \else
-	  \renewcommand{\sectionmark}[1]{}
-	\fi
+  \ifsuftesi@article
+    \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
+      \else
+    \renewcommand{\sectionmark}[1]{}
+  \fi
 %    \end{macrocode}
 % \paragraph{The \opt{plain} style}
 %    \begin{macrocode}
@@ -4492,11 +4834,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
   }%
 %
 \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}
 \fi
@@ -4517,31 +4859,31 @@ quotesize,footnotestyle,liststyle,captionstyle}
 % The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
 %    \begin{macrocode}
 \renewenvironment{quotation}
-            {\list{}{\listparindent\parindent%
-                     \itemindent    \listparindent
-                     \leftmargin     \parindent
-                     \SUF@quote@style                       
-                     \parsep        \z@ \@plus\p@}%
-               \item\relax%
-                 \SUF@quotation@size%
-                 \noindent\ignorespaces}
-               {\endlist}
+  {\list{}{\listparindent\parindent%
+    \itemindent    \listparindent
+    \leftmargin     \parindent
+    \SUF@quote@style      
+    \parsep    \z@ \@plus\p@}%
+    \item\relax%
+    \SUF@quotation@size%
+    \noindent\ignorespaces}
+  {\endlist}
 \renewenvironment{quote}
-            {\list{}{\leftmargin \parindent
-            \SUF@quote@style}%
-               \item\relax%
-                 \SUF@quotation@size}% \ignorespaces?
-               {\endlist}
+  {\list{}{\leftmargin \parindent
+    \SUF@quote@style}%
+    \item\relax%
+    \SUF@quotation@size}% \ignorespaces?
+  {\endlist}
 \renewenvironment{verse}
-               {\let\\\@centercr
-                \list{}{\itemsep      \z@
-                        \itemindent   -1.5em%
-                        \listparindent\itemindent
-                        \rightmargin  \leftmargin
-                        \advance\leftmargin 1.5em}%
-                \item\relax
-                 \SUF@quotation@size}
-               {\endlist}  
+  {\let\\\@centercr
+    \list{}{\itemsep      \z@
+      \itemindent   -1.5em%
+      \listparindent\itemindent
+      \rightmargin  \leftmargin
+      \advance\leftmargin 1.5em}%
+    \item\relax
+    \SUF@quotation@size}
+  {\endlist}  
 %    \end{macrocode}
 % \paragraph{The \opt{fewfootnotes} option}
 % Enable only with three footnotes per page maximum.
@@ -4573,7 +4915,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@mpsetup{%
   \itshape
     \footnotesize%
-    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
@@ -4716,10 +5058,10 @@ visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 \null\vspace{\stretch{1}}
 
 \noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
-\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, 
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
 Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
 is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by 
-Janusz M. Nowacki.
+Janusz M.~Nowacki.
 
 \endgroup
 
@@ -4739,7 +5081,7 @@ Janusz M. Nowacki.
 %    \end{macrocode}
 % All the lengths depend on |\SUF@label@chap| 
 % so we define this first.
-%    \begin{macrocode}
+%    \begin{macrocode}z
 \newlength\SUF@label@chap
 \setlength\SUF@label@chap{.5em}
 %    \end{macrocode}
@@ -4890,8 +5232,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tochang@chap]{}{%
-	\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tochang@sec]
@@ -4910,8 +5252,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
-	\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tochang@subsec]
@@ -4927,8 +5269,9 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
-	\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tochang@subsubsec]
@@ -5039,8 +5382,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tocindent@chap]{}{%
-	\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tocindent@sec]
@@ -5058,8 +5401,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
-	\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tocindent@subsec]
@@ -5073,8 +5416,9 @@ Janusz M. Nowacki.
 \fi  
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
-	\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tocindent@subsubsec]
@@ -5122,16 +5466,16 @@ Janusz M. Nowacki.
 \ifsuftesi@article 
 \renewcommand\tableofcontents{%
     \vspace{2ex}%
-	    \section*{\contentsname}%
-	      \@mkboth{\contentsname}{\contentsname}%
+      \section*{\contentsname}%
+        \@mkboth{\contentsname}{\contentsname}%
         \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-	          \@starttoc{toc}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{toc}%
-	      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
@@ -5141,11 +5485,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-	          \@starttoc{lof}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lof}%
-	      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
@@ -5155,11 +5499,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-	          \@starttoc{lot}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lot}%
-	      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \vspace{2ex}%
     }
 \else
@@ -5179,11 +5523,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-	          \@starttoc{toc}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{toc}%
-	      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \if@restonecol\twocolumn\fi
    }
 \renewcommand\listoffigures{%
@@ -5198,11 +5542,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-	          \@starttoc{lof}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lof}%
-	      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \renewcommand\listoftables{%
@@ -5218,11 +5562,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-	          \@starttoc{lot}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lot}%
-	      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \fi
@@ -5301,7 +5645,7 @@ Janusz M. Nowacki.
 %    \end{macrocode}
 %
 % \subsection*{Final settings}
-% Renew  |\frontmatter| to have arabic page numbering:
+% Renew  \cmd{frontmatter} to have arabic page numbering.
 %
 %    \begin{macrocode}
 \ifsuftesi@article
@@ -5350,7 +5694,8 @@ Janusz M. Nowacki.
   \relax
 \fi
 %    \end{macrocode}
-% Just one touch of french typography:
+% Now we switch off extra space after punctuation, in accordance with the habits 
+% of European typography, especially the Italian one. The user can restore standard behavior with the \cmd{nonfrenchspacing} command.
 %    \begin{macrocode}
 \frenchspacing
 %    \end{macrocode}
@@ -5358,7 +5703,6 @@ Janusz M. Nowacki.
 %</class>
 % \fi
 %
-%
 % \iffalse
 %<*bib>
 @book{Morison:1111,
@@ -5435,6 +5779,21 @@ Janusz M. Nowacki.
   Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf},
   Year = {2010}}
 
+@online{wilson-robertson:appendix,
+	Author = {Peter R. Wilson and Will Robertson},
+	Note = {Version 1.2c},
+	Title = {The \textsf{appendix} package},
+	Url = {http://mirrors.ctan.org/macros/latex/contrib/appendix/appendix.pdf},
+	Year = {2020}}
+
+@online{Valbusa:fontsize,
+	Author = {Ivan Valbusa},
+	Note = {Versione 0.1},
+	Title = {User's Guide to \textsf{fontsize}},
+	Subtitle = {A small package to change the font size},	
+	Url = {http://mirrors.ctan.org/macros/latex/contrib/fontsize/fontsize.pdf},
+	Year = {2020}}
+
 @online{Miede:2011,
   Author = {André Miede},
   Title = {A Classic Thesis style},
@@ -5471,27 +5830,23 @@ Janusz M. Nowacki.
   Year = {2008}}
 
 @article{valbusa:20122,
-	Author = {Ivan Valbusa},
-	Date = {2012},
-	Date-Added = {2013-08-23 10:45:16 +0200},
-	Date-Modified = {2013-08-23 10:48:03 +0200},
-	Journaltitle = {\Ars},
-	Month = {10},
-	Number = {14},
-	Pages = {15-30},
-	Subtitle = {La classe suftesi},
-	Title = {La forma del testo umanistico},
-	url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
+  Author = {Ivan Valbusa},
+  Date = {2012},
+  Journaltitle = {\Ars},
+  Month = {10},
+  Number = {14},
+  Pages = {15-30},
+  Subtitle = {La classe suftesi},
+  Title = {La forma del testo umanistico},
+  url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
 
 @book{munari:arte-come-mestiere,
-	Author = {Bruno Munari},
-	Booktitle = {Arte come mestiere},
-	Date-Added = {2016-03-12 16:39:37 +0000},
-	Date-Modified = {2016-03-12 16:40:07 +0000},
-	Location = {Roma-Bari},
-	Publisher = {Laterza},
-	Title = {Arte come mestiere},
-	Year = {1966}}
+  Author = {Bruno Munari},
+  Booktitle = {Arte come mestiere},
+  Location = {Roma-Bari},
+  Publisher = {Laterza},
+  Title = {Arte come mestiere},
+  Year = {1966}}
 %</bib>
 % \fi
 %
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index c2625bff7ab..f4ba2c425b7 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -6,23 +6,27 @@
 %%
 %% suftesi.dtx  (with options: `class')
 %% 
-%%  Copyright 2009-2020 by Ivan Valbusa
+%% The 'suftesi' document class
+%% Copyright (C) 2009-2020 Ivan Valbusa
+%% <ivan dot valbusa at gmail dot com>
 %% 
-%%  This program is provided under the terms of the
-%%  LaTeX Project Public License distributed from CTAN
-%%  archives in directory macros/latex/base/lppl.txt.
+%% All rights reserved.
 %% 
-%%  Author: Ivan Valbusa
-%%          ivan dot valbusa at univr dot it
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %% 
-%%  This work has the LPPL maintenance status "author-maintained".
+%% This work consists of all files listed in README
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
-
-
-
+    [2020/05/21 v2.9.9 A class for typesetting theses, books and articles]
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@compatibility
 \newif\ifsuftesi@nofont
@@ -459,8 +463,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{}
@@ -490,10 +494,10 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \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
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+  \ifcase\nr\relax
   \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
@@ -523,61 +527,61 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \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
-\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{.}
+  \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{\SUF@thesubsection.\arabic{subsubsection}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \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]{%
 \ifcase\nr\relax
@@ -601,12 +605,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \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}}
+\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]{%
@@ -745,29 +755,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \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}
+  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}
+  \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}
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\relax}
     \def\suf@ctocdotsssec{.}
-\fi}
+  \fi}
 \define@choicekey{}{twocolcontents}[\val\nr]{%
     toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \ifcase\nr\relax
@@ -1290,7 +1300,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
          \ifsuftesi@mathextended
          \RequirePackage{amsthm}
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa}
+         \RequirePackage[cal=boondoxo]{mathalpha}
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
@@ -1327,18 +1337,18 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
-\RequirePackage[sb]{libertine}
-\RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
-\ifsuftesi@mathextended
-\RequirePackage{amsthm}
-\RequirePackage{libertinust1math}
-\RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalfa}
-\else
-\ifsuftesi@mathminimal
-\RequirePackage{libertinust1math}
-\else
-\fi
-\fi
+    \RequirePackage[sb]{libertine}
+    \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+    \ifsuftesi@mathextended
+    \RequirePackage{amsthm}
+    \RequirePackage{libertinust1math}
+    \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalpha}
+    \else
+    \ifsuftesi@mathminimal
+    \RequirePackage{libertinust1math}
+    \else
+    \fi
+    \fi
          \useosf
       \ifsuftesi@bodoni
       \gdef\SUFfntscale{0.9}
@@ -1361,7 +1371,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
         \ifsuftesi@mathextended
         \RequirePackage{amsthm}
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalfa}
+        \RequirePackage[cal=boondoxo]{mathalpha}
         \else
         \ifsuftesi@mathminimal
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
@@ -1505,14 +1515,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
 {\SUF@thesection\SUF@dotsec}
 {0ex}
 {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] 
+  \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\section}[hang]
 {\SUF@sectionsize\SUF@lr@SECSwitch}
 {\SUF@thesection\SUF@dotsec}
 {1em}
 {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] 
+  \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi@numparsubsec
 \titleformat{\subsection}[display]
@@ -1520,14 +1530,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
 {\textnormal\SUF@thesubsection\SUF@dotsubsec}
 {0ex}
 {\SUF@SUBSEC@StyleSwitch}
-\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+  \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\subsection}[hang]
 {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
 {\textnormal\SUF@thesubsection\SUF@dotsubsec}
 {1em}
 {\SUF@SUBSEC@StyleSwitch}
-\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+  \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi@numparsubsubsec
 \titleformat{\subsubsection}[display]
@@ -1535,14 +1545,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
 {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
 {0ex}
 {\SUF@SUBSUBSEC@StyleSwitch}
-\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
+  \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\subsubsection}[hang]
 {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
 {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
 {1em}
 {\SUF@SUBSUBSEC@StyleSwitch}
-\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+  \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
   \fi
 }
 \SUF@default@CHAPTER
@@ -1572,7 +1582,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else%standard/standardaureo
   \titlespacing*{\chapter}{0em}{%
-     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex} 
+     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
          \fi
        \fi
@@ -1588,16 +1598,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
      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\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}
 \ifsuftesi@partpage
   \relax
     \else
@@ -1647,7 +1657,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   {}
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article 
+\ifsuftesi@article
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
@@ -1679,7 +1689,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \subsection{#1}}}%
     {\relax}%
 }%
-\else 
+\else
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
@@ -2083,7 +2093,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
       \fi
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@ % Prevents figures from going at top of page.
       \@maketitle
     \fi
     \thispagestyle{plain}\@thanks%
@@ -2204,25 +2214,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \fi\fi\fi\fi\fi\fi}
 {\relax}}}
 \renewenvironment{theindex}
-               {\if@twocolumn
-                  \@restonecolfalse
-                \else
-                  \@restonecoltrue
-                \fi
-                \ifsuftesi@article
-                \twocolumn[\section*{\indexname}]%
-                \else
-                \twocolumn[\@makeschapterhead{\indexname}]%
-                \fi
-                \@mkboth{\indexname}{\indexname}%
-                \thispagestyle{plain}%
-                \raggedright%
-                \parindent\z@
-                \parskip\z@ \@plus .3\p@\relax
-                \columnseprule \z@
-                \columnsep 35\p@
-                \let\item\@idxitem}
-               {\if@restonecol\onecolumn\else\clearpage\fi}
+  {\if@twocolumn
+     \@restonecolfalse
+   \else
+     \@restonecoltrue
+   \fi
+   \ifsuftesi@article
+   \twocolumn[\section*{\indexname}]%
+   \else
+   \twocolumn[\@makeschapterhead{\indexname}]%
+   \fi
+   \@mkboth{\indexname}{\indexname}%
+   \thispagestyle{plain}%
+   \raggedright%
+   \parindent\z@
+   \parskip\z@ \@plus .3\p@\relax
+   \columnseprule \z@
+   \columnsep 35\p@
+   \let\item\@idxitem}
+  {\if@restonecol\onecolumn\else\clearpage\fi}
 \RequirePackage{appendix}
 \renewcommand{\appendixpagename}{Appendici}
 \renewcommand{\appendixtocname}{Appendici}
@@ -2234,68 +2244,132 @@ quotesize,footnotestyle,liststyle,captionstyle}
     Redefine the \noexpand\appendixpagename command instead.
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
-{Command \noexpand\appendicesname undefined\MessageBreak
+  {Command \noexpand\appendicesname undefined\MessageBreak
     Redefine the \noexpand\appendixpagename command instead.
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
 \renewcommand{\@chap@pppage}{%
-\clear@ppage
-\thispagestyle{plain}%
-\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
-\null\vfil
-\markboth{}{}%
-{\centering
-\interlinepenalty \@M
-\normalfont
-\SUF@chaptersize
+  \clear@ppage
+  \thispagestyle{plain}%
+  \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+  \null\vfil
+  \markboth{}{}%
+  {\centering
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
-\if@dotoc@pp
-\addappheadtotoc
-\fi
-\vfil\newpage
-\if@twoside
-\if@openright
-\null
-\thispagestyle{empty}%
-\newpage
-\fi
-\fi
-\if@tempswa
-\twocolumn
-\fi
+  \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
+  \par
+  \addvspace{4ex}%
+  \@afterindentfalse
+  {\parindent \z@ \raggedright
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
-\markboth{}{}\par}%
-\if@dotoc@pp
-\addappheadtotoc
-\fi
-\nobreak
-\vskip 3ex
-\@afterheading
+    \markboth{}{}\par}%
+  \if@dotoc@pp
+  \addappheadtotoc
+  \fi
+  \nobreak
+  \vskip 3ex
+  \@afterheading
+}
+\def\suf@appendixtoc{%
+  \ifsuftesi@pagelefttoc
+  \titlecontents{chapter}
+  [\SUF@tochang@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap%
+    \makebox[\SUF@label@chap][l]{%
+      \thecontentslabel}\hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
+  {}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tochang@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\SUF@tochang@sec]
+  {}
+  {\hskip-\SUF@tochang@sec%
+    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\SUF@tochang@sec%
+    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \SUF@tocSEC@font}
+  {}
+  \fi
+  \else
+  \titlecontents{chapter}
+  [\SUF@tocindent@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tocindent@chap%
+    \makebox[\SUF@label@chap][l]{\thecontentslabel}%
+    \hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tocindent@chap%
+    \SUF@tocCHAP@font}
+  {\SUF@chaptitlerule\contentspage}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tocindent@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\SUF@tocindent@sec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \SUF@tocSEC@font}
+  {\ifsuftesi@article\SUF@chaptitlerule%
+    \else\SUF@titlerule\fi\contentspage}
+  \fi
 }
 \ifsuftesi@article
-  \renewcommand\appendix{\par
-    \setcounter{section}{0}%
-    \setcounter{subsection}{0}%
-    \gdef\SUF@thesection{\@Alph\c@section}%
-    \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
-    \renewcommand{\thesection}{\@Alph\c@section}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\SUF@thesection{\@Alph\c@section}%
+  \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+  \renewcommand{\thesection}{\@Alph\c@section}}
 \else
-  \renewcommand\appendix{\par
-    \setcounter{chapter}{0}%
-    \setcounter{section}{0}%
-    \gdef\@chapapp{\appendixname}%
-    \gdef\SUF@thechapter{\@Alph\c@chapter}%
-    \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
-    \renewcommand{\thechapter}{\@Alph\c@chapter}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\SUF@thechapter{\@Alph\c@chapter}%
+  \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+  \renewcommand{\thechapter}{\@Alph\c@chapter}}
 \fi
 \RequirePackage{fancyhdr}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2307,11 +2381,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
 \renewcommand{\chaptermark}[1]{%
   \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
-\ifsuftesi@article
-  \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
-    \else
-  \renewcommand{\sectionmark}[1]{}
-\fi
+  \ifsuftesi@article
+    \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
+      \else
+    \renewcommand{\sectionmark}[1]{}
+  \fi
 \fancypagestyle{plain}{\fancyhf{}}
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
@@ -2337,11 +2411,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \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}
 \fi
@@ -2351,31 +2425,31 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
 \renewenvironment{quotation}
-            {\list{}{\listparindent\parindent%
-                     \itemindent    \listparindent
-                     \leftmargin     \parindent
-                     \SUF@quote@style
-                     \parsep        \z@ \@plus\p@}%
-               \item\relax%
-                 \SUF@quotation@size%
-                 \noindent\ignorespaces}
-               {\endlist}
+  {\list{}{\listparindent\parindent%
+    \itemindent    \listparindent
+    \leftmargin     \parindent
+    \SUF@quote@style
+    \parsep    \z@ \@plus\p@}%
+    \item\relax%
+    \SUF@quotation@size%
+    \noindent\ignorespaces}
+  {\endlist}
 \renewenvironment{quote}
-            {\list{}{\leftmargin \parindent
-            \SUF@quote@style}%
-               \item\relax%
-                 \SUF@quotation@size}% \ignorespaces?
-               {\endlist}
+  {\list{}{\leftmargin \parindent
+    \SUF@quote@style}%
+    \item\relax%
+    \SUF@quotation@size}% \ignorespaces?
+  {\endlist}
 \renewenvironment{verse}
-               {\let\\\@centercr
-                \list{}{\itemsep      \z@
-                        \itemindent   -1.5em%
-                        \listparindent\itemindent
-                        \rightmargin  \leftmargin
-                        \advance\leftmargin 1.5em}%
-                \item\relax
-                 \SUF@quotation@size}
-               {\endlist}
+  {\let\\\@centercr
+    \list{}{\itemsep      \z@
+      \itemindent   -1.5em%
+      \listparindent\itemindent
+      \rightmargin  \leftmargin
+      \advance\leftmargin 1.5em}%
+    \item\relax
+    \SUF@quotation@size}
+  {\endlist}
 \ifsuftesi@fewfootnotes
 \AtBeginDocument{%
 \def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
@@ -2393,7 +2467,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@mpsetup{%
   \itshape
     \footnotesize%
-    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
@@ -2514,10 +2588,10 @@ visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 \null\vspace{\stretch{1}}
 
 \noindent Typeset with \LaTeX{} in collaboration with the Joint Project
-\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona,
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
 Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
 is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
-Janusz M. Nowacki.
+Janusz M.~Nowacki.
 
 \endgroup
 
@@ -2655,8 +2729,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tochang@chap]{}{%
-\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tochang@sec]
@@ -2672,8 +2746,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
-\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tochang@subsec]
@@ -2689,8 +2763,9 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
-\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tochang@subsubsec]
@@ -2795,8 +2870,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tocindent@chap]{}{%
-\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tocindent@sec]
@@ -2811,8 +2886,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
-\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tocindent@subsec]
@@ -2826,8 +2901,9 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
-\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tocindent@subsubsec]
@@ -2871,16 +2947,16 @@ Janusz M. Nowacki.
 \ifsuftesi@article
 \renewcommand\tableofcontents{%
     \vspace{2ex}%
-    \section*{\contentsname}%
-      \@mkboth{\contentsname}{\contentsname}%
+      \section*{\contentsname}%
+        \@mkboth{\contentsname}{\contentsname}%
         \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-          \@starttoc{toc}%
-        \end{multicols}
-      \else
-         \@starttoc{toc}%
-      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
@@ -2890,11 +2966,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-          \@starttoc{lof}%
-        \end{multicols}
-      \else
-         \@starttoc{lof}%
-      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
@@ -2904,11 +2980,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-          \@starttoc{lot}%
-        \end{multicols}
-      \else
-         \@starttoc{lot}%
-      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \vspace{2ex}%
     }
 \else
@@ -2925,11 +3001,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-          \@starttoc{toc}%
-        \end{multicols}
-      \else
-         \@starttoc{toc}%
-      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \if@restonecol\twocolumn\fi
    }
 \renewcommand\listoffigures{%
@@ -2944,11 +3020,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-          \@starttoc{lof}%
-        \end{multicols}
-      \else
-         \@starttoc{lof}%
-      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \renewcommand\listoftables{%
@@ -2964,11 +3040,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-          \@starttoc{lot}%
-        \end{multicols}
-      \else
-         \@starttoc{lot}%
-      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \fi