suftesi (21sep13)

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

8 files changed, 1890 insertions, 590 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README
index a92d0038139..fb91cff9098 100644
--- a/Master/texmf-dist/doc/latex/suftesi/README
+++ b/Master/texmf-dist/doc/latex/suftesi/README
@@ -28,7 +28,6 @@ This work consists of the following files:
     tesi-triennale/
       conome-tesi.tex
       conome-tesi.bib
-      conome-tesi.pdf
       immagini/
         don.png
         lamport-png
@@ -36,7 +35,6 @@ This work consists of the following files:
     tesi-magistrale/
       conome-tesi.tex
       conome-tesi.bib
-      conome-tesi.pdf
       immagini/
         don.png
         lamport-png
@@ -75,40 +73,7 @@ $ pdflatex suftesi-frn.tex
 $ biber suftesi
 $ makeindex -s gind.ist -o suftesi.ind suftesi.idx
 $ makeindex -s gglo.ist -o suftesi.gls suftesi.glo
-$ xelatex style-roman1.tex
-$ xelatex style-roman2.tex
-$ xelatex style-roman3.tex
-$ xelatex style-roman4.tex
-$ xelatex style-roman5.tex
-$ xelatex style-roman6.tex
-$ xelatex style-italic1.tex
-$ xelatex style-italic2.tex
-$ xelatex style-italic3.tex
-$ xelatex style-italic4.tex
-$ xelatex style-italic5.tex
-$ xelatex style-italic6.tex
-$ xelatex style-italic7.tex
-$ xelatex style-italic8.tex
-$ xelatex style-italic9.tex
-$ xelatex style-italic10.tex
-$ xelatex style-italic11.tex
-$ xelatex style-italic12.tex
-$ xelatex style-smallcaps1.tex
-$ xelatex style-smallcaps2.tex
-$ xelatex style-smallcaps3.tex
-$ xelatex style-smallcaps4.tex
-$ xelatex style-smallcaps5.tex
-$ xelatex style-smallcaps6.tex
-$ xelatex style-smallcaps7.tex
-$ xelatex style-smallcaps8.tex
-$ xelatex style-smallcaps9.tex
-$ xelatex style-smallcaps10.tex
-$ xelatex style-smallcaps11.tex
-$ xelatex style-smallcaps12.tex
-$ xelatex style-elements.tex
-$ xelatex style-sufelements.tex
 $ pdflatex frontespizio.tex
-$ pdflatex collect-examples.tex
 $ pdflatex suftesi.dtx
 $ pdflatex suftesi.dtx
 
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index bfdf7288750..1c683f7213d 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/collection/collection-art1.tex b/Master/texmf-dist/doc/latex/suftesi/templates/collection/collection-art1.tex
new file mode 100644
index 00000000000..e6f1f39496f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/templates/collection/collection-art1.tex
@@ -0,0 +1,149 @@
+% !TEX root = collection.tex
+% !TEX encoding = UTF-8 Unicode
+
+\title{Contrasting Smalltalk and Object-Oriented Languages}
+\author{George Forebrain}
+\maketitle
+
+
+
+\begin{abstract}
+ Simulated annealing  and systems, while compelling in theory, have not
+ until recently been considered unfortunate. In fact, few systems
+ engineers would disagree with the visualization of rasterization, which
+ embodies the theoretical principles of algorithms. In order to fulfill
+ this intent, we propose a novel methodology for the understanding of
+ journaling file systems ({JOGGER}), proving that agents  can be made
+ pseudorandom, omniscient, and perfect.
+\end{abstract}
+
+
+
+\section{The JOGGER symmetric encryption}
+
+ Hash tables  must work.  The shortcoming of this type of solution,
+ however, is that information retrieval systems  can be made
+ metamorphic, replicated, and linear-time.   Though conventional wisdom
+ states that this quandary is usually solved by the deployment of
+ e-commerce, we believe that a different approach is necessary. To what
+ extent can write-back caches  be investigated to answer this quandary?
+
+ In order to surmount this problem, we discover how local-area networks
+ can be applied to the synthesis of von Neumann machines.  For example,
+ many heuristics analyze the deployment of e-business. Despite the fact
+ that it at first glance seems unexpected, it has ample historical
+ precedence.  The basic tenet of this solution is the synthesis of
+ erasure coding. Thus, we see no reason not to use the compelling
+ unification of IPv4 and local-area networks to evaluate the evaluation
+ of voice-over-IP.
+
+ Motivated by these observations, the location-identity split  and the
+ UNIVAC computer  have been extensively investigated by systems
+ engineers. Although previous solutions to this challenge are outdated,
+ none have taken the certifiable approach we propose in this work.  Two
+ properties make this solution perfect:  we allow thin clients  to store
+ authenticated technology without the exploration of the
+ location-identity split, and also JOGGER is copied from the principles
+ of artificial intelligence. Unfortunately, this approach is often
+ well-received. Despite the fact that such a hypothesis at first glance
+ seems unexpected, it has ample historical precedence. Unfortunately,
+ semantic theory might not be the panacea that information theorists
+ expected. Combined with voice-over-IP, such a hypothesis enables a
+ ``fuzzy'' tool for enabling I/O automata.
+
+ In this work, we make four main contributions.  First, we propose new
+ large-scale methodologies ({JOGGER}), which we use to disconfirm that
+ neural networks  and symmetric encryption  can interact to address this
+ obstacle.  We describe a novel algorithm for the intuitive unification
+ of courseware and Moore's Law ({JOGGER}), verifying that the Ethernet
+ can be made multimodal, pseudorandom, and pseudorandom.  We prove that
+ while Moore's Law  and SCSI disks  are largely incompatible, consistent
+ hashing  and courseware  can agree to accomplish this objective. Lastly, we prove not only that
+ the seminal flexible algorithm for the refinement of access points by
+ Kristen Nygaard et al. is impossible, but that the same is true for
+ redundancy.
+
+ We proceed as follows. First, we motivate the need for lambda calculus.
+ Second, we show the simulation of IPv6. As a result,  we conclude.
+
+ Hash tables  must work.  The shortcoming of this type of solution,
+ however, is that information retrieval systems  can be made
+ metamorphic, replicated, and linear-time.   Though conventional wisdom
+ states that this quandary is usually solved by the deployment of
+ e-commerce, we believe that a different approach is necessary. To what
+ extent can write-back caches  be investigated to answer this quandary?
+
+ In order to surmount this problem, we discover how local-area networks
+ can be applied to the synthesis of von Neumann machines.  For example,
+ many heuristics analyze the deployment of e-business. Despite the fact
+ that it at first glance seems unexpected, it has ample historical
+ precedence.  The basic tenet of this solution is the synthesis of
+ erasure coding. Thus, we see no reason not to use the compelling
+ unification of IPv4 and local-area networks to evaluate the evaluation
+ of voice-over-IP.
+
+ Motivated by these observations, the location-identity split  and the
+ UNIVAC computer  have been extensively investigated by systems
+ engineers. Although previous solutions to this challenge are outdated,
+ none have taken the certifiable approach we propose in this work.  Two
+ properties make this solution perfect:  we allow thin clients  to store
+ authenticated technology without the exploration of the
+ location-identity split, and also JOGGER is copied from the principles
+ of artificial intelligence. Unfortunately, this approach is often
+ well-received. Despite the fact that such a hypothesis at first glance
+ seems unexpected, it has ample historical precedence. Unfortunately,
+ semantic theory might not be the panacea that information theorists
+ expected. Combined with voice-over-IP, such a hypothesis enables a
+ ``fuzzy'' tool for enabling I/O automata.
+
+ In this work, we make four main contributions.  First, we propose new
+ large-scale methodologies ({JOGGER}), which we use to disconfirm that
+ neural networks  and symmetric encryption  can interact to address this
+ obstacle.  We describe a novel algorithm for the intuitive unification
+ of courseware and Moore's Law ({JOGGER}), verifying that the Ethernet
+ can be made multimodal, pseudorandom, and pseudorandom.  We prove that
+ while Moore's Law  and SCSI disks  are largely incompatible, consistent
+ hashing  and courseware  can agree to accomplish this objective. Lastly, we prove not only that
+ the seminal flexible algorithm for the refinement of access points by
+ Kristen Nygaard et al. is impossible, but that the same is true for
+ redundancy.
+
+ We proceed as follows. First, we motivate the need for lambda calculus.
+ Second, we show the simulation of IPv6. As a result,  we conclude.
+ 
+ In order to surmount this problem, we discover how local-area networks
+ can be applied to the synthesis of von Neumann machines.  For example,
+ many heuristics analyze the deployment of e-business. Despite the fact
+ that it at first glance seems unexpected, it has ample historical
+ precedence.  The basic tenet of this solution is the synthesis of
+ erasure coding. Thus, we see no reason not to use the compelling
+ unification of IPv4 and local-area networks to evaluate the evaluation
+ of voice-over-IP.
+
+ Motivated by these observations, the location-identity split  and the
+ UNIVAC computer  have been extensively investigated by systems
+ engineers. Although previous solutions to this challenge are outdated,
+ none have taken the certifiable approach we propose in this work.  Two
+ properties make this solution perfect:  we allow thin clients  to store
+ authenticated technology without the exploration of the
+ location-identity split, and also JOGGER is copied from the principles
+ of artificial intelligence. Unfortunately, this approach is often
+ well-received. Despite the fact that such a hypothesis at first glance
+ seems unexpected, it has ample historical precedence. Unfortunately,
+ semantic theory might not be the panacea that information theorists
+ expected. Combined with voice-over-IP, such a hypothesis enables a
+ ``fuzzy'' tool for enabling I/O automata.
+
+ In this work, we make four main contributions.  First, we propose new
+ large-scale methodologies ({JOGGER}), which we use to disconfirm that
+ neural networks  and symmetric encryption  can interact to address this
+ obstacle.  We describe a novel algorithm for the intuitive unification
+ of courseware and Moore's Law ({JOGGER}), verifying that the Ethernet
+ can be made multimodal, pseudorandom, and pseudorandom.  We prove that
+ while Moore's Law  and SCSI disks  are largely incompatible, consistent
+ hashing  and courseware  can agree to accomplish this objective. Lastly, we prove not only that
+ the seminal flexible algorithm for the refinement of access points by
+ Kristen Nygaard et al. is impossible, but that the same is true for
+ redundancy.
+
+
diff --git a/Master/texmf-dist/doc/latex/suftesi/templates/collection/collection.tex b/Master/texmf-dist/doc/latex/suftesi/templates/collection/collection.tex
new file mode 100644
index 00000000000..e134b7fa1ea
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/templates/collection/collection.tex
@@ -0,0 +1,39 @@
+% !TEX encoding = UTF-8 Unicode
+\documentclass[
+pagelayout=periodicalaureo,
+documentstructure=collection,
+version=screen,
+%%twocolcontents=toc,
+%tocstyle=standard,
+%smallcapsstyle=low,
+%headerstyle=authortitlecenter,%plain,
+%headerfont=roman,%italic,smallcaps
+%authorfont=italic,%roman,smallcaps
+%titlefont=roman,%italic,smallcaps
+%papertitlestyle=left,%center,right,
+]{suftesi}
+
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{kantlipsum}
+
+\collectiontitle{The intuitive unification
+ of courseware and Moore's Law}
+\collectioneditor{Edited by\\ Mark Runsilk and Catherine Harroth}
+\date{2013}
+
+\begin{document}
+
+\frontispiece
+\bookcolophon
+  {@ 2013 Ivan Valbusa}
+  {This work has been typeset with \LaTeX{} 
+   using the \textsf{suftesi} class by Ivan Valbusa.}
+
+\tableofcontents
+
+\includeart{collection-art1}
+%\includeart{collection-art2}
+%\includeart{collection-art3}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/suftesi/templates/tesi-magistrale/cognome-tesi.pdf b/Master/texmf-dist/doc/latex/suftesi/templates/tesi-magistrale/cognome-tesi.pdf
deleted file mode 100644
index 364a46b3121..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/templates/tesi-magistrale/cognome-tesi.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/suftesi/templates/tesi-triennale/cognome-tesi.pdf b/Master/texmf-dist/doc/latex/suftesi/templates/tesi-triennale/cognome-tesi.pdf
deleted file mode 100644
index 4c48bf31690..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/templates/tesi-triennale/cognome-tesi.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 025f26887f3..20de282abd0 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -79,7 +79,7 @@
 \endgroup
 %</internal>
 %
-% Copyright (C) 2009-2012 by Ivan Valbusa 
+% Copyright (C) 2009-2013 by Ivan Valbusa 
 % <ivan dot valbusa at univr dot it>
 % -------------------------------------------------------
 % 
@@ -102,10 +102,10 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2013/07/18 v1.8 A class for typesetting theses, books and articles]
+    [2013/09/21 v1.9 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\documentclass{ltxdoc}
+\documentclass[]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[polutonikogreek,english]{babel}
@@ -137,29 +137,124 @@
    \let\optitem\ltd@item}
   {\endlist}
 \makeatother
-\renewcommand*{\optionlistfont}{\spotcolor\sffamily\displayverbfont}
-\renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont}
+\renewcommand*{\optionlistfont}{\color{sufred}\sffamily\displayverbfont}
+\renewcommand*{\ltxsyntaxlabelfont}{\color{sufred}\sffamily\displayverbfont}
 
 \usepackage{array,booktabs,multirow}
 \usepackage[final]{microtype}
 \usepackage{siunitx}
 \usepackage{pdfpages}
 \usepackage{metalogo}
+\usepackage[svgnames]{xcolor}
 \usepackage{tikz}
 \usepackage[autostyle]{csquotes}
 \usepackage[style=philosophy-classic,backend=biber]{biblatex}
   \addbibresource{suftesi.bib}
-\usepackage{xcolor}
+
+% 'suftesi' emulation
+    \definecolor{sufred}{rgb}{0.5,0,0}
+    \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+
+\usepackage[osf,sc]{mathpazo}
+\usepackage[scaled=0.9]{beramono}
+  \renewcommand{\sfdefault}{iwona}
+\usepackage{pifont}
+\newcommand{\redtriangle}{\noindent\textcolor{sufred}{\ding{228}}}
+\newcommand{\xealert}{\marginpar{\hfill\footnotesize\textcolor{sufred}{\fbox{\XeLaTeX}}}}
+
 \usepackage{geometry}
- \geometry{margin=1cm,bottom=1.5cm,paperwidth=8in,paperheight=6.25in}
-\usepackage{fourier}
-\renewcommand{\sfdefault}{lmss}
-\usepackage{sectsty}
-	\sectionfont{\spotcolor\sffamily}
-	\subsectionfont{\spotcolor}
-	\subsubsectionfont{\spotcolor} 
-	\paragraphfont{\spotcolor}
-	\subparagraphfont{\spotcolor} 
+% \geometry{margin=1cm,bottom=1.5cm,paperwidth=8in,paperheight=6.25in}
+  \geometry{%
+  heightrounded,
+    includeheadfoot=true,
+    textwidth=      120mm,
+    textheight=     194mm,
+    paperwidth=     17cm,
+    paperheight=    24cm,
+    vmarginratio=    2:3,
+    hmarginratio=   1:1,
+    marginparwidth= 62pt,
+    marginparsep=   10pt}
+%\usepackage[a4,cam,center]{crop}
+
+\usepackage{fancyhdr}
+\renewcommand{\headrulewidth}{0pt}
+\pagestyle{fancy}
+\fancyhf{}
+%\fancyhead[R]{\footnotesize Ivan Valbusa}
+%\fancyhead[c]{\footnotesize User's Guide to \textsf{suftesi} -- Version 1.9}
+\fancyhead[L]{\footnotesize User's Guide to \textsf{suftesi}  \fileversion{} -- \filedate}
+\fancyhead[R]{\footnotesize\thepage}%\fancyfoot[c]{\footnotesize \thepage}
+%\fancyfoot[L]{\footnotesize Version 1.9}
+
+  \renewenvironment{abstract}{%
+        \begin{center}%
+          {\abstractname\vspace{-.5em}}%
+        \end{center}%
+        \quotation\small\noindent\ignorespaces}
+      {\endquotation}
+      
+  \DeclareRobustCommand{\SUFtitlesmallcaps}[1]{%
+    \scshape\MakeLowercase{\lsstyle #1}}%
+
+\usepackage{titlesec}
+\titleformat{\section}[display]
+  {\filcenter}
+  {\Roman{section}.}
+  {0ex}
+  {\expandafter\SUFtitlesmallcaps}
+\titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em]
+\titleformat{\subsection}[block]
+  {\filright}
+  {\textnormal\thesubsection}
+  {1em}
+  {\expandafter\SUFtitlesmallcaps}
+\titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
+\titleformat{\subsubsection}[block]
+  {\filright}
+  {\textnormal\thesubsubsection}
+  {1em}
+  {\expandafter\itshape}
+\titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
+
+\usepackage{titletoc}
+\titlecontents{section}
+  [1em]
+  {}
+  {\thecontentslabel\hspace*{1em}}
+  {\thecontentslabel\hspace*{1em}}
+  {\hspace{1em}\contentspage}
+\titlecontents{subsection}
+  [4em]
+  {}
+  {\hskip-2em%
+    \makebox[1em][l]{\thecontentslabel}\hspace*{1em}}
+  {\thecontentslabel\hspace*{1em}}
+  {\hspace{1em}\contentspage}
+\titlecontents{subsubsection}
+  [5em]
+  {}
+  {\hskip-2em%
+    \makebox[2em][l]{\thecontentslabel}\hspace*{1em}}
+  {\thecontentslabel\hspace*{1em}}
+  {\hspace{1em}\contentspage}
+  
+\makeatletter
+\renewcommand\tableofcontents{%
+\setlength{\columnsep}{0cm}
+    \vspace{2ex}%
+	    \section*{\contentsname}%
+	      \@mkboth{\contentsname}{\contentsname}%
+        \thispagestyle{empty}
+        \begin{multicols}{2}
+	    \@starttoc{toc}%
+	    	\end{multicols}
+    \vspace{2ex}%
+   }
+\makeatother
+%
+% HYPERREF
+%
 \usepackage{hyperref}
 \hypersetup{%
     pdftitle={User's Guide to \textsf{suftesi}},
@@ -167,14 +262,22 @@
       books and articles},
     pdfauthor={Ivan Valbusa},
     pdfkeywords={thesis, humanities, books},
-    citecolor=spot}   
+    citecolor=sufred,
+    colorlinks=false,
+    linkcolor=sufred,
+    urlcolor=sufred,
+    }   
+%
+% NEW COMMANDS
+%
 \newcommand{\new}{}%
-\DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{#1\char`\}}}
-\DeclareRobustCommand*{\oar}[1]{\texttt{[#1]}}
+\newcommand{\argstyle}{\fontfamily{pplj}\itshape\selectfont}
+\DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
+\DeclareRobustCommand*{\oar}[1]{\texttt{[}\textrm{\argstyle#1}\texttt{]}}
 \DeclareRobustCommand*{\meta}[1]{%
-  $\langle${\normalfont\itshape#1\kern0.12em }$\rangle$}
-\DeclareRobustCommand*{\arm}[1]{\ar{\meta{#1}}}
-\DeclareRobustCommand*{\oarm}[1]{\oar{\meta{#1}}}
+  $\langle${\argstyle#1\kern0.12em }$\rangle$}
+\DeclareRobustCommand*{\arm}[1]{\ar{\meta{\argstyle#1}}}
+\DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
 \newcommand{\quoteskip}{.5\baselineskip
   plus .1\baselineskip minus .1\baselineskip}
 \newlength{\normalparindent}
@@ -188,18 +291,23 @@
     #1}
   {\par\addvspace{\quoteskip}\noindent\ignorespacesafterend}
 \newenvironment{ttquote}
-  {\begin{mdframed}[backgroundcolor=blue!10]
+  {\begin{mdframed}[backgroundcolor=red!2]
   \ttfamily\small\microtypesetup{activate=false}}
   {\end{mdframed}}
 \usepackage{mdframed}
-\newcommand{\specialsection}[1]{%
+\newcommand{\appendixpage}[1]{%
  \clearpage
  \bgroup\centering
  \null\vspace{\stretch{1}}
- {\Huge\bfseries\color{spot}\section{#1}}
+ {\centering Appendix\section*{#1}}
  \thispagestyle{empty}
  \vspace{\stretch{2}}\egroup\clearpage}
-\newcommand{\experimental}{\textcolor{red}{\texttt{~(beta code)~}}}  
+
+% suftesi LOGO
+\def\suftesi{\textsf{suftesi}}
+
+
+\setcounter{tocdepth}{3}
   
 \EnableCrossrefs         
 \CodelineIndex
@@ -212,7 +320,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3384}
+% \CheckSum{3982}
 %
 % \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
@@ -230,6 +338,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v1.9}{2013/09/21}{Added \opt{italic}, \opt{smallcaps} and \opt{sanserif} values for \opt{captionstyle} option. New \opt{twocolcontents} option. New \opt{supercompactaureo} page layout. Changed \cmd{toclabelspace} command and renamed to \cmd{toclabelwidth}. New \opt{collection} document structure}
 % \changes{v1.8}{2013/07/18}{Maintenance release. Corrected a bug in the definition of \cmd{appendix}}
 % \changes{v1.7}{2013/06/20}{Renamed \opt{viewmode} option to \opt{version}:  
 % renamed \opt{print} value to \opt{draft} and 
@@ -297,15 +406,15 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
-% \title{\color{spot}\bfseries User's Guide to \textsf{suftesi}\\
+% \title{\vspace*{-1.5cm}\bfseries\color{sufred} User's Guide to \suftesi\\
 % \large\itshape A document class for typesetting theses, 
 % books and articles}
 % \author{Ivan Valbusa \\
-%   \texttt{ivan dot valbusa at univr dot it}}
+% \normalsize\scshape Dipartimento di Filosofia, Pedagogia e Psicologia\\[-0.2ex]
+% \normalsize Università degli Studi di Verona\\[2ex]
+% \normalsize \texttt{ivan dot valbusa at univr dot it}}
 % \date{\fileversion{} -- \filedate}
 %
-% \newgeometry{margin=4cm,top=2cm}
-%
 % \maketitle
 %
 % \thispagestyle{empty}
@@ -323,51 +432,82 @@
 % \textcite{Morison:1111}.
 % \end{abstract}
 %
-% \newgeometry{margin=3cm}
+% \tableofcontents
+% \clearpage
+%
+%
+% \section*{A brief history}
 %
-% \noindent Copyright \copyright\ 2009-2013 Ivan Valbusa.\\[2ex]
+% 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 human sciences}) which I held at the Graduate School of Human Sciences and Philosophy (\textcolor{red}{\textbf{S}}cienze \textcolor{red}{\textbf{U}}mane e \textcolor{red}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010.\footnote{\url{http://www.sdsuf.univr.it}. Some informations can be found on 
+%\url{http://profs.lettere.univr.it/valbusa/2010/06/01/introduzione-a-latex-per-le-scienze-umane/}} 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 (Italy).\footnote{\url{http://www.univr.it/main?ent=catdoc&id=3727&idDest=6&serv=127\#1431}}
+%
+%
+% \section*{Acknowledgements}
+%
+% 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*{Copyright notice}
+%
+% {%
+% ^^A \noindent Copyright \copyright\ 2009-2013 Ivan Valbusa.\\[8ex]
 %
 % \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.3c (\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}).\\[4ex]
-%
-% {\small\noindent In addition to the terms of this license the author 
-% requires an attribution notice like the following one:
+% License, version 1.3c (\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}). In addition to the terms of this license 
+% the author requires an attribution notice (see section 
+% \ref{sec:commands}) like the following one:
 % \begin{center}
-% \emph{This work has been typeset with \LaTeX{}, using the
-% \textsf{suftesi} class by Ivan Valbusa.}
+% \textcolor{sufred}{\emph{This work has been typeset with \LaTeX{}, using the
+% \textsf{suftesi} class by Ivan Valbusa.}}
 % \end{center}
-% \noindent You can use the \cmd{*colophon} commands explained 
-% in section \ref{sec:commands}.}
 %
-% \vskip6ex
-%
-% \noindent The most important feature of this class is the set of styles it
-% provides. For this reason:
-% \begin{center}
-% \textbf{\textsc{do not modify the styles of this class\\
-% with packages and/or commands which change\\
-% the laytout of the document.\\
-% if you do not like these styles, use another class.}}
-% \end{center}
-% If you use \sty{suftesi}{} in a document typeset with another class
+% \noindent The most essence of this class is the set of styles it
+% provides. For this reason\\
+% \textcolor{sufred}{\textsc{\centering do not modify the styles of this class with packages\\ 
+% and/or commands which change the laytout of the document.\\ 
+% If you do not like these styles, use another class.\\}}
+% \noindent If you use \sty{suftesi}{} in a document typeset with another class
 % (for example \sty{book}), remember to clean up the preamble from all
-% the layout redefinitions.
-%
-% \null\vfill
-% \newgeometry{margin=2cm,bottom=1.5cm,top=1cm}
+% the layout redefinitions.\par}
 %
-% \begin{multicols}{2}
-% \fontsize{9.5}{11}\selectfont
-% \tableofcontents
-% \end{multicols}
+% \section{Use}
+% 
+% The \sty{suftesi} class is called as usual by
+% \begin{ttquote}
+% \cmd{documentclass}\oarm{options}\ar{suftesi}
+% \end{ttquote}
+% You do not need to set the \opt{a4paper} option as it is automatically loaded. 
+% All the options defined by the class are in the \meta{key}=\meta{value} format.
+% ^^A \begin{ttquote}
+% ^^A \cmd{documentclass}[\\
+% ^^A \opt{pagelayout=periodical},\\
+% ^^A \opt{chapfont=roman},\\
+% ^^A \opt{tocstyle=ragged},\\
+% ^^A \opt{marginpar=false},\\
+% ^^A ...\\
+% ^^A ]\ar{suftesi}
+% ^^A \end{ttquote}
+% 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{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are automatically disabled.
 %
-% \newgeometry{margin=2.8cm,bottom=1.5cm,top=1cm}
+% \subsection*{The document structure}
 %
-% \section{Class features}
+% With \sty{suftesi} you can typeset book-style documents (i.e. with chapters) as well as article-style documents (i.e. without chapters). The kind of document is set by the \opt{documentstructure} option which defaults to \opt{book}. With the \opt{collection} document structure you can also create collections of papers (see section \ref{sec:collection}). 
 %
+% \begin{ttquote}
+% \cmd{documentclass}\oar{documentstructure=book,\meta{options}}\ar{suftesi}\\
+% \cmd{documentclass}\oar{documentstructure=article,\meta{options}}\ar{suftesi}\\
+% \cmd{documentclass}\oar{documentstructure=collection,\meta{options}}\ar{suftesi}
+% \end{ttquote}
+% 
 % \subsection*{Loaded packages}
+%
 % \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
 % It is not compatible with \sty{crop}}
 %
@@ -375,23 +515,34 @@
 % \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{extramarks}, 
 % \sty{fancyhdr}, \sty{fixltxhyph}, \sty{fontenc}, \sty{geometry},  
 % \sty{ifxetex}, \sty{mathpazo}, 
-% \sty{microtype}, \sty{multicol}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}.
+% \sty{microtype}, \sty{multicol}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}. 
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
-
-% \subsection{Page layouts}
+% \subsection*{Use with \XeLaTeX{} and \LuaLaTeX}
+% 
+% The class can be used, of course, with the \XeTeX{} and \LuaTeX{} engines. The only difference 
+% is that in this case the font options are turned off and the \LaTeX{} default font (Computer Modern) is loaded. 
+%
+%
+% \section{Class features}
+% 
+% 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} in your \LaTeX{} distribution.
+% 
 %
-% The class provides five page layouts. The \opt{standard} layout (set by default) is aimed to typeset standard A4 documents, while the other four layouts are particularly suitable to typeset books and article.  See table \ref{tab:layouts} for details.
-% \begin{table*}[h!]
+% \subsection{Formats}
+%
+% The class provides six page layouts which can be selected by the \opt{pagelayout} option (see section \ref{sec:page-styles}). The \opt{standard} layout (set by default) is aimed to typeset standard A4 documents, while the other five layouts are particularly suitable to typeset compact books and articles (see table \ref{tab:layouts} for details).
+% \begin{table*}
 % \small\centering
 %\makebox[\textwidth][c]{\begin{tabular}{lcccccccc}
 %\toprule
 %&\multicolumn{4}{c}{Dimensions (mm)}&\multicolumn{4}{c}{Proportions}\\\cmidrule(l){2-5}\cmidrule(l){6-9}
 %&\multicolumn{2}{c}{Text}&\multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}&&\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}
-%Options:         &width &	height&	width&	height&t/b&i/o&Text block& Page\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9}\cmidrule(r){1-1}
+%Layout:         &width &	height&	width&	height&t/b&i/o&Text block& Page\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9}\cmidrule(r){1-1}
 %\opt{standard} &	110&	220&	210&	297&$1:2$&$1:2$&$1:2$&$1:\sqrt{2}$\\
 %\opt{compact}&	110&	165&	160&	240&$2:3$&$2:3$&$2:3$&$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$&$2:3$&$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$&$2:3$&$1:\sqrt{2}$\\
 %
@@ -402,91 +553,80 @@
 %
 % \subsection{Font}
 %
-% The default font for body text is
-% Palatino designed by Hermann Zapf\index{Zapf, Hermann}. Using  
-%  \XeLaTeX{}, 
-% the \LaTeX{} default font (Computer Modern) is loaded and the font options are turned off.
-% The sans serif font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.}. 
-% This choice has been inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}.
-%
-% \subsubsection{Using different fonts}
-%
-% If you prefer to use other fonts (such as those provided by \sty{fourier} or \sty{libertine} packages), remember to load the \opt{defaultfont=standard} class option 
-% which turns off the default font settings. 
-% Moreover pay particular attention in choosing the Greek font.
+% The default serif font for body text is
+% Palatino designed by Hermann Zapf\index{Zapf, Hermann} and loaded through the \sty{mathpazo} package, but you can simply choose the standard Latin Modern through the \opt{defaultfont} option (see section \ref{sec:options}). 
+% The \textsf{sans serif} font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.} and the \texttt{monospaced} typeface is Bera Mono, opportunely scaled to match Palatino. 
+% This choice has been inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}. 
+% 
+% The  Greek text is {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} which is particularly suitable for Palatino, but with the \opt{greekfont} option (see section \ref{sec:options}) you can choose also Porson or CB Greek  (see figure \ref{fig:greek-font}).\footnote{%
+% The first code for the Porson font 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.
+%}
+
 %
-% \subsubsection{Greek alphabet}
 %
-% The default font for the Greek text is Artemisia by the Greek Font Society which is particularly suitable for Palatino. 
-% With the \opt{porson} option you can use the Porson font by 
-% the Greek Font Society. The \opt{greekfont=cbgreek} option 
-% allows you to use the standard CB Greek 
-% font (see figure \ref{fig:greek-font}) This option is also activated by the 
-% \opt{defaultfont=standard} option (see section \ref{sec:options}).
-% \vskip2ex
-% \begin{figure}
-%\fontfamily{ppl}\selectfont
-%\noindent\begin{minipage}[t]{.3\textwidth}
-%\begin{otherlanguage*}{polutonikogreek}%
+% \begin{figure}[h]
+%\fontfamily{ppl}\selectfont\small
+%\noindent\begin{minipage}[t]{.32\textwidth}
+% \raggedright
+%\foreignlanguage{polutonikogreek}{%
 %\fontfamily{artemisia}\selectfont
-%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.\,
-%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
+%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
 % nell'ordinata disposizione delle parti.
 %
-% {\centering (a) Artemisia\\}
+% {\vskip1ex\centering (a) Artemisia\\}
 %\end{minipage}\hfill
-%\begin{minipage}[t]{.3\textwidth}
-%\begin{otherlanguage*}{greek}%
+%\begin{minipage}[t]{.32\textwidth}
+% \raggedright
+%\foreignlanguage{polutonikogreek}{%
 %\fontfamily{porson}\selectfont
-%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.\,
-%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
+%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
 % nell'ordinata disposizione delle parti.
 %
-% {\centering (b) Porson\\}
+% {\vskip1ex\centering (b) Porson\\}
 %\end{minipage}\hfill
-%\begin{minipage}[t]{.3\textwidth}
-%\begin{otherlanguage*}{greek}%
+%\begin{minipage}[t]{.32\textwidth}
+% \raggedright
+%\foreignlanguage{polutonikogreek}{%
 %\fontfamily{lmr}\selectfont
-%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.\,
-%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
-% nell'ordinata disposizione delle parti. 
-%
-% {\centering (c) CBGreek\\}
+%T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
+% nell'ordinata disposizione delle parti.
+% {\vskip1ex\centering (c) CBGreek\\}
 %\end{minipage}
 % \caption{Comparison between Artemisia, Porson and CBGreek greek font.}\label{fig:greek-font}
 % \end{figure}
-% The first code for the Porson font 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.
 %
-% \subsection{Frontispiece} 
+% You can use other fonts as well. In this case remember to load the \opt{defaultfont=standard} class option 
+% which turns off the default font settings. 
 %
-% \begin{minipage}{\textwidth}
-% The class has an original frontispiece now directly available 
-% loading the \sty{frontespizio} package 
-% \parencite[version 1.4 or later]{Gregorio:frontespizio} 
-% with the \opt{suftesi} option (see figure \ref{fig:frontispiece}):
 %
-% \vskip2ex
+% \subsection{Frontispiece} 
 %
+% The class has an original frontispiece (see figure \ref{fig:frontispiece}) now directly available 
+% loading the \sty{frontespizio} package  
+% with the \opt{suftesi} option % \parencite[see][version 1.4 or later]{Gregorio:frontespizio}:
 % \begin{ttquote}
 % \cmd{usepackage}[suftesi]\ar{frontespizio}
 % \end{ttquote}
-% \end{minipage}\hfill
+%
 % \begin{figure}
 % \centering
-% \fbox{\includegraphics[width=9cm]{frontespizio}}
+% \fbox{\includegraphics[width=.5\textwidth]{frontespizio}}
 % \caption{The frontispiece of \sty{suftesi}.}\label{fig:frontispiece}
 % \end{figure}
-%
+% 
+% 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 inside the \env{frontespizio} environment. For example, with the default class settings you will need:
+% \begin{ttquote}
+% \cmd{begin}\ar{frontespizio}\\
+% \cmd{Preambolo}\{\cmd{usepackage}\ar{mathpazo}\}\\
+% ...\\
+% \cmd{end}\ar{frontespizio}
+% \end{ttquote}
+% 
 % \section{Options}\label{sec:options}
 %
-% The \sty{suftesi} class defines new options to customize the style of page, titles, headings and other
-% text elements. You can also use all the options difined by \sty{book} class except those modifying 
-% the page layout (\opt{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper} 
-% and \opt{landscape}).
-%
-% \subsection{Page Styles}
+% \subsection{Layout}\label{sec:page-styles}
 %
 %\begin{optionlist}
 % \setlength{\labelwidth}{2.5cm}%
@@ -494,33 +634,38 @@
 % \changes{v0.9b}{2012/09/23}{New option \opt{documentstructure}} 
 % \begin{valuelist}
 % \item[book] For typesetting texts with chapters.
-% \item[article] This option is particularly suitable 
-% to typeset articles or short theses (that is  without 
-% chapter division).
+% \item[article] For typesetting articles or short theses 
+% (that is  without chapter division).
+% \item[collection] For typesetting journals or collections of articles.
 % \end{valuelist}
 %\optitem[standard]{pagelayout}{\opt{standard}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
 %\begin{valuelist}
 %\item[standard]
-% Prints an A4 typeblock (see table \ref{tab:layouts} for details).
+% Prints an A4 typeblock with a 
+% text area of $110 \si{cm} \times 220 \si{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 typeblock  of $17 \si{cm} \times 24 \si{cm}$ on an A4 paper, 
-% showing the crop marks  (see table \ref{tab:layouts} for details). 
-% This style is expecially meant for theses.
-% The \opt{crop=false} option disables the crop marks. 
-%\item[periodicalaureo] Similar to \opt{periodical} but with a 
+% Prints a typeblock  of $17 \si{cm} \times 24 \si{cm}$ with a text area of  $11 \si{cm} \times 16,5 \si{cm}$.
+%\item[periodicalaureo] The same of \opt{periodical} but with a 
 % \emph{golden ratio} text area of $120 \si{cm} \times 194 \si{mm}$. 
 %\item[compact]
-% The same as \opt{periodical} but with a typeblock  of $16 \si{cm} \times 24 \si{cm}$ (see table \ref{tab:layouts} for details). 
+% Prints a typeblock  of $16 \si{cm} \times 24 \si{cm}$ with a text area of $11 \si{cm} \times 16,5 \si{cm}$. 
 %\item[supercompact]
-% The same as \opt{compact} but with 
-% a  typeblock of  $14 \si{cm} \times 21   \si{cm}$  
-% (see table \ref{tab:layouts} for details).
+% Prints a typeblock  of  $14 \si{cm} \times 21 \si{cm}$  with a text area of $10 \si{cm} \times 15,5 \si{cm}$.
+%\item[supercompactaureo]
+% The same as \opt{supercompact} but with 
+% a \emph{golden ratio} text area of $10,8 \si{cm} \times 17,5 \si{cm}$.
 % \item[elements] Prints a typeblock with the dimensions of 
-% \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} 
-% (see table \ref{tab:layouts} for details). To reproduce the whole 
+% \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996}.
+% To reproduce the whole 
 % style of \textcite{Bringhurst:1996} use \opt{style=elements} option.
 %\end{valuelist}
+% The details of this option are shown in table \ref{tab:layouts}.
 %\end{optionlist}
 %
 % 	\subsection{Titles}
@@ -530,63 +675,81 @@
 % \optitem[roman]{<level>font}{\opt{roman}, \opt{italic}, 
 % \opt{smallcaps}}
 %   \begin{valuelist}
-%     \item[roman] Prints the <level> title in roman.
-%     \item[italic] Prints the <level> title in \emph{italic}.
-%     \item[smallcaps] Prints the <level> title. 
+%     \item[roman] Prints the \meta{level} title in roman.
+%     \item[italic] Prints the \meta{level} title in \emph{italic}.
+%     \item[smallcaps] Prints the \meta{level} title 
 %      in \textsc{small caps}
 %   \end{valuelist}
-%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec},
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
 %   \opt{subsec}, \opt{subsubsec}.
 % \optitem[left]{<level>style}{\opt{left}, \opt{center}, 
 % \opt{right}, \opt{parleft}, \opt{parcenter}, 
 % \opt{parright}}
 %   \begin{valuelist}
-%     \item[left] Aligns the <level> title on the left.
-%     \item[center] Centers the <level> title. 
-%     \item[right] Aligns the <level> title on the right.
+%     \item[left] Aligns the \meta{level} title on the left.
+%     \item[center] Centers the \meta{level} title. 
+%     \item[right] Aligns the \meta{level} title on the right.
 %   \end{valuelist}
-%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}
 %   \opt{subsec}, \opt{subsubsec}.
 %   \begin{valuelist}
 %     \item[parleft] As \opt{left} but with the title below the number.
 %     \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}.
 %   \begin{valuelist}
 %     \item[elements] Print a chapter number in the style of the 
 %                     \emph{Elements of Typographic Style} by
 %                     Robert Bringhurst.
 %   \end{valuelist}
-%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}.
+%   Where \meta{level} can be \opt{chap}.
 % \optitem[Roman/arabic/arabic]{<level>numstyle}{\opt{arabic}, 
 % \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, 
 % \opt{dotRoman}}
 %   \begin{valuelist}
-%     \item[arabic] Arabic <level> number.
-%     \item[roman] Small caps lowercase roman <level> number.
-%     \item[Roman] Uppercase roman <level> number.
+%     \item[arabic] Arabic \meta{level} number.
+%     \item[roman] Small caps lowercase roman \meta{level} number.
+%     \item[Roman] Uppercase roman \meta{level} number.
 %     \item[dotarabic] As \opt{arabic} but followed by a dot.
 %     \item[dotroman] As \opt{roman} but followed by a dot.
 %     \item[dotRoman] As \opt{Roman} but followed by a dot.
 %   \end{valuelist}
-%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}.
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
 % \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, 
 % \opt{ragged}, \opt{leftpage}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
 %	\begin{valuelist}
 %		\item[standard] Prints a standard table of contents with
-%   page numbers on the right margin
+%   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:1996}.
 %		\item[leftpage] Prints a table of contents with page numbers 
 %     on the left margin.
 %	\end{valuelist}
+% \optitem[all]{twocolcontents}{\opt{toc}, \opt{lof}, 
+% \opt{lot}, \opt{toclof}, \opt{toclot}, \opt{loflot}, \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 
+%    and the list of figures in two columns.
+%		\item[toclot] Prints the table of contents 
+%    and the list of tables in two columns.
+%		\item[loflot] Prints the list of figures 
+%    and the list of tables in two columns.
+%		\item[all] Prints the table of contents, 
+%    the list of figures and the list of tables in two columns.
+%	\end{valuelist}
 % \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
-% This option is active only with \opt{<level>font=smallcaps} options.
+% This option is active only with \opt{\meta{level}font=smallcaps} options.
 %   \begin{valuelist}
-%     \item[low] Prints lowercase small capitals.
-%     \item[upper] Prints small capitals without changing the case.
+%     \item[low] Prints lowercase \textsc{small capitals}.
+%     \item[upper] Prints \textsc{Small Capitals} without changing the case.
 %   \end{valuelist}
 % \end{optionlist}
 %
@@ -599,7 +762,7 @@
 % \opt{elements}}
 %   \begin{valuelist}
 %     \item[inner] Prints the chapter title and the string ``Chapter~ 
-%     \emph{n}'' in the inner side 
+%     \meta{n}'' in the inner side 
 %      respectively of even and odd 
 %     headers, and the page number in the outer side.
 %     \item[center] Centers the header and footer and puts 
@@ -628,7 +791,7 @@
 %   \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Footnotes, lists, quotations}
+% \subsection{Notes, lists, quotations}
 %
 % \begin{optionlist}
 % \setlength{\labelwidth}{2.5cm}%
@@ -683,10 +846,14 @@
 % \item[indented]
 %  Prints standard indented lists.
 % \end{valuelist}
-% \optitem[standard]{captionstyle}{\opt{standard}, \opt{elements}}
+% \optitem[standard]{captionstyle}{\opt{standard}, \opt{sansserif}, \opt{italic}, \opt{smallcaps}, \opt{elements}}
+% All these values print the caption in small size, changing the shape:
 % \begin{valuelist}
-% \item[standard] Prints a standard caption in small size.
-% \item[elements] As the previous one but in sanserif font.
+% \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{small caps}.
+% \item[elements] An alias of \opt{sanserif}.
 % \end{valuelist}
 % \end{optionlist}
 %
@@ -695,15 +862,15 @@
 % The font options are available only with \LaTeX. Using \XeLaTeX{}
 % the default font is the Computer Modern but you can change it through 
 % the \sty{fontspec} or \sty{mathspec} packages. With this engine
-% I surely suggest the Junicode font family available in your 
-% \TeX{} Live installation.
+% I do suggest the Junicode font family.
 % 
 %\begin{optionlist}
 % \setlength{\labelwidth}{2.5cm}%
 % \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{standard}}
 %   \begin{valuelist}
 %     \item[palatino] Loads the Palatino font family.
-%     \item[standard] Loads the Latin Modern font family.
+%     \item[standard] Loads the {\fontfamily{lmr}\selectfont Latin Modern} font family 
+%                     and the standard CB Greek font.
 %   \end{valuelist}
 % \optitem[artemisia]{greekfont}{\opt{artemisia}, \opt{porson}, 
 % \opt{cbgreek}}
@@ -719,18 +886,19 @@
 %
 %\begin{optionlist}
 % \settowidth{\labelwidth}{marginpar}
-% \optitem[print]{version}{\opt{screen},\opt{draft}, \opt{final}}
+% \optitem[print]{version}{\opt{screen}, \opt{draft}, \opt{final}}
 % \begin{valuelist}
 % \item[screen] 
 % This option is provided to have a better view when you are 
 % typesetting and reading the \textsc{pdf} on the screen.
 % It simply executes the \opt{oneside} and \opt{nocrop=false} 
-% option and redefines the \cmd{crop} command so you do not need to comment it if it is used in the document.
+% optione and redefines the \cmd{crop} command so you do not need to comment it if it is used in the document.
 % \item[draft] 
 % Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{crop=true}.
 % \item[final] Prints the output on a A4 paper, hiding the crop marks.
 % \end{valuelist}
 %\boolitem[true]{crop}
+% This option is actually useless. Use the \opt{version} option instead.
 % \begin{valuelist}
 % \item[true] Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{version=draft}.
 % \item[false] Prints a \textsc{pdf} with page dimensions 
@@ -751,21 +919,23 @@
 % \end{valuelist}
 %\boolitem[false]{partpage}
 % \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
-% This option is active only with \opt{documentstructure=article}.
+% \redtriangle{} This option is active only with \opt{documentstructure=article}.
 % \begin{valuelist}
 % \item[true] Prints the part title in a separate page as in 
 % \opt{documentstructure=book}
-% \item[false] Prints the part title as in \opt{article} class.
+% \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}}
 %  \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.
+% If \opt{true} it prints the string ``Version of \meta{date}'' in the footer. It obviously requires the \cmd{date}\ar{\meta{date}} command.
 % \end{optionlist}
 %
 % \subsection{Pre-defined styles}
 %
-% You can get up to 120 variants combining these styles
-% with \opt{dottedchap} and \opt{romanchapnum} options.
+% These pre-defined styles are intended as shotrcuts to some groups of 
+% class options. Combining them
+% with \opt{dottedchap} and \opt{romanchapnum} options 
+% you can get up to 120 variants. 
 %
 % \begin{optionlist}
 % \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
@@ -775,64 +945,125 @@
 % 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) 
-% (see pages \begingroup\addtocounter{page}{1}
-% \pageref{predefined-styles}-\endgroup).
+% 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{small caps}  in styles 7-12.
-% There are three position for the title and two positions for the number as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% 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{small caps}. The  title of the section is in \emph{italic}  in styles 1-6 and in \textsc{small caps}  in styles 7-12.
-% There are three position for the title and two positions for the chapter as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
-% \item[elements] Reproduces the style of \textcite{Bringhurst:1996}
-% \item[sufelements] Loads \opt{headerstyle=smallcaps}, 
-% \opt{chapfont=smallcaps},\\ \opt{secfont=smallcaps}, 
-% \opt{subsecfont=italic} and \opt{chaptstyle=elements} options.
+% There are three position for the title and two positions for the chapter as above.
+% \item[elements] Reproduces the style of the Italian edition of \textcite{Bringhurst:1996}.
+% \item[sufelements] Combines the \opt{elements}-style sections with standard small caps headers. It can be used with all the page layouts.
 % \end{valuelist}
-% \end{optionlist}
-% 
-% \section{The FSPL styles\experimental}\label{sec:FSPL}
-% \textbf{These styles are experimental and may change in the next versions of the class}. They 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 University of Verona (Italy).
-% \begin{optionlist}
-% \optitem[FSPLa]{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
+%
+%The next 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).\footnote{\url{http://www.univr.it/main?ent=catdoc&id=3727&idDest=6&serv=127\#1431}.}
+%
 %   \begin{valuelist}
 %     \item[FSPLa] Equal to: 
 %   \opt{pagelayout=periodical},
 %    \opt{style=roman1},
-%    \opt{footnotestyle=superscript},
+%    \opt{footnotestyle=superscript},\\ 
 %    \opt{liststyle=indented}.
 %    \opt{tocstyle=ragged}.
 %     \item[FSPLb] Equal to:
 %    \opt{pagelayout=periodical},
 %    \opt{style=italic5},
 %    \opt{headerstyle=center},
-%    \opt{chapnumstyle=roman},
+%    \opt{chapnumstyle=roman},\\
 %    \opt{secstyle=center},
-%    \opt{quotestyle=right},
-%    \opt{footnotestyle=hung},
+%    \opt{quotestyle=right},\\
+%    \opt{footnotestyle=hung},\\
 %    \opt{liststyle=indented}.
 %    \opt{tocstyle=dotted}.
 %     \item[FSPLc] Equal to:
-%    \opt{pagelayout=periodical},
+%    \opt{pagelayout=periodical},\\
 %    \opt{style=smallcaps5},
-%    \opt{secfont=smallcaps},
+%    \opt{secfont=smallcaps},\\
 %    \opt{headerstyle=center},
-%    \opt{footnotestyle=dotted},
-%    \opt{liststyle=indented}.
+%    \opt{footnotestyle=dotted},\\
+%    \opt{liststyle=indented},
 %    \opt{tocstyle=leftpage}.
 %   \end{valuelist}
 % \end{optionlist}
-% \clearpage
-% \section{New commands}\label{sec:commands}
+%
+% \section{The \opt{collection} document structure}\label{sec:collection}
 % 
-% The class defines the following new commands.
+% The \opt{collection} document structure is thought to compose a collection of papers. Each paper has to be typeset in a separate \file{.tex} file with the following structure:
+%\begin{ttquote}
+%\cmd{author}\ar{Author}\\
+%\cmd{title}\ar{Title of the paper}\\\\
+% \% The abstract is optional.\\
+% \% \cmd{begin}\ar{abstract}\\
+% \%  The abstract\\
+% \% \cmd{end}\ar{abstract}\\\\
+%\cmd{maketitle}\\\\
+%Text of the paper
+%\end{ttquote}
+% 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{ttquote}
+%\cmd{documentclass}\oar{documentstructure=collection}\ar{suftesi}\\\\
+% \cmd{begin}\ar{document}\\\\
+% \cmd{includeart}\ar{article1}\\
+% \cmd{includeart}\ar{article2}\\
+% \cmd{includeart}\ar{article3}\\\\
+% \cmd{end}\ar{document}
+%\end{ttquote}
+%
+%
+% \subsection{Options}
+%
+% 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.
+%
+% \begin{optionlist}
+% \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \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[italic]{titlefont}{\opt{roman}, \opt{italic}, \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{small caps}.
+%   \end{valuelist}
+% \optitem[roman]{authorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+%   \begin{valuelist}
+%     \item[roman] Prints the author's name in roman.
+%     \item[italic] Prints the author's name in \emph{italic}.
+%     \item[smallcaps] Prints the \author's name 
+%      in \textsc{small caps}.
+%   \end{valuelist}
+% \end{optionlist}
+%
+% \subsection{Commands} 
+% \begin{ltxsyntax} 
+% \cmditem{includeart}{file name} 
+%
+% Include the \meta{file name} in the collection. 
+% \cmditem{frontispiece} 
+% 
+% Typeset the frontispiece of the collection. 
+%
+% \cmditem{collectiontitle}{The Title of the Collection} 
+%
+% Sets the title of the collection. 
+%
+% \cmditem{collectioneditor}{The Editor(s) of the collection} 
+%
+% Sets the editor(s) of the collection.
+%\end{ltxsyntax}
+%
+% \section{New commands}\label{sec:commands}
 % 
 % \begin{ltxsyntax}
 % 
 % \cmditem{title}[short title for headers]{complete title for titlepage}
 % \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command}
 % 
-% This command is for use with option \opt{authortitle} if the title is too long
+% Useful with \opt{authortitle} option if the title is too long
 % or has some breaks. 
 % 
 % 
@@ -866,11 +1097,12 @@
 % The second argument prints its content at the bottom. For example:
 %
 % \begin{ttquote}
-% \cmd{bookcolophon}\{Copyright © 2007 by Ivan Valbusa\}\{%\\
-% This work has been typeset with \cmd{LaTeX},  using the 
-% \cmd{sty}\{suftesi\} class\\ by Ivan Valbusa\cmd{index}\{Valbusa, 
-% Ivan\}. The normal font  is Palatino by \\
-% Hermann Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.\}
+% \cmd{bookcolophon}\{Copyright © 2007 by Ivan Valbusa\}\{\%\\
+% This work has been typeset with \cmd{LaTeX},  using the\\ 
+% \cmd{sty}\{suftesi\} class by Ivan Valbusa\cmd{index}\{Valbusa, 
+% Ivan\}.\\ 
+% The normal font  is Palatino by Hermann Zapf.\\
+% The sans serif font is Iwona by Janusz M.~Nowacki.\}
 % \end{ttquote}
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
@@ -880,7 +1112,7 @@
 % bottom of the page. Here is an example:
 %
 % \begin{ttquote}
-% \cmd{artcolophon}\{\\
+% \cmd{artcolophon}\{\%\\
 % This work is licensed under the Creative Commons \\
 % Attribution-NonCommercial-NoDerivs 3.0 Unported License. \\
 % To view a copy of this license, visit\\
@@ -889,10 +1121,11 @@
 % \cmd{texttt}{http://creativecommons.org/licenses/by-nc-nd/3.0/}\\
 % \cmd{end}\{center\}\\
 %
-% or send a letter to Creative Commons, 444 Castro Street, Suite 900,\\ 
-% Mountain View, California, 94041, USA.\cmd{}\cmd{}[1ex]\\
+% or send a letter to Creative Commons, 444 Castro Street,\\
+% Suite 900, Mountain View, California, 94041, USA.\cmd{}\cmd{}[1ex]\\
 %
-% Typeset with \cmd{LaTeX},  using the \cmd{sty}{suftesi} class by Ivan Valbusa.\}
+% Typeset with \cmd{LaTeX},  using the \cmd{sty}\{suftesi\} class\\
+% by Ivan Valbusa.\}
 % \end{ttquote}
 %
 % \cmditem{finalcolophon}{colophon content}
@@ -901,10 +1134,10 @@
 % top of the page. It is aimed at typesetting a classical \emph{colophon} 
 % at the end of the work.
 %
-% \cmditem{FSPLcolophon}~\experimental
+% \cmditem{FSPLcolophon}
 % \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
 %
-% To typeset the colophon in the FSPL style. See section \ref{sec:FSPL} for details.
+% To typeset the colophon in the FSPL style. See the previous section.
 %
 % \cmditem{chapterintro}
 %
@@ -930,28 +1163,23 @@
 % \cmditem{chapnumfont}{name}
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% Sets the font of the chapter number of \opt{style=elements} 
-% and  \opt{style=sufelements} styles. 
-% The default is ``\texttt{pplj}'' (\LaTeX) or ``Junicode''  (\XeLaTeX):
+% Sets the font of the chapter number of \opt{style=elements/sufelements} styles. 
+% The default is Palatino (\LaTeX) or Computer Modern  (\XeLaTeX). Using (pdf)\LaTeX{} you can change it simply giving the name of the font family. For example, to select the Helvetica family you will need:
 % \begin{ttquote}
-% \cmd{chapnumfont}\{pplj\}\\
-% \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Junicode\}\}
+% \cmd{chapnumfont}\{phv\}
 % \end{ttquote}
-% \cmditem{toclabelspace}{label-width}\new
+% With \XeLaTeX{} the \cmd{fontspec} command is required:
+% \begin{ttquote}
+% \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Helvetica\}\}
+% \end{ttquote}
+% \cmditem{toclabelwidth}{level}{dim}\new
 %  \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
 %
-% Sets the width of \cmd{thecontentslabel}. 
+% 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{ttquote}
+% \cmd{toclabelwidht}\ar{chap}\ar{1em}
+% \end{ttquote}
 %
-% ^^A The default values are:
-% ^^A \begin{ttquote}
-% ^^A \cmd{toclabelspace}\{part\}\{1em\}\\
-% ^^A \cmd{toclabelspace}\{chapter\}\{1em\}\\
-% ^^A \cmd{toclabelspace}\{section\}\{1.5em\}\\
-% ^^A \cmd{toclabelspace}\{subsection\}\{2em\}\\
-% ^^A \cmd{toclabelspace}\{subsubsection\}\{2.5em\}\\
-% ^^A \cmd{toclabelspace}\{paragraph\}\{3em\}\\
-% ^^A \cmd{toclabelspace}\{subparagraph\}\{3.5em\}
-% ^^A \end{ttquote}
 % \cmditem{xfootnote}{symbol}{footnote text}
 % \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
 %
@@ -959,20 +1187,18 @@
 % symbols given in the optional argument (default=*).  
 % It does not increment the footnote counter.
 % \begin{ttquote}
-% \cmd{xfootnote}[\textdollar\cmd{dagger}\textdollar]\{Footnote text.\}
-% ^^A \cmd{xfootnote}[\textdollar\cmd{dagger}\textdollar]\{Footnote text.\}\\
-% ^^A \cmd{xfootnote}[\cmd{textdagger}]\{Footnote text.\}
+% \cmd{xfootnote}\oar{\textdollar\cmd{dagger}\textdollar}\ar{Footnote text.}\\
+% \cmd{xfootnote}\oar{\cmd{textdagger}}\ar{Footnote text.}
 % \end{ttquote}
 % \end{ltxsyntax}
-%
-%
+% 
 % \clearpage
-%
 % \section*{Obsolete options}
-%
 % \begin{multicols}{2}
-% \small
-% \begin{ltxsyntax}
+% \begin{ltxsyntax}\scriptsize
+% \setlength{\parskip}{.5ex}
+% \setlength{\itemindent}{1.5cm}
+% \setlength{\labelwidth}{2.5cm}%
 % \optitem{defaultparindent}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{defaultparindent}} 
 % $\rightarrow$ \opt{parindent=compact}
@@ -1092,16 +1318,16 @@
 % $\rightarrow$ \opt{crop=false}
 % \optitem{rmstyle(1-6)} 
 %  \changes{v0.9a}{2012/08/31}{New option \opt{rmstyle(1-6)}} 
-% An old name for \opt{style=roman(1-6)}
+% $\rightarrow$ \opt{style=roman(1-6)}
 % \optitem{itstyle(1-12)}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{itstyle(1-12)}} 
-% An old name for \opt{style=italic(1-6)}
+% $\rightarrow$ \opt{style=italic(1-6)}
 % \optitem{scstyle(1-12)}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{scstyle(1-12)}}
-% An old name for \opt{style=smallcaps(1-6)}
+% $\rightarrow$ \opt{style=smallcaps(1-6)}
 % \optitem{sufelements} 
 % \changes{v0.5}{2011/10/21}{New option \opt{sufelements}}
-% An old name for \opt{style=sufelements}
+% $\rightarrow$ \opt{style=sufelements}
 % \optitem{standardfootnote} 
 % \changes{v0.9a}{2012/08/31}{New option \opt{standardfootnote}}
 % $\rightarrow$ \opt{footnotes=superscript}
@@ -1111,25 +1337,29 @@
 % \end{ltxsyntax}
 % \end{multicols}
 %
-% \specialsection{Pre-defined styles}
 %
-% \label{predefined-styles}
-% \includepdf[pages=1-]{collect-examples}
 % \defbibnote{note}{\sffamily This bibliography has been typeset with 
-% the \sty{biblatex-philosophy} styles, created by the same author of this class.}
+% the \sty{biblatex-philosophy} package, created by the same author of this class.}
 % \addcontentsline{toc}{section}{\refname}
 % \printbibliography[prenote=note]
 %
+% ^^A \appendixpage{Predefined styles}\label{predefined-styles}
+% ^^A\includepdf[pages=1-]{collect-examples}
+%
 % \StopEventually{\PrintChanges\PrintIndex}
-% \newgeometry{margin=1.5cm,left=4.7cm,top=1cm}
+% \newgeometry{left=3.3cm,marginparwidth=3.3cm}
 % \section{The Code}
 %<*class>
 %    \begin{macrocode}
 \ClassWarningNoLine{suftesi}{%
-  DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak 
-  WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak 
-  THE LAYOUT OF THE DOCUMENT.\MessageBreak 
-  SEE DOCUMENTATION FOR DETAILS}{}%
+  ******************************************\MessageBreak
+  * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak 
+  * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak 
+  * THE LAYOUT OF THE DOCUMENT.\MessageBreak 
+  * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
+  * ANYWAY, DON'T WORRY!\MessageBreak
+  * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
+  ******************************************}{}%
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@standardfont 
 \newif\ifsuftesi@porson 
@@ -1144,7 +1374,6 @@
 \newif\ifsuftesi@nocrop
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\newif\ifsuftesi@pagelefttoc
 \newif\ifsuftesi@numparpart
 \newif\ifsuftesi@numparchap
 \newif\ifsuftesi@numparsec
@@ -1163,6 +1392,12 @@
 \newif\ifsuftesi@FSPL
 \newif\ifsuftesi@periodicalaureo
 \newif\ifsuftesi@screen
+\newif\ifsuftesi@pagelefttoc
+\newif\ifsuftesi@twocolumntoc
+\newif\ifsuftesi@twocolumnlof
+\newif\ifsuftesi@twocolumnlot
+\newif\ifsuftesi@reverseauthortitle
+\newif\ifsuftesi@collection
 \DeclareOption{a5paper}{%
   \ClassError{suftesi}{Option 'a5paper' not available}}
 \DeclareOption{b5paper}{%
@@ -1184,18 +1419,22 @@
 % \subsection{Document srtucture}
 %    \begin{macrocode}
 \define@choicekey{}{documentstructure}[\val\nr]
-    {book,article}[book]{%
+    {book,article,collection}[book]{%
 \ifcase\nr\relax
+\disable@keys{}{secnumstyle}
 \or
 \suftesi@articletrue
 \@titlepagefalse
+\or
+\suftesi@collectiontrue
+  \setkeys{}{headerstyle=authortitleinner}
 \fi}
 %    \end{macrocode}
 % \subsection{Page layout}
 %    \begin{macrocode}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,periodical,compact,supercompact,elements,
+    {standard,periodical,compact,supercompact,supercompactaureo,elements,
     periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -1248,6 +1487,18 @@
     marginparwidth= 18mm,
     marginparsep=   8pt}
 \or
+\suftesi@supercompacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+  heightrounded,
+	  includeheadfoot=false,
+    textheight=     175mm,
+    textwidth=      108mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    1:1,
+    marginparwidth= 11mm,
+    marginparsep=   7pt}\or
 \suftesi@elementspagelayouttrue
   \geometry{%
   heightrounded,
@@ -1277,11 +1528,6 @@
 \fi}
 %    \end{macrocode}
 % \subsection{Sections style}
-% \DescribeMacro{\SUF@lr@PARTSwitch} 
-% \DescribeMacro{\SUF@lr@CHAPSwitch} 
-% \DescribeMacro{\SUF@lr@SECSwitch} 
-% \DescribeMacro{\SUF@lr@SUBSECSwitch} 
-% \DescribeMacro{\SUF@lr@SUBSUBSECSwitch} 
 % These macros control the position of titles and numbers of parts, 
 % chapters, sections, subsections and subsubsection.
 %    \begin{macrocode}
@@ -1361,7 +1607,6 @@
 % \subsection{Sections font}
 % These macros control the style of part, chapter, section,
 % subsection and subsubsection levels.
-% \DescribeMacro{\SUF@<level>@StyleSwitch}
 %    \begin{macrocode}
 \define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1404,7 +1649,7 @@
 \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \subsection{The number style for part, chapter and section}
+% \subsection{Section numbers}
 % \subsubsection{Part number style}
 %    \begin{macrocode}
 \define@choicekey{}{partnumstyle}[\val\nr]
@@ -1412,73 +1657,91 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Chapter number style}
+% \subsubsection{Chapter number}
 %    \begin{macrocode}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
 dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Section number style}
+% \subsubsection{Section number}
 %    \begin{macrocode}
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thesection{\arabic{section}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thesection{\Roman{section}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thesection{\arabic{section}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
 % This option controls the style of small capitals used in the 
-% title of chapters and sections using \opt{<level>font=smallcaps} option:
+% title of chapters and sections using \opt{\meta{level}font=smallcaps} option:
 %    \begin{macrocode}
 \define@choicekey{}{smallcapsstyle}[\val\nr]
     {low,upper}[low]{%
@@ -1617,12 +1880,20 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \RequirePackage{caption}
 \define@choicekey{}{captionstyle}[\val\nr]
-    {standard,elements}[standard]{%
+    {standard,sanserif,italic,smallcaps,elements}[standard]{%
 \ifcase\nr\relax
    \captionsetup{labelsep=period,font=small}
 \or
    \captionsetup{labelsep=period,font=small}
    \captionsetup{font+=sf}
+\or
+   \captionsetup{labelsep=period,font=small}
+   \captionsetup{font+=it}
+\or
+   \captionsetup{labelsep=period,font=small,labelfont=sc}
+\or
+   \captionsetup{labelsep=period,font=small}
+   \captionsetup{font+=sf}
 \fi
 }
 %    \end{macrocode}
@@ -1636,8 +1907,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 %    \end{macrocode}
 % \subsubsection{Table of contents}
-% \DescribeMacro{\SUF@titlerule}
-% \DescribeMacro{\SUF@chaptitlerule}
 %    \begin{macrocode}
 \define@choicekey{}{tocstyle}[\val\nr]{%
     standard,dotted,ragged,leftpage}[standard]{%
@@ -1655,6 +1924,36 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
 \suftesi@pagelefttoctrue
 \fi}
+\define@choicekey{}{twocolcontents}[\val\nr]{%
+    toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\ifcase\nr\relax
+  \suftesi@twocolumntoctrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\fi
+}
 %    \end{macrocode}
 % \subsection{Fonts}
 % \subsubsection{Roman fonts}
@@ -1681,7 +1980,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 %    \end{macrocode}
 % \subsection{Other options}
-% \subsubsection{\cmd{parindent} selection}
+% \subsubsection{\cmd{parindent}}
 %    \begin{macrocode}
 \define@choicekey{}{parindent}[\val\nr]
     {compact,wide}[compact]{%
@@ -1770,56 +2069,140 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \end{macrocode}
 % The 'italic' styles:
 %    \begin{macrocode}
-  \setkeys{}{chapstyle=left,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=center,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=right,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=italic,
+  secfont=smallcaps,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=italic,
+  secfont=smallcaps,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=right,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+   chapstyle=parleft,
+   chapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=parcenter,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=parright,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
 %    \end{macrocode}
 % The 'smallcaps' styles:
 %    \begin{macrocode}
-  \setkeys{}{chapstyle=left,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=center,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=right,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
 %    \end{macrocode}
 % The 'elements' style:
@@ -1908,6 +2291,39 @@ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
 quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \fi}
+% EXPERIMENTAL
+\define@choicekey{}{papertitlestyle}[\val\nr]{%
+    left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@coll@titleSwitch{\filright}
+\or
+  \def\SUF@lr@coll@titleSwitch{\filcenter}
+\or
+  \def\SUF@lr@coll@titleSwitch{\filleft}
+\fi}
+\define@choicekey{}{revauthortitle}[\val\nr]
+    {true,false}[false]{%
+\ifcase\nr\relax
+\suftesi@reverseauthortitletrue
+\or\relax
+\fi}
+\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@titlefont@Switch{\relax}
+\or
+\def\SUF@titlefont@Switch{\itshape}
+\or
+\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
+
+\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@authorfont@Switch{\relax}
+\or
+\def\SUF@authorfont@Switch{\itshape}
+\or
+\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
 %    \end{macrocode}
 % Execute and process options:
 %    \begin{macrocode}
@@ -1937,7 +2353,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   secnumstyle=arabic,
   partnumstyle=Roman,
   chapnumstyle=arabic,
-  smallcapsstyle=low}
+  smallcapsstyle=low,
+  titlefont=italic,
+  authorfont=roman,
+  revauthortitle=false,
+  papertitlestyle=left,
+  authorfont=roman,
+  titlefont=italic}
 \ProcessOptionsX<>\relax
 %    \end{macrocode}
 % The use of the \cmd{XKV@useoption} command, provided by 
@@ -1992,8 +2414,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % Thanks to Claudio Beccari and Enrico Gregorio for these macros:
 %    \begin{macrocode}
 \ifxetex
-  \relax
-    \else
+\AtBeginDocument{
+\@ifpackageloaded{fontspec}
+  {\relax}
+  {\ClassError{suftesi}
+    {***********************************\MessageBreak
+    * For using suftesi with XeLaTeX\MessageBreak
+    * load either 'fontspec' or 'mathspec'\MessageBreak
+    ************************************}
+    {***********************************\MessageBreak
+    * For using suftesi with XeLaTeX\MessageBreak
+    * load either 'fontspec' or 'mathspec'\MessageBreak
+    ************************************}}
+  }
+\else
 \RequirePackage[LGR,T1]{fontenc}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
 \ifsuftesi@standardfont
@@ -2057,11 +2491,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-%    \end{macrocode}
-% \DescribeMacro{\SUF@titlesmallcaps} 
-% \DescribeMacro{\SUF@headingsmallcaps} 
-% \DescribeMacro{\SUF@chapnumfont} 
-%    \begin{macrocode}
 \ifxetex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
@@ -2069,7 +2498,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
-      \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
+      \chapnumfont{\relax}%
 \else
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
@@ -2514,7 +2943,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \@author
       \end{tabular}\par}%
       \vskip 1.5em%
-    {\large \@date \par}%       % Set date in \large size.
+    {\large \@date \par}%       
   \end{center}\par
   \@thanks
   \vfil\null
@@ -2603,7 +3032,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@   
       \@standardmaketitle
     \fi
     \thispagestyle{plain}\@thanks
@@ -2636,6 +3065,188 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \vskip 1.5em}
 \fi
 %    \end{macrocode}
+% \subsection{The \opt{collection} document structure}
+%    \begin{macrocode}
+\ifsuftesi@collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+  \def\@journalname{\@latex@warning@no@line{%
+    No \noexpand\journalname given}}
+\def\issn#1{\gdef\@issn{#1}}
+  \def\@issn{\@latex@warning@no@line{%
+    No \noexpand\issn given}}
+\def\doi#1{\gdef\@doi{#1}}
+  \def\@doi{\@latex@warning@no@line{%
+    No \noexpand\doi given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+  \def\@journalvolume{\@latex@warning@no@line{%
+    No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+  \def\@journalnumber{\@latex@warning@no@line{%
+    No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+  \def\@issue{\@latex@warning@no@line{%
+    No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+  \def\@journalyear{\@latex@warning@no@line{%
+    No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+  \def\@journalwebsite{\@latex@warning@no@line{%
+    No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected@xdef\@thanks{%
+  \@thanks\protect\footnotetext[\the\c@footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+  \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+  \def\@collectiontitle{\@latex@warning@no@line{%
+    No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+  \def\@collectioneditor{\@latex@warning@no@line{%
+    No \noexpand\collectioneditor given}}
+%    \end{macrocode}
+% \DescribeMacro{\l@title} 
+%    \begin{macrocode}
+\newcommand*\l@title[2]{%
+  \ifnum \c@tocdepth >\m@ne
+    \addpenalty{-\@highpenalty}%
+    \vskip 1.0ex \@plus\p@
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \advance\leftskip1em
+      \hskip -\leftskip
+      #1\nobreak%
+    \ifsuftesi@dottedtoc\dotfill%
+      \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+        \else
+          \ifsuftesi@raggedtoc%
+            \nobreak\hskip1em #2 \hfill\null\par
+              \else
+                \ifsuftesi@pagelefttoc
+              \ClassError{suftesi}
+                {\MessageBreak
+                You can not use tocstyle=leftpage\MessageBreak
+                  with documentstructure=collection}
+                {You can not use tocstyle=leftpage\MessageBreak
+                  with documentstructure=collection}
+            \else
+          \nobreak\hfill #2\par
+        \fi
+      \fi
+    \fi
+      \penalty\@highpenalty
+    \endgroup
+  \fi}
+%    \end{macrocode}
+% \DescribeMacro{\maketitle}
+% \DescribeMacro{\@maketitle}
+%    \begin{macrocode}
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\@thanks\@empty
+      \let\thanks\@gobble}
+\def\@maketitle{%
+ \cleardoublepage
+  \SUF@chaptersize
+   \SUF@lr@coll@titleSwitch
+    \let\footnote\thanks
+     \parindent=0pt
+    \refstepcounter{title}%
+    {\ifsuftesi@reverseauthortitle
+      \SUF@titlefont@Switch{\@title}%
+        \else\SUF@authorfont@Switch{\@author}\fi}%
+     \label{begin:\thetitle}%
+    \begingroup
+    \let\thanks\@gobble
+    \addcontentsline{toc}{title}{\normalfont{\@author}\newline%
+      \itshape\@headtitle}
+    \endgroup
+    \vspace{2ex}\par
+    {\ifsuftesi@reverseauthortitle
+      \SUF@authorfont@Switch{\@author}%
+        \else
+      \SUF@titlefont@Switch{\@title}%
+    \fi\\}
+    \vskip2.5cm}
+%    \end{macrocode}
+% \DescribeMacro{\includeart} The command to include a paper in the collection.
+%    \begin{macrocode}
+\newcommand{\includeart}[1]{%
+  \begingroup
+  \setcounter{section}{0}
+    \input{#1}\label{end:\thetitle}
+     \clearpage
+   \global\let\@thanks\@empty
+ \endgroup}
+%    \end{macrocode}
+% \DescribeMacro{\frontispiece} The command to typeset 
+% the frontispiece of the collection.
+%    \begin{macrocode}
+\newcommand{\frontispiece}{%
+  \thispagestyle{empty}%
+    \begingroup
+     \centering
+       \null\vspace{\stretch{1}}
+     
+       {\SUF@chaptersize\@collectiontitle\par}
+         \vskip5ex
+     
+       \@collectioneditor
+       \vspace{\stretch{2}}
+       
+     \@date
+     
+  \endgroup
+  \clearpage}
+%    \end{macrocode}
+% In the collection document structure the articles are treated as
+% chapters but you would not need to print in
+% the table of contents all the sections of every article. So first of all we include in the table of contents only the author and the title of each paper:
+%    \begin{macrocode}
+  \setcounter{tocdepth}{0}
+%    \end{macrocode}
+% Anyway the sections inside each paper are numbered 
+% as in standard articles:
+%    \begin{macrocode}
+  \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}
+  \else
+\fi
+%    \end{macrocode}
 % \subsection{Frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
@@ -2658,13 +3269,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 {\@ifpackageloaded{frontespizio}
      {\ifsuftesi@periodical
           \Margini {1cm}{7cm}{5cm}{1cm}
+          \Rientro{1cm}
         \else
       \ifsuftesi@compact
           \Margini {1cm}{7cm}{6cm}{1cm}
+          \Rientro{1cm}
         \else
           \ifsuftesi@supercompact
           \Margini {1cm}{10cm}{8cm}{1cm}
+          \Rientro{1cm}
         \else
+          \ifsuftesi@periodicalaureo
+          \Margini {1cm}{7cm}{5cm}{1cm}
+          \Rientro{1cm}
+        \fi
      \fi
   \fi
 \fi}
@@ -2724,7 +3342,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \titlecontents{part}                                                  
    [0em]                                                                    
   {\addvspace{3ex}\partname~}                                                 
-  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}                                                    
+  {\makebox[\SUF@label@part][l]{%
+    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}                                                    
   {}                                                                      
   {}
   [\addvspace{1ex}]
@@ -2740,7 +3359,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \gdef\thechapter{\@Alph\c@chapter}
     \titleformat{\chapter}[block]
       {\vskip-22pt}%
-      {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+      {\small%
+      \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
       {0pt}
       {\small\SUF@titlesmallcaps}
       [\rule{\textwidth}{.4pt}]
@@ -2971,6 +3591,19 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsubsection{Abstract}
 % This is the macro that defines the \env{abstract} environment in \sty{article} class. In \sty{suftesi} it simply prints the abstract name in roman font:
 %    \begin{macrocode}
+\ifsuftesi@collection
+  \newenvironment{abstract}{%
+      \if@twocolumn
+        \section*{\abstractname}%
+      \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if@twocolumn\else\endquotation\fi}
+\else
 \if@titlepage
   \newenvironment{abstract}{%
       \titlepage
@@ -2994,6 +3627,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi}
       {\if@twocolumn\else\endquotation\fi}
 \fi
+\fi
 \newcommand\abstractname{Abstract}
 %    \end{macrocode}
 % \subsubsection{Colophon} 
@@ -3048,7 +3682,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \end{center}
     \vspace*{\stretch{6}}}
 %    \end{macrocode}
-% \DescribeMacro{\FSPLcolophon} \experimental
+% \DescribeMacro{\FSPLcolophon}
 % This command is defined only for the \opt{style=FSPL*} options.
 %    \begin{macrocode}
 \ifsuftesi@FSPL
@@ -3059,8 +3693,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \noindent \hskip-.5em\cc #1 \@author%
 \vskip1ex
 
-\small\noindent This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
-To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+\small\noindent This work is licensed under the Creative Commons 
+Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
+To view a copy of this license, 
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 
 \endgroup
 
@@ -3069,7 +3705,11 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 
 \null\vspace{\stretch{1}}
 
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janusz M. Nowacki.
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
+\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, 
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by 
+Janusz M. Nowacki.
 
 \endgroup
 
@@ -3083,23 +3723,33 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
      only for the FSPL styles}}
 \fi
 %    \end{macrocode}
-% \subsection{TOC, LOF, LOT}
+% \subsection{Toc, lof, lot}
 %    \begin{macrocode}
 \RequirePackage{titletoc}
 %    \end{macrocode}
-% \DescribeMacro{\SUF@label@chapter}
-% All the lengths depend on |\SUF@label@chapter| 
+% All the lengths depend on |\SUF@label@chap| 
 % so we define this first.
 %    \begin{macrocode}
-\newlength\SUF@label@chapter
-\setlength\SUF@label@chapter{.5em}
+\newlength\SUF@label@chap
+\setlength\SUF@label@chap{.5em}
 %    \end{macrocode}
-% \DescribeMacro{\toclabelspace}
-% |\toclabelspace| is provided to
-% adjust the label width i the table of contents:
+% \DescribeMacro{\toclabelwidth}
+% |\toclabelwidth| is provided to
+% adjust the label width in the table of contents:
 %    \begin{macrocode}
-\newcommand*{\toclabelspace}[1]{\setlength\SUF@label@chapter{#1}} 
-\let\toclabelwidth\toclabelspace
+\newcommand*{\toclabelwidth}[2]{%
+  \addtolength{\csname SUF@label@#1\endcsname}{#2}%
+  \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}%
+\newcommand{\toclabelspace}{%
+  \ClassError{suftesi}
+    {\MessageBreak
+    \noexpand\toclabelspace is not more defined\MessageBreak
+    Use \noexpand\toclabelwidth instead.\MessageBreak
+    See package documentation for details}
+    {\MessageBreak
+    \noexpand\toclabelspace is not more defined\MessageBreak
+    Use \noexpand\toclabelwidth instead.\MessageBreak
+    See package documentation for details}}
 %    \end{macrocode}
 % \DescribeMacro{\SUF@tochang}
 % This macro controls the space between page number and chapter
@@ -3109,29 +3759,29 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \setlength{\SUF@tochang}{3em}
 \AtBeginDocument{
 \newlength\SUF@label@part
-\newlength\SUF@label@section
-\newlength\SUF@label@subsection
-\newlength\SUF@label@subsubsection
-\newlength\SUF@label@paragraph
-\newlength\SUF@label@subparagraph
-\newlength\SUF@label@figure
-\newlength\SUF@label@table
+\newlength\SUF@label@sec
+\newlength\SUF@label@subsec
+\newlength\SUF@label@subsubsec
+\newlength\SUF@label@par
+\newlength\SUF@label@subpar
+\newlength\SUF@label@fig
+\newlength\SUF@label@tab
 \setlength\SUF@label@part         
-    {\SUF@label@chapter}
-\setlength\SUF@label@section      
-    {\dimexpr(\SUF@label@chapter+.5em)}
-\setlength\SUF@label@subsection   
-    {\dimexpr(\SUF@label@section+.5em)}
-\setlength\SUF@label@subsubsection
-    {\dimexpr(\SUF@label@subsection+.5em)}
-\setlength\SUF@label@paragraph    
-    {\dimexpr(\SUF@label@subsubsection+.5em)}
-\setlength\SUF@label@subparagraph 
-    {\dimexpr(\SUF@label@paragraph+.5em)}
-\setlength\SUF@label@figure       
-    {\SUF@label@section}
-\setlength\SUF@label@table        
-    {\SUF@label@section}
+    {\SUF@label@chap}
+\setlength\SUF@label@sec      
+    {\dimexpr(\SUF@label@chap+.5em)}
+\setlength\SUF@label@subsec   
+    {\dimexpr(\SUF@label@sec+.5em)}
+\setlength\SUF@label@subsubsec
+    {\dimexpr(\SUF@label@subsec+.5em)}
+\setlength\SUF@label@par    
+    {\dimexpr(\SUF@label@subsubsec+.5em)}
+\setlength\SUF@label@subpar 
+    {\dimexpr(\SUF@label@par+.5em)}
+\setlength\SUF@label@fig       
+    {\SUF@label@sec}
+\setlength\SUF@label@tab        
+    {\SUF@label@sec}
 }
 %    \end{macrocode}
 % Part in article mode
@@ -3139,12 +3789,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \titlecontents{part}
   [0em]
   {\addvspace{3ex}\partname\hspace*{.5em}}
-  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+  {\makebox[\SUF@label@part][l]{%
+    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
 %    \end{macrocode}
-% \subsubsection{The \opt{tocpageleft} table of contents}
+% \subsubsection{'\opt{tocpageleft}' toc}
 %    \begin{macrocode}
 \ifsuftesi@pagelefttoc
 %    \end{macrocode}
@@ -3152,10 +3803,6 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 % First we reset the right margin to zero:
 %    \begin{macrocode}
 \contentsmargin{0pt}
-%    \end{macrocode}
-% \DescribeMacro{\SUF@tochang@\meta{level}}
-% \DescribeMacro{\SUF@addto@tochang@\meta{level}}
-%    \begin{macrocode}
 \AtBeginDocument{
 \newlength\SUF@tochang@chap
 \newlength\SUF@tochang@sec
@@ -3174,17 +3821,17 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \newlength\SUF@addto@tochang@fig
 \newlength\SUF@addto@tochang@tab
 \setlength\SUF@tochang@chap     
-    {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+    {\dimexpr(1em+\SUF@tochang+\SUF@label@chap+1em)}
 \setlength\SUF@tochang@sec      
-    {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+    {\dimexpr(\SUF@tochang@chap+\SUF@label@sec+1em)}
 \setlength\SUF@tochang@subsec   
-    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsec+1em)}
 \setlength\SUF@tochang@subsubsec
-    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsec+1em)}
 \setlength\SUF@tochang@par   
-    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@par+1em)}
 \setlength\SUF@tochang@subpar   
-    {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+    {\dimexpr(\SUF@tochang@par+\SUF@label@subpar+1em)}
 \setlength\SUF@tochang@fig       
     {\SUF@tochang@chap}
 \setlength\SUF@tochang@tab       
@@ -3192,19 +3839,19 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \setlength\SUF@addto@tochang@chap      
     {\SUF@tochang}
 \setlength\SUF@addto@tochang@sec       
-    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@sec+.5em)}
 \setlength\SUF@addto@tochang@subsec    
-    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsec+.5em)}
 \setlength\SUF@addto@tochang@subsubsec 
-    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsec+.5em)}
 \setlength\SUF@addto@tochang@par       
-    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@par+.5em)}
 \setlength\SUF@addto@tochang@subpar       
-    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subpar+.5em)}
 \setlength\SUF@addto@tochang@fig       
-    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
 \setlength\SUF@addto@tochang@tab       
-    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
 }
 %    \end{macrocode}
 % \paragraph{TOC entries}
@@ -3215,8 +3862,8 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {\hskip-\SUF@tochang@chap%
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF@addto@tochang@chap%
-      \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
-        \hspace*{1em}}
+      \makebox[\SUF@label@chap][l]{%
+        \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
        \hskip\SUF@addto@tochang@chap}
@@ -3227,57 +3874,54 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@sec][l]{%
+    \ifsuftesi@article\SUF@toclabelnum%
+     \else\fi\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@sec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec}
   {}
 \titlecontents{subsection}
   [\SUF@tochang@subsec]
   {}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subsec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec}
   {}
 \titlecontents{subsubsection}
   [\SUF@tochang@subsubsec]
   {}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subsubsec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec}
   {}
 \titlecontents{paragraph}
   [\SUF@tochang@par]
   {}
   {\hskip-\SUF@tochang@par%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@par%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par}
   {}
 \titlecontents{subparagraph}
   [\SUF@tochang@subpar]
   {}
   {\hskip-\SUF@tochang@subpar%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subpar%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar}
   {}
 \titlecontents{figure}
   [\SUF@tochang@fig]
   {}
   {\hskip-\SUF@tochang@fig%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
-     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \titlecontents{table}
@@ -3285,12 +3929,12 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {}
   {\hskip-\SUF@tochang@tab%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
-     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \else
 %    \end{macrocode}
-% \subsubsection{The default table of contents}
+% \subsubsection{Default toc}
 %    \begin{macrocode}
 \AtBeginDocument{
 \newlength\SUF@tocindent@chap
@@ -3301,22 +3945,35 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \newlength\SUF@tocindent@subpar
 \newlength\SUF@tocindent@fig
 \newlength\SUF@tocindent@tab
+\ifsuftesi@article
+\setlength\SUF@tocindent@sec
+    {\dimexpr(\SUF@label@chap+1.5em)}
+\setlength\SUF@tocindent@subsec
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
+\setlength\SUF@tocindent@subsubsec
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
+\setlength\SUF@tocindent@par
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
+\setlength\SUF@tocindent@subpar
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\else
 \setlength\SUF@tocindent@chap
-    {\dimexpr(\SUF@label@chapter+1em)}
+    {\dimexpr(\SUF@label@chap+1em)}
 \setlength\SUF@tocindent@sec
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec+1em)}
 \setlength\SUF@tocindent@subsec
-    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
 \setlength\SUF@tocindent@subsubsec
-    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
 \setlength\SUF@tocindent@par
-    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
 \setlength\SUF@tocindent@subpar
-    {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\fi
 \setlength\SUF@tocindent@fig
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
 \setlength\SUF@tocindent@tab
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
 }
 %    \end{macrocode}
 % \paragraph{TOC entries}
@@ -3325,7 +3982,7 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   [\SUF@tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF@tocindent@chap%
-    \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
+    \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
     \hspace*{1em}}
   {\hskip-\SUF@tocindent@chap}
   {\SUF@chaptitlerule\contentspage}
@@ -3333,56 +3990,53 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \titlecontents{section}
   [\SUF@tocindent@sec]
   {}
-  {\hskip-\dimexpr(\SUF@label@section+1em)%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@section+1em)%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \makebox[\SUF@label@sec][l]{%
+    \ifsuftesi@article\SUF@toclabelnum%
+      \else\fi\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)}
   {\ifsuftesi@article\SUF@chaptitlerule%
        \else\SUF@titlerule\fi\contentspage}
 \titlecontents{subsection}
   [\SUF@tocindent@subsec]
   {}
-  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsec+1em)%
+    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsec+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{subsubsection}
   [\SUF@tocindent@subsubsec]
   {}
-  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
+    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsec+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{paragraph}
   [\SUF@tocindent@par]
   {}
-  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@par+1em)%
+    \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@par+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{subparagraph}
   [\SUF@tocindent@subpar]
   {}
-  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subpar+1em)%
+    \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subpar+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{figure}
   [\SUF@tocindent@fig]
   {}
   {\hskip-\SUF@tocindent@fig%
-    \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@fig][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \titlecontents{table}
   [\SUF@tocindent@tab]
   {}
   {\hskip-\SUF@tocindent@tab%
-    \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \fi
@@ -3399,7 +4053,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 	    \section*{\contentsname}%
 	      \@mkboth{\contentsname}{\contentsname}%
         \thispagestyle{empty}
-	    \@starttoc{toc}%
+        \ifsuftesi@twocolumntoc
+          \begin{multicols}{2}
+	          \@starttoc{toc}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{toc}%
+	      \fi
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
@@ -3407,7 +4067,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
     \section*{\listfigurename}%
        \@mkboth{\listfigurename}{\listfigurename}%
      \thispagestyle{empty}
-    \@starttoc{lof}%
+        \ifsuftesi@twocolumnlof
+          \begin{multicols}{2}
+	          \@starttoc{lof}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{lof}%
+	      \fi
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
@@ -3415,7 +4081,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
     \section*{\listtablename}%
         \@mkboth{\listtablename}{\listtablename}%
       \thispagestyle{empty}
-    \@starttoc{lot}%
+        \ifsuftesi@twocolumnlot
+          \begin{multicols}{2}
+	          \@starttoc{lot}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{lot}%
+	      \fi
     \vspace{2ex}%
     }
 \else
@@ -3433,7 +4105,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
             \contentsname}
            {\contentsname}%
       \thispagestyle{empty}
-    \@starttoc{toc}%
+        \ifsuftesi@twocolumntoc
+          \begin{multicols}{2}
+	          \@starttoc{toc}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{toc}%
+	      \fi
     \if@restonecol\twocolumn\fi
    }
 \renewcommand\listoffigures{%
@@ -3446,7 +4124,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
       \@mkboth{\listfigurename}%
               {\listfigurename}%
      \thispagestyle{empty}
-    \@starttoc{lof}%
+        \ifsuftesi@twocolumnlof
+          \begin{multicols}{2}
+	          \@starttoc{lof}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{lof}%
+	      \fi
     \if@restonecol\twocolumn\fi
     }
 \renewcommand\listoftables{%
@@ -3460,7 +4144,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
           \listtablename}%
          {\listtablename}%
      \thispagestyle{empty}
-    \@starttoc{lot}%
+        \ifsuftesi@twocolumnlot
+          \begin{multicols}{2}
+	          \@starttoc{lot}%
+	        \end{multicols}
+	      \else
+	         \@starttoc{lot}%
+	      \fi
     \if@restonecol\twocolumn\fi
     }
 \fi
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index ec8284efa0b..25d6acb05f2 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,13 +19,19 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2013/07/18 v1.8 A class for typesetting theses, books and articles]
+    [2013/09/21 v1.9 A class for typesetting theses, books and articles]
+
+
 
 \ClassWarningNoLine{suftesi}{%
-  DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
-  WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
-  THE LAYOUT OF THE DOCUMENT.\MessageBreak
-  SEE DOCUMENTATION FOR DETAILS}{}%
+  ******************************************\MessageBreak
+  * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
+  * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
+  * THE LAYOUT OF THE DOCUMENT.\MessageBreak
+  * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
+  * ANYWAY, DON'T WORRY!\MessageBreak
+  * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
+  ******************************************}{}%
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@standardfont
 \newif\ifsuftesi@porson
@@ -40,7 +46,6 @@
 \newif\ifsuftesi@nocrop
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\newif\ifsuftesi@pagelefttoc
 \newif\ifsuftesi@numparpart
 \newif\ifsuftesi@numparchap
 \newif\ifsuftesi@numparsec
@@ -59,6 +64,12 @@
 \newif\ifsuftesi@FSPL
 \newif\ifsuftesi@periodicalaureo
 \newif\ifsuftesi@screen
+\newif\ifsuftesi@pagelefttoc
+\newif\ifsuftesi@twocolumntoc
+\newif\ifsuftesi@twocolumnlof
+\newif\ifsuftesi@twocolumnlot
+\newif\ifsuftesi@reverseauthortitle
+\newif\ifsuftesi@collection
 \DeclareOption{a5paper}{%
   \ClassError{suftesi}{Option 'a5paper' not available}}
 \DeclareOption{b5paper}{%
@@ -74,15 +85,19 @@
 \relax
 \LoadClass{book}
 \define@choicekey{}{documentstructure}[\val\nr]
-    {book,article}[book]{%
+    {book,article,collection}[book]{%
 \ifcase\nr\relax
+\disable@keys{}{secnumstyle}
 \or
 \suftesi@articletrue
 \@titlepagefalse
+\or
+\suftesi@collectiontrue
+  \setkeys{}{headerstyle=authortitleinner}
 \fi}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,periodical,compact,supercompact,elements,
+    {standard,periodical,compact,supercompact,supercompactaureo,elements,
     periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -135,6 +150,18 @@
     marginparwidth= 18mm,
     marginparsep=   8pt}
 \or
+\suftesi@supercompacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+  heightrounded,
+  includeheadfoot=false,
+    textheight=     175mm,
+    textwidth=      108mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    1:1,
+    marginparwidth= 11mm,
+    marginparsep=   7pt}\or
 \suftesi@elementspagelayouttrue
   \geometry{%
   heightrounded,
@@ -279,63 +306,81 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
 dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thechapter{\textsc{\roman{chapter}}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thesection{\arabic{section}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thesection{\Roman{section}}
   \def\SUF@dotsec{}
+  \def\SUF@toclabelnum{\@Roman}
 \or
   \def\SUF@thesection{\arabic{section}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{}
 \or
   \def\SUF@thesection{\textsc{\roman{section}}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{\scshape\@roman}
 \or
   \def\SUF@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
+  \def\SUF@toclabelnum{\@Roman}
 \fi}
 \define@choicekey{}{smallcapsstyle}[\val\nr]
     {low,upper}[low]{%
@@ -450,12 +495,20 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 \RequirePackage{caption}
 \define@choicekey{}{captionstyle}[\val\nr]
-    {standard,elements}[standard]{%
+    {standard,sanserif,italic,smallcaps,elements}[standard]{%
 \ifcase\nr\relax
    \captionsetup{labelsep=period,font=small}
 \or
    \captionsetup{labelsep=period,font=small}
    \captionsetup{font+=sf}
+\or
+   \captionsetup{labelsep=period,font=small}
+   \captionsetup{font+=it}
+\or
+   \captionsetup{labelsep=period,font=small,labelfont=sc}
+\or
+   \captionsetup{labelsep=period,font=small}
+   \captionsetup{font+=sf}
 \fi
 }
 \define@choicekey{}{marginpar}[\val\nr]
@@ -480,6 +533,36 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
 \suftesi@pagelefttoctrue
 \fi}
+\define@choicekey{}{twocolcontents}[\val\nr]{%
+    toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\ifcase\nr\relax
+  \suftesi@twocolumntoctrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\or
+  \suftesi@twocolumntoctrue
+  \suftesi@twocolumnloftrue
+  \suftesi@twocolumnlottrue
+  \setkeys{}{tocstyle=ragged}
+\fi
+}
 \define@choicekey{}{defaultfont}[\val\nr]{%
     palatino,standard}[palatino]{%
 \ifcase\nr\relax
@@ -560,53 +643,137 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
   \setkeys{}{chapstyle=parright}
 \or
-  \setkeys{}{chapstyle=left,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=center,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=right,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=italic,headerfont=italic}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=italic,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=italic,
+  secfont=smallcaps,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=italic,
+  secfont=smallcaps,
+  headerfont=italic}
 \or
-  \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=right,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+   chapstyle=parleft,
+   chapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=parcenter,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps,headerfont=italic}
+  \setkeys{}{
+    chapstyle=parright,
+    chapfont=italic,
+    secfont=smallcaps,
+    headerfont=italic}
 \or
-  \setkeys{}{chapstyle=left,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=center,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=right,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=left,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=center,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=right,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parleft,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parcenter,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
-  \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+  \setkeys{}{
+  chapstyle=parright,
+  chapfont=smallcaps,
+  secfont=smallcaps,
+  headerfont=smallcaps}
 \or
   \setkeys{}{
     pagelayout=elements,
@@ -680,6 +847,38 @@ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
 quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \fi}
+\define@choicekey{}{papertitlestyle}[\val\nr]{%
+    left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@coll@titleSwitch{\filright}
+\or
+  \def\SUF@lr@coll@titleSwitch{\filcenter}
+\or
+  \def\SUF@lr@coll@titleSwitch{\filleft}
+\fi}
+\define@choicekey{}{revauthortitle}[\val\nr]
+    {true,false}[false]{%
+\ifcase\nr\relax
+\suftesi@reverseauthortitletrue
+\or\relax
+\fi}
+\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@titlefont@Switch{\relax}
+\or
+\def\SUF@titlefont@Switch{\itshape}
+\or
+\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
+
+\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@authorfont@Switch{\relax}
+\or
+\def\SUF@authorfont@Switch{\itshape}
+\or
+\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
 \ExecuteOptionsX<>{
   captionstyle=standard,
   marginpar=true,
@@ -706,7 +905,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   secnumstyle=arabic,
   partnumstyle=Roman,
   chapnumstyle=arabic,
-  smallcapsstyle=low}
+  smallcapsstyle=low,
+  titlefont=italic,
+  authorfont=roman,
+  revauthortitle=false,
+  papertitlestyle=left,
+  authorfont=roman,
+  titlefont=italic}
 \ProcessOptionsX<>\relax
 \XKV@useoption{a4paper}   \XKV@useoption{10pt}
 \XKV@useoption{11pt}      \XKV@useoption{12pt}
@@ -739,8 +944,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  \else
 \fi
 \ifxetex
-  \relax
-    \else
+\AtBeginDocument{
+\@ifpackageloaded{fontspec}
+  {\relax}
+  {\ClassError{suftesi}
+    {***********************************\MessageBreak
+    * For using suftesi with XeLaTeX\MessageBreak
+    * load either 'fontspec' or 'mathspec'\MessageBreak
+    ************************************}
+    {***********************************\MessageBreak
+    * For using suftesi with XeLaTeX\MessageBreak
+    * load either 'fontspec' or 'mathspec'\MessageBreak
+    ************************************}}
+  }
+\else
 \RequirePackage[LGR,T1]{fontenc}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
 \ifsuftesi@standardfont
@@ -799,7 +1016,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
-      \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
+      \chapnumfont{\relax}%
 \else
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
@@ -1180,7 +1397,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \@author
       \end{tabular}\par}%
       \vskip 1.5em%
-    {\large \@date \par}%       % Set date in \large size.
+    {\large \@date \par}%
   \end{center}\par
   \@thanks
   \vfil\null
@@ -1266,7 +1483,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@
       \@standardmaketitle
     \fi
     \thispagestyle{plain}\@thanks
@@ -1298,6 +1515,162 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \par
   \vskip 1.5em}
 \fi
+\ifsuftesi@collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+  \def\@journalname{\@latex@warning@no@line{%
+    No \noexpand\journalname given}}
+\def\issn#1{\gdef\@issn{#1}}
+  \def\@issn{\@latex@warning@no@line{%
+    No \noexpand\issn given}}
+\def\doi#1{\gdef\@doi{#1}}
+  \def\@doi{\@latex@warning@no@line{%
+    No \noexpand\doi given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+  \def\@journalvolume{\@latex@warning@no@line{%
+    No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+  \def\@journalnumber{\@latex@warning@no@line{%
+    No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+  \def\@issue{\@latex@warning@no@line{%
+    No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+  \def\@journalyear{\@latex@warning@no@line{%
+    No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+  \def\@journalwebsite{\@latex@warning@no@line{%
+    No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected@xdef\@thanks{%
+  \@thanks\protect\footnotetext[\the\c@footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+  \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+  \def\@collectiontitle{\@latex@warning@no@line{%
+    No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+  \def\@collectioneditor{\@latex@warning@no@line{%
+    No \noexpand\collectioneditor given}}
+\newcommand*\l@title[2]{%
+  \ifnum \c@tocdepth >\m@ne
+    \addpenalty{-\@highpenalty}%
+    \vskip 1.0ex \@plus\p@
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \advance\leftskip1em
+      \hskip -\leftskip
+      #1\nobreak%
+    \ifsuftesi@dottedtoc\dotfill%
+      \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+        \else
+          \ifsuftesi@raggedtoc%
+            \nobreak\hskip1em #2 \hfill\null\par
+              \else
+                \ifsuftesi@pagelefttoc
+              \ClassError{suftesi}
+                {\MessageBreak
+                You can not use tocstyle=leftpage\MessageBreak
+                  with documentstructure=collection}
+                {You can not use tocstyle=leftpage\MessageBreak
+                  with documentstructure=collection}
+            \else
+          \nobreak\hfill #2\par
+        \fi
+      \fi
+    \fi
+      \penalty\@highpenalty
+    \endgroup
+  \fi}
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\@thanks\@empty
+      \let\thanks\@gobble}
+\def\@maketitle{%
+ \cleardoublepage
+  \SUF@chaptersize
+   \SUF@lr@coll@titleSwitch
+    \let\footnote\thanks
+     \parindent=0pt
+    \refstepcounter{title}%
+    {\ifsuftesi@reverseauthortitle
+      \SUF@titlefont@Switch{\@title}%
+        \else\SUF@authorfont@Switch{\@author}\fi}%
+     \label{begin:\thetitle}%
+    \begingroup
+    \let\thanks\@gobble
+    \addcontentsline{toc}{title}{\normalfont{\@author}\newline%
+      \itshape\@headtitle}
+    \endgroup
+    \vspace{2ex}\par
+    {\ifsuftesi@reverseauthortitle
+      \SUF@authorfont@Switch{\@author}%
+        \else
+      \SUF@titlefont@Switch{\@title}%
+    \fi\\}
+    \vskip2.5cm}
+\newcommand{\includeart}[1]{%
+  \begingroup
+  \setcounter{section}{0}
+    \input{#1}\label{end:\thetitle}
+     \clearpage
+   \global\let\@thanks\@empty
+ \endgroup}
+\newcommand{\frontispiece}{%
+  \thispagestyle{empty}%
+    \begingroup
+     \centering
+       \null\vspace{\stretch{1}}
+
+       {\SUF@chaptersize\@collectiontitle\par}
+         \vskip5ex
+
+       \@collectioneditor
+       \vspace{\stretch{2}}
+
+     \@date
+
+  \endgroup
+  \clearpage}
+  \setcounter{tocdepth}{0}
+  \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}
+  \else
+\fi
 \AtBeginDocument{%
 \@ifpackagewith{frontespizio}{suftesi}
      {\ifsuftesi@periodical
@@ -1318,13 +1691,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 {\@ifpackageloaded{frontespizio}
      {\ifsuftesi@periodical
           \Margini {1cm}{7cm}{5cm}{1cm}
+          \Rientro{1cm}
         \else
       \ifsuftesi@compact
           \Margini {1cm}{7cm}{6cm}{1cm}
+          \Rientro{1cm}
         \else
           \ifsuftesi@supercompact
           \Margini {1cm}{10cm}{8cm}{1cm}
+          \Rientro{1cm}
         \else
+          \ifsuftesi@periodicalaureo
+          \Margini {1cm}{7cm}{5cm}{1cm}
+          \Rientro{1cm}
+        \fi
      \fi
   \fi
 \fi}
@@ -1375,7 +1755,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \titlecontents{part}
    [0em]
   {\addvspace{3ex}\partname~}
-  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+  {\makebox[\SUF@label@part][l]{%
+    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
@@ -1388,7 +1769,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \gdef\thechapter{\@Alph\c@chapter}
     \titleformat{\chapter}[block]
       {\vskip-22pt}%
-      {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+      {\small%
+      \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
       {0pt}
       {\small\SUF@titlesmallcaps}
       [\rule{\textwidth}{.4pt}]
@@ -1550,6 +1932,19 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 }%
 }
 {\relax}}
+\ifsuftesi@collection
+  \newenvironment{abstract}{%
+      \if@twocolumn
+        \section*{\abstractname}%
+      \else
+        \small
+        \begin{center}%
+          {\abstractname\vspace{-.5em}\vspace{\z@}}%
+        \end{center}%
+        \quotation
+      \fi}
+      {\if@twocolumn\else\endquotation\fi}
+\else
 \if@titlepage
   \newenvironment{abstract}{%
       \titlepage
@@ -1573,6 +1968,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi}
       {\if@twocolumn\else\endquotation\fi}
 \fi
+\fi
 \newcommand\abstractname{Abstract}
 \newcommand{\colophon}[3][]{%
   \thispagestyle{empty}
@@ -1620,8 +2016,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \noindent \hskip-.5em\cc #1 \@author%
 \vskip1ex
 
-\small\noindent This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
-To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+\small\noindent This work is licensed under the Creative Commons
+Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+To view a copy of this license,
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 
 \endgroup
 
@@ -1630,7 +2028,11 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 
 \null\vspace{\stretch{1}}
 
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janusz M. Nowacki.
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
+\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona,
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
+Janusz M. Nowacki.
 
 \endgroup
 
@@ -1644,42 +2046,54 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
      only for the FSPL styles}}
 \fi
 \RequirePackage{titletoc}
-\newlength\SUF@label@chapter
-\setlength\SUF@label@chapter{.5em}
-\newcommand*{\toclabelspace}[1]{\setlength\SUF@label@chapter{#1}}
-\let\toclabelwidth\toclabelspace
+\newlength\SUF@label@chap
+\setlength\SUF@label@chap{.5em}
+\newcommand*{\toclabelwidth}[2]{%
+  \addtolength{\csname SUF@label@#1\endcsname}{#2}%
+  \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}%
+\newcommand{\toclabelspace}{%
+  \ClassError{suftesi}
+    {\MessageBreak
+    \noexpand\toclabelspace is not more defined\MessageBreak
+    Use \noexpand\toclabelwidth instead.\MessageBreak
+    See package documentation for details}
+    {\MessageBreak
+    \noexpand\toclabelspace is not more defined\MessageBreak
+    Use \noexpand\toclabelwidth instead.\MessageBreak
+    See package documentation for details}}
 \newlength{\SUF@tochang}
 \setlength{\SUF@tochang}{3em}
 \AtBeginDocument{
 \newlength\SUF@label@part
-\newlength\SUF@label@section
-\newlength\SUF@label@subsection
-\newlength\SUF@label@subsubsection
-\newlength\SUF@label@paragraph
-\newlength\SUF@label@subparagraph
-\newlength\SUF@label@figure
-\newlength\SUF@label@table
+\newlength\SUF@label@sec
+\newlength\SUF@label@subsec
+\newlength\SUF@label@subsubsec
+\newlength\SUF@label@par
+\newlength\SUF@label@subpar
+\newlength\SUF@label@fig
+\newlength\SUF@label@tab
 \setlength\SUF@label@part
-    {\SUF@label@chapter}
-\setlength\SUF@label@section
-    {\dimexpr(\SUF@label@chapter+.5em)}
-\setlength\SUF@label@subsection
-    {\dimexpr(\SUF@label@section+.5em)}
-\setlength\SUF@label@subsubsection
-    {\dimexpr(\SUF@label@subsection+.5em)}
-\setlength\SUF@label@paragraph
-    {\dimexpr(\SUF@label@subsubsection+.5em)}
-\setlength\SUF@label@subparagraph
-    {\dimexpr(\SUF@label@paragraph+.5em)}
-\setlength\SUF@label@figure
-    {\SUF@label@section}
-\setlength\SUF@label@table
-    {\SUF@label@section}
+    {\SUF@label@chap}
+\setlength\SUF@label@sec
+    {\dimexpr(\SUF@label@chap+.5em)}
+\setlength\SUF@label@subsec
+    {\dimexpr(\SUF@label@sec+.5em)}
+\setlength\SUF@label@subsubsec
+    {\dimexpr(\SUF@label@subsec+.5em)}
+\setlength\SUF@label@par
+    {\dimexpr(\SUF@label@subsubsec+.5em)}
+\setlength\SUF@label@subpar
+    {\dimexpr(\SUF@label@par+.5em)}
+\setlength\SUF@label@fig
+    {\SUF@label@sec}
+\setlength\SUF@label@tab
+    {\SUF@label@sec}
 }
 \titlecontents{part}
   [0em]
   {\addvspace{3ex}\partname\hspace*{.5em}}
-  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+  {\makebox[\SUF@label@part][l]{%
+    \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
@@ -1703,17 +2117,17 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \newlength\SUF@addto@tochang@fig
 \newlength\SUF@addto@tochang@tab
 \setlength\SUF@tochang@chap
-    {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+    {\dimexpr(1em+\SUF@tochang+\SUF@label@chap+1em)}
 \setlength\SUF@tochang@sec
-    {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+    {\dimexpr(\SUF@tochang@chap+\SUF@label@sec+1em)}
 \setlength\SUF@tochang@subsec
-    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsec+1em)}
 \setlength\SUF@tochang@subsubsec
-    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsec+1em)}
 \setlength\SUF@tochang@par
-    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@par+1em)}
 \setlength\SUF@tochang@subpar
-    {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+    {\dimexpr(\SUF@tochang@par+\SUF@label@subpar+1em)}
 \setlength\SUF@tochang@fig
     {\SUF@tochang@chap}
 \setlength\SUF@tochang@tab
@@ -1721,19 +2135,19 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \setlength\SUF@addto@tochang@chap
     {\SUF@tochang}
 \setlength\SUF@addto@tochang@sec
-    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@sec+.5em)}
 \setlength\SUF@addto@tochang@subsec
-    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsec+.5em)}
 \setlength\SUF@addto@tochang@subsubsec
-    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsec+.5em)}
 \setlength\SUF@addto@tochang@par
-    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@par+.5em)}
 \setlength\SUF@addto@tochang@subpar
-    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subpar+.5em)}
 \setlength\SUF@addto@tochang@fig
-    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
 \setlength\SUF@addto@tochang@tab
-    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
 }
 \titlecontents{chapter}
   [\SUF@tochang@chap]
@@ -1741,8 +2155,8 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {\hskip-\SUF@tochang@chap%
    \makebox[1em][l]{\thecontentspage}%
     \hskip\SUF@addto@tochang@chap%
-      \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
-        \hspace*{1em}}
+      \makebox[\SUF@label@chap][l]{%
+        \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@chap%
      \makebox[1em][l]{\thecontentspage}%
        \hskip\SUF@addto@tochang@chap}
@@ -1753,57 +2167,54 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {}
   {\hskip-\SUF@tochang@sec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@sec][l]{%
+    \ifsuftesi@article\SUF@toclabelnum%
+     \else\fi\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@sec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec}
   {}
 \titlecontents{subsection}
   [\SUF@tochang@subsec]
   {}
   {\hskip-\SUF@tochang@subsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subsec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec}
   {}
 \titlecontents{subsubsection}
   [\SUF@tochang@subsubsec]
   {}
   {\hskip-\SUF@tochang@subsubsec%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subsubsec%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec}
   {}
 \titlecontents{paragraph}
   [\SUF@tochang@par]
   {}
   {\hskip-\SUF@tochang@par%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@par%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par}
   {}
 \titlecontents{subparagraph}
   [\SUF@tochang@subpar]
   {}
   {\hskip-\SUF@tochang@subpar%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
   {\hskip-\SUF@tochang@subpar%
-   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar}
   {}
 \titlecontents{figure}
   [\SUF@tochang@fig]
   {}
   {\hskip-\SUF@tochang@fig%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
-     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \titlecontents{table}
@@ -1811,7 +2222,7 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
   {}
   {\hskip-\SUF@tochang@tab%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
-     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \else
@@ -1824,28 +2235,41 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \newlength\SUF@tocindent@subpar
 \newlength\SUF@tocindent@fig
 \newlength\SUF@tocindent@tab
+\ifsuftesi@article
+\setlength\SUF@tocindent@sec
+    {\dimexpr(\SUF@label@chap+1.5em)}
+\setlength\SUF@tocindent@subsec
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
+\setlength\SUF@tocindent@subsubsec
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
+\setlength\SUF@tocindent@par
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
+\setlength\SUF@tocindent@subpar
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\else
 \setlength\SUF@tocindent@chap
-    {\dimexpr(\SUF@label@chapter+1em)}
+    {\dimexpr(\SUF@label@chap+1em)}
 \setlength\SUF@tocindent@sec
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec+1em)}
 \setlength\SUF@tocindent@subsec
-    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
 \setlength\SUF@tocindent@subsubsec
-    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
 \setlength\SUF@tocindent@par
-    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
 \setlength\SUF@tocindent@subpar
-    {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\fi
 \setlength\SUF@tocindent@fig
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
 \setlength\SUF@tocindent@tab
-    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
 }
 \titlecontents{chapter}
   [\SUF@tocindent@chap]
   {\addvspace{2ex}}
   {\hskip-\SUF@tocindent@chap%
-    \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
+    \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
     \hspace*{1em}}
   {\hskip-\SUF@tocindent@chap}
   {\SUF@chaptitlerule\contentspage}
@@ -1853,56 +2277,53 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
 \titlecontents{section}
   [\SUF@tocindent@sec]
   {}
-  {\hskip-\dimexpr(\SUF@label@section+1em)%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@section+1em)%
-    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \makebox[\SUF@label@sec][l]{%
+    \ifsuftesi@article\SUF@toclabelnum%
+      \else\fi\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)}
   {\ifsuftesi@article\SUF@chaptitlerule%
        \else\SUF@titlerule\fi\contentspage}
 \titlecontents{subsection}
   [\SUF@tocindent@subsec]
   {}
-  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
-    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsec+1em)%
+    \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsec+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{subsubsection}
   [\SUF@tocindent@subsubsec]
   {}
-  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
-    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
+    \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsec+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{paragraph}
   [\SUF@tocindent@par]
   {}
-  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
-    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@par+1em)%
+    \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@par+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{subparagraph}
   [\SUF@tocindent@subpar]
   {}
-  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
-  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
-    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subpar+1em)%
+    \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subpar+1em)}
   {\SUF@titlerule\contentspage}
 \titlecontents{figure}
   [\SUF@tocindent@fig]
   {}
   {\hskip-\SUF@tocindent@fig%
-    \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@fig][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \titlecontents{table}
   [\SUF@tocindent@tab]
   {}
   {\hskip-\SUF@tocindent@tab%
-    \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+    \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \fi
@@ -1912,7 +2333,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
     \section*{\contentsname}%
       \@mkboth{\contentsname}{\contentsname}%
         \thispagestyle{empty}
-    \@starttoc{toc}%
+        \ifsuftesi@twocolumntoc
+          \begin{multicols}{2}
+          \@starttoc{toc}%
+        \end{multicols}
+      \else
+         \@starttoc{toc}%
+      \fi
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
@@ -1920,7 +2347,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
     \section*{\listfigurename}%
        \@mkboth{\listfigurename}{\listfigurename}%
      \thispagestyle{empty}
-    \@starttoc{lof}%
+        \ifsuftesi@twocolumnlof
+          \begin{multicols}{2}
+          \@starttoc{lof}%
+        \end{multicols}
+      \else
+         \@starttoc{lof}%
+      \fi
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
@@ -1928,7 +2361,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
     \section*{\listtablename}%
         \@mkboth{\listtablename}{\listtablename}%
       \thispagestyle{empty}
-    \@starttoc{lot}%
+        \ifsuftesi@twocolumnlot
+          \begin{multicols}{2}
+          \@starttoc{lot}%
+        \end{multicols}
+      \else
+         \@starttoc{lot}%
+      \fi
     \vspace{2ex}%
     }
 \else
@@ -1943,7 +2382,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
             \contentsname}
            {\contentsname}%
       \thispagestyle{empty}
-    \@starttoc{toc}%
+        \ifsuftesi@twocolumntoc
+          \begin{multicols}{2}
+          \@starttoc{toc}%
+        \end{multicols}
+      \else
+         \@starttoc{toc}%
+      \fi
     \if@restonecol\twocolumn\fi
    }
 \renewcommand\listoffigures{%
@@ -1956,7 +2401,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
       \@mkboth{\listfigurename}%
               {\listfigurename}%
      \thispagestyle{empty}
-    \@starttoc{lof}%
+        \ifsuftesi@twocolumnlof
+          \begin{multicols}{2}
+          \@starttoc{lof}%
+        \end{multicols}
+      \else
+         \@starttoc{lof}%
+      \fi
     \if@restonecol\twocolumn\fi
     }
 \renewcommand\listoftables{%
@@ -1970,7 +2421,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
           \listtablename}%
          {\listtablename}%
      \thispagestyle{empty}
-    \@starttoc{lot}%
+        \ifsuftesi@twocolumnlot
+          \begin{multicols}{2}
+          \@starttoc{lot}%
+        \end{multicols}
+      \else
+         \@starttoc{lot}%
+      \fi
     \if@restonecol\twocolumn\fi
     }
 \fi