suftesi (26feb16)

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

4 files changed, 937 insertions, 629 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 5065c08bdc5..46c5971aef5 100644
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/templates.zip b/Master/texmf-dist/doc/latex/suftesi/templates.zip
index 8fbc83cd2e2..a71fdcae26b 100644
--- a/Master/texmf-dist/doc/latex/suftesi/templates.zip
+++ b/Master/texmf-dist/doc/latex/suftesi/templates.zip
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index ce7692c323e..2033e658716 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -67,55 +67,58 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2015/09/19 v2.3 A class for typesetting theses, books and articles]
+    [2016/02/26 v2.4 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\documentclass[10pt]{ltxdoc}
+\documentclass{ltxdoc}
+
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[greek.ancient,english]{babel}
-% fonts and colors
-\usepackage[osf,p,mono=false]{libertine}
-\usepackage[libertine]{newtxmath}
-  \newcommand{\redtriangle}{\noindent\textcolor{red}{$\blacktriangleright$}}
-\usepackage[svgnames]{xcolor}
-  \definecolor{sufred}{rgb}{0.5,0,0}
-  \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
-\usepackage{metalogo}
-\usepackage{guit}
 \usepackage[final]{microtype}
 \usepackage{siunitx}
-% doc facilities
+
+\DeclareFontFamily{T1}{Cochineal-LF}{}
+\DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
+      <-> s*[1.0] Cochineal-Roman-osf-t1}{}
+
+% Doc facilities
 \let\cs\relax
 \let\cmd\relax
 \usepackage{ltxdockit}
-% tables
+% Graphics
+\usepackage[svgnames]{xcolor}
+  \definecolor{sufred}{rgb}{0.5,0,0}
+  \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+\usepackage[framemethod=TikZ]{mdframed}
+  \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
+\usepackage{tikz}
+  \usetikzlibrary{shadows}
+% Tables
 \usepackage{array}
 \usepackage{booktabs}
 \usepackage{multirow}
-% bibliography
+% Bibliography
 \usepackage[autostyle]{csquotes}
 \usepackage[style=philosophy-classic,backend=biber]{biblatex}
   \addbibresource{suftesi.bib}
-% layout
-\usepackage{geometry}
-%  \geometry{hmarginratio=1:1,a4paper,margin=2cm,headheight=15pt}
-\geometry{paperwidth=17cm,paperheight=24cm,margin=1.4cm,top=2cm,bottom=2cm,headheight=15pt,ignoreall,heightrounded}
-
-\usepackage{sectsty}
-  \allsectionsfont{\sffamily}
-\usepackage{fancyhdr}
-  \fancyhf{}
-  \fancyhead[L]{© 2009--\the\year\quad Ivan Valbusa}
-  \fancyfoot[L]{\textsf{suftesi.cls} \fileversion{} -- \filedate}
-  \renewcommand{\footrulewidth}{0.4pt}
-  \fancyhead[R]{\thepage}
-    \pagestyle{fancy}
-\usepackage[framemethod=TikZ]{mdframed}
-  \mdfsetup{roundcorner=3pt,linecolor=olive}
-  \usetikzlibrary{shadows}
+\usepackage{metalogo}
+\usepackage{guit}
+%%% Greek examples
+\def\latintxt{Aliquam auctor, pede consequat
+  laoreet varius, eros tellus scelerisque quam, pellentesque hendrerit.}  
+\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
+  nibh est placerat odio.}
+\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
+ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
+ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
+\newcommand{\greekexample}[4]{%
+	\noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt} 
+		{\fontfamily{#2}%
+		%\fontsize{#4}{13}
+		\selectfont%
+		\textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
 % New commands
-\def\suftesi{\textsf{suftesi}}
 \newcommand{\argstyle}{\itshape}
 \DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
 \DeclareRobustCommand*{\oar}[1]{\texttt{[}\textrm{\argstyle#1}\texttt{]}}
@@ -125,81 +128,33 @@
 \DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
 % New environments
 \newenvironment{ttquote}
-  {\begin{mdframed}
+  {\begin{mdframed}[backgroundcolor=gray!20]
   \ttfamily\microtypesetup{activate=false}}
   {\end{mdframed}}
 \newenvironment{latexcode}
-  {\begin{mdframed}}
+  {\begin{mdframed}[backgroundcolor=gray!20]}
   {\end{mdframed}}
-\makeatletter
-\renewenvironment*{optionlist}
-  {\list{}{%
-     \setlength{\labelwidth}{\marglistwidth}%
-     \setlength{\labelsep}{\z@}%
-     \setlength{\leftmargin}{2cm}%
-     \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
-   \ltd@optionlist}
-  {\endlist}
-\renewenvironment*{ltxsyntax}
-  {\list{}{%
-     \setlength{\labelwidth}{\marglistwidth}%
-     \setlength{\labelsep}{0pt}%
-     \setlength{\leftmargin}{2cm}%
-     \renewcommand*{\makelabel}[1]{%
-       \hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}%
-   \let\csitem\ltd@csitem
-   \let\cmditem\ltd@cmditem
-   \let\envitem\ltd@envitem
-   \let\lenitem\ltd@csitem
-   \let\boolitem\ltd@boolitem
-   \let\cntitem\ltd@item
-   \let\optitem\ltd@item}
-  {\endlist}
-\renewenvironment*{valuelist}[1][]
-  {\list{}{%
-     \ifblank{#1}
-       {\setlength{\labelwidth}{5em}}
-       {\setlength{\labelwidth}{#1}}%
-     \setlength{\labelsep}{1em}%
-     \setlength{\leftmargin}{\labelwidth}%
-     \addtolength{\leftmargin}{\labelsep}%
-     \setlength{\itemsep}{0pt}%
-     \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
-  {\endlist}
-\newcommand*{\valuelistfont}{%
-  \color{olive}\sffamily\displayverbfont}
-\renewcommand*{\optionlistfont}{%
-  \color{sufred}\sffamily\displayverbfont}
-\renewcommand*{\ltxsyntaxlabelfont}{%
-  \color{sufred}\sffamily\displayverbfont}
-% Table of contents
-\renewcommand\tableofcontents{%
-\setlength{\columnsep}{1cm}
-{\centering	    
-   \section*{\contentsname}%
-	      \@mkboth{\contentsname}{\contentsname}%
-	 }	 
-        \thispagestyle{empty}
-        \begin{multicols}{2}
-	    \@starttoc{toc}%
-	    	\end{multicols}
-		}
 % Correct (?) \optitem to use \meta inside #2
+\makeatletter
 \renewcommand*{\ltd@ol@optitem}[3][]{%
   \ifblank{#1}
     {\ltd@option{}{#2}{#3}{}}
     {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
 \makeatother
-
+% hyperref setup
 \usepackage{hyperref}
 \hypersetup{%
     pdftitle={User's Guide to \textsf{suftesi}},
     pdfsubject={A document class for typesetting theses, 
       books and articles},
     pdfauthor={Ivan Valbusa},
-    pdfkeywords={thesis, humanities, books},
-    hidelinks
-    }   
+    pdfkeywords={thesis, humanities, books}}   
+% Informations
+\author{Ivan Valbusa\thanks{Dipartimento di Filosofia, Università degli Studi di Verona --- 
+	\texttt{ivan dot valbusa at univr dot it}}}
+\title{User's Guide to \textsf{suftesi}\\
+	\normalsize A document class for typesetting\\ theses,  books and articles}
+\date{\fileversion{} -- \filedate}
 
 \EnableCrossrefs         
 \CodelineIndex
@@ -212,7 +167,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4338}
+% \CheckSum{4594}
 %
 % \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,9 +185,10 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.4}{2016/02/27}{Changed the default font to Cochineal with Linux Biolinum O sans serif and Inconsolata monospaced. The Palatino is now loaded with \sty{newpxtext} and \sty{newpxmath}. Bera Mono and Iwona have been substituted by Linux Biolinum O and Inconsolata. New values for font options: \opt{cochineal}, \opt{libertine}, \opt{bodoni} (greek only). Value \opt{compatibility} for \opt{defaultfont} option to get the fonts of suftesi v2.3 or previous. Updated documentation.}
 % \changes{v2.3}{2015/09/19}{Maintenance release.}
 % \changes{v2.2}{2015/09/10}{Maintenance release.}
-% \changes{v2.1}{2015/06/13}{New option \opt{toc\meta{level}font}.Updated documentation. Removed \cmd{includeart} command}
+% \changes{v2.1}{2015/06/13}{New option \opt{toc\meta{level}font}. Updated documentation. Removed \cmd{includeart} command}
 % \changes{v2.0.1}{2015/03/31}{Corrected a bug in \opt{version} option.}
 % \changes{v2.0}{2015/03/29}{New page layout \opt{standardaureo}. Enhanced support for \LuaLaTeX. Headers settings are now executed \cmd{AtBeginDocument}. Loaded \sty{ifluatex} and \sty{ifthen} packages. Added \opt{listparindent} to \cmd{setlist} options. Updated documentation.}
 % \changes{v1.9c}{2014/04/05}{The \opt{cbgreek} value for the \opt{greekfont} option allows now to use the full set of the CB Greek font together with the default font (Palatino).}
@@ -280,6 +236,7 @@
 % Changed option \opt{sctitles}.}
 % \GetFileInfo{suftesi.dtx}
 %
+%
 % \DoNotIndex{\hskip,\newcommand,\newenvironment,\def,\begin,\vskip,\ }
 % \DoNotIndex{\DeclareOption,\ExecuteOptions,\RequirePackage}
 % \DoNotIndex{\@@end,\@empty,\@ifclassloaded,\@nameuse,\@nil}
@@ -306,42 +263,39 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
-% \thispagestyle{empty}
-% \begin{tikzpicture}[overlay,remember picture]
-% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm);
-% \node[align=center,anchor=center] at (current page.center) {%
-% Ivan Valbusa\\[1cm]
-% 
-%\Huge\color{gray}\bfseries \parbox{10cm}{\centering The \\{{\color{sufred}\fontsize{30}{32}\textsf{suftesi}}\\ class}}\\[1cm]
-% \color{black!60!Goldenrod}
-%
-%\normalsize \fileversion{} -- \filedate
-% 
-%};
-% \end{tikzpicture}
-%
-% \clearpage 
+%\maketitle
+% \begin{abstract}
+% The standard document classes allow you to typeset beautiful
+% documents but their layout is quite far from the stylistic requests
+% of some humanists (mainly Italian). The \sty{suftesi} class
+% provides a set of ``humanistic'' page layouts, title styles 
+% and heading styles to typeset books, articles and theses. 
+% The styles are very simple and sober and also have the aim of
+% finding an aesthetic harmony in its formal simplicity  \parencite[see][]{valbusa:20122}. They are
+% largely inspired by some interesting readings, particularly
+% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
+% \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}.
+% \end{abstract}
+%\begin{multicols}{2}
+% \tableofcontents
+%\end{multicols}
 %
-% \thispagestyle{empty}
-% \vspace*{12cm}
+% \subsection*{Legalese}\enlargethispage{.5\baselineskip}
 %
-%\noindent Copyright \copyright\ 2009-\the\year{} Ivan Valbusa.
-% \bigskip
+%\noindent Copyright \copyright\ 2009-\the\year{} Ivan Valbusa
+% \smallskip
 %
-%\noindent This package is author-maintained. 
+% \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 ora later (\url{http://latex-project.org/lppl}). This software is provided ''as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+%terms of the LaTeX Project Public License, version 1.3c ora later (\url{http://latex-project.org/lppl}). This software is provided ``as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
 %
-% \bigskip
 %
-%\noindent In addition to the terms of this license 
+%In addition to the terms of this license 
 % the author requires an attribution notice (see section 
 % \ref{sec:commands}) like the following one: \emph{This work has been 
 % typeset with \LaTeX{}, using the \textsf{suftesi} class by Ivan Valbusa.}
 %
-% \bigskip
-%
-% \noindent The most essence of this class is the set of styles it
+% The main feature of this class is the set of styles it
 % provides. For this reason {\scshape\lsstyle do not modify the styles of this class with packages 
 % and/or commands which change the layout of the document. 
 % If you do not like these styles, use another class.}
@@ -349,61 +303,27 @@
 % (for example \sty{book}), remember to clean up the preamble from all
 % the layout redefinitions.
 %
-% \bigskip
-%
-% \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
-%
-% \clearpage
-%
-% \begin{center}
-% {\color{sufred}\bfseries 
-%   \Huge User's Guide to 
-% \textsf{suftesi}\\[3mm]}
-% {\large\itshape A document class for typesetting theses, 
-% books and articles}
-%\vspace{.8cm}
-%
-% \normalsize\fileversion{} -- \filedate
-% \vspace{.7cm}
-%
-% Ivan Valbusa\\[2mm]
-%
-%  \small Dipartimento di Filologia, Letteratura e Linguistica\\
-%  \small Università degli Studi di Verona\\
-%  \footnotesize\texttt{ivan dot valbusa at univr dot it}
-% \vspace{1cm}
-% \end{center}
-%
-% \begin{abstract}
-% \noindent The standard document classes allow you to typeset beautiful
-% documents but their layout is quite far from the stylistic requests
-% of some humanists (mainly Italian). The \sty{suftesi} class
-% provides a set of ``humanistic'' page layouts, title styles 
-% and heading styles to typeset books, articles and theses. 
-% The styles are very simple and sober and also have the aim of
-% finding an aesthetic harmony in its formal simplicity. They are
-% largely inspired by some interesting readings, particularly
-% \citetitle{Bringhurst:1992} by R.~\citeauthor{Bringhurst:1992}, \citetitle{Tschichold:1975} by J.~\citeauthor{Tschichold:1975} and
-% \citetitle{Morison:1111} by S.~\citeauthor{Morison:1111}.
-% \end{abstract}
-% 
-% \tableofcontents
 %
+% \subsection*{A brief history}\thispagestyle{empty}
 %
-% \section*{A brief history}
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{sufred}{\textbf{S}}cienze \textcolor{sufred}{\textbf{U}}mane e \textcolor{sufred}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona.
 %
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{sufred}{\textbf{S}}cienze \textcolor{sufred}{\textbf{U}}mane e \textcolor{sufred}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona (Italy).
+% \subsection*{Acknowledgments}
 %
-% {\em I would like to thank Professors Paola Di~Nicola,
+% 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.}
+%I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
+%%
+%% \subsection*{Feedback}
+%
+% \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
 %
 % \section{Use}
-% 
+%
 % The \sty{suftesi} class is called as usual by
 % \begin{ttquote}
-% \cmd{documentclass}\oarm{options}\ar{suftesi}
+% \cmd{documentclass}\oarm{options}\{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.
@@ -419,49 +339,50 @@
 % 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.
 %
-% \subsection*{The document structure}
-%
-% 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}
-% 
-% \paragraph*{Loaded packages}
-%
-% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
-% It is not compatible with \sty{crop}}
+% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX). With these engines the font options are turned off and the \LaTeX{} default font (Computer Modern) is loaded. 
 %
-% The class loads the following packages: \sty{beramono},
-% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{extramarks}, 
+%\sloppy The class loads some packages that may cause incompatibility if loaded in your main document:
+% \sty{caption}, \sty{color}, \sty{crop}, \sty{enumitem}, \sty{emptypage}, \sty{extramarks}, 
 % \sty{fancyhdr}, \sty{fixltxhyph}, \sty{fontenc}, \sty{geometry},  
-% \sty{ifxetex}, \sty{ifluatex}, \sty{ifthen}, \sty{mathpazo}, 
-% \sty{microtype}, \sty{multicol}, \sty{substitutefont}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}. 
+% \sty{ifxetex}, \sty{ifluatex}, \sty{ifthen},
+% \sty{microtype}, \sty{multicol}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}; \sty{substitutefont} and \sty{fontenc} (pdf\LaTeX only); \sty{lmodern} (\opt{defaultfont=standard}); \sty{textcomp}, \sty{newpxtext}, \sty{biolinum}, \sty{inconsolata}, \sty{newpxmath}, \sty{mathalpha} (\opt{defaultfont=palatino}); \sty{textcomp}, \sty{libertine}, \sty{biolinum}, \sty{inconsolata}, \sty{newtxmath}, \sty{mathalpha} (\opt{defaultfont=libertine}); \sty{textcomp}, \sty{cochineal}, \sty{biolinum}, \sty{inconsolata}, \sty{newtxmath}, \sty{mathalpha} (\opt{defaultfont=cochineal}); \sty{mathpazo}, \sty{beramono} (\opt{defaultfont=compatibility}).
+%
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
-% \paragraph*{Use with \XeLaTeX{} and \LuaLaTeX}
-% 
-% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX). With these engines 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} folder in your \LaTeX{} distribution.
+% The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at:
+%\begin{center} 
+%\url{https://www.ctan.org/tex-archive/macros/latex/contrib/suftesi}
+%\end{center}
+%
+%
+% \subsection{Document structure}
 % 
+% With \sty{suftesi} you can typeset book-style documents (with chapters), article-style documents (without chapters) and collections of papers (see section \ref{sec:collection}). The kind of document is set by the \opt{structure} option which defaults to \opt{book} (see section \ref{sec:options}).
+%
+%\begin{ttquote}
+%\cmd{documentclass}[structure=\meta{value},\meta{options}]\{suftesi\}
+%^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\
+%^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\}
+%\end{ttquote}
 %
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
+% It is not compatible with \sty{crop}}
+% 
 % \subsection{Page layouts}
 %
-% 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).
+% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset  A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts it is particularly useful the \opt{version=screen} option which shows the output in its real size. See section \ref{sec:page-styles} for details.
 %
-% \begin{table}[h]
-% \centering
-% \begin{tabular}{lcccccccc}
+ % \begin{table}[h]
+%\centering
+%\makebox[\textwidth][c]{\begin{tabular}{@{}lcccccccc@{}}
 %\toprule
 %&\multicolumn{4}{c}{Dimensions (mm)}&\multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){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}
-%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(lr){1-1}
+%&\multicolumn{2}{c}{Typeblock}&\multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}&\multicolumn{2}{c}{Stock}\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}
+%Layout         &w &	h&	w&	h&t\,/\,b&i\,/\,o&Typeblock& Page\\\cmidrule(r){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}\cmidrule(r){1-1}
 %\opt{standard} &	110&	220&	210&	297&$1:2$&$1:2$&$1:2$&$1:\kern-3pt\sqrt{2}$\\
 %\opt{standardaureo} &	136&	220&	210&	297&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\kern-3pt\sqrt{2}$\\
 %\opt{compact}&	110&	165&	160&	240&$2:3$&$2:3$&$2:3$&$2:3$\\
@@ -474,70 +395,104 @@
 %\opt{elements} (pt)&	251&	502&	374&	648&$1:2$&$2:5$&$1:2$&$1:\kern-3pt\sqrt{3}$\\
 % \bottomrule\\[-2ex]
 % \multicolumn{9}{r}{\footnotesize\textsuperscript{*} $5:8\approx 1:1,618$}
-%\end{tabular}\\[-4ex]
+%\end{tabular}}\\[-4ex]
 % \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
 % \end{table}
+% 
+%^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
+%
+%^^A\begin{figure}[h!]\centering
+%^^A\noindent\begin{tikzpicture}[scale=0.3]
+%^^A\draw (0,0) rectangle (17,24);
+%^^A\draw[draw=none,fill=gray!50,xshift=3cm,yshift=2.6cm] (0,0) rectangle (12,19.4);
+%^^A\draw[xshift=17cm] (0,0) rectangle ++(17,24);
+%^^A\draw[xshift=17cm,draw=none,fill=gray!50,xshift=2cm,yshift=2.6cm] (0,0) rectangle ++(12,19.4);
+%^^A\end{tikzpicture}
+%^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
+%^^A\end{figure}
 %
 % \subsection{Font}
 %
-% The default serif font for body text is
-% {\fontfamily{ppl}\selectfont Palatino designed by Hermann Zapf}\index{Zapf, Hermann} and loaded through the \sty{mathpazo} package, but you can simply choose {\fontfamily{lmr}\selectfont 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} (a) which is particularly suitable for Palatino, but with the \opt{greekfont} option (see section \ref{sec:options}) you can choose also Porson (b) or CB Greek (c). 
-% 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.
-%
-% \begin{mdframed}
-%\fontfamily{ppl}\selectfont\small
-%\noindent\begin{minipage}[t]{.32\textwidth}
-% \raggedright
-%\foreignlanguage{greek}{%
-%\fontfamily{artemisia}\selectfont
-%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.
-%
-% {\vskip2ex\footnotesize\centering (a) Artemisia (Greek Font Society)\\}
-%\end{minipage}\hfill
-%\begin{minipage}[t]{.32\textwidth}
-% \raggedright
-%\foreignlanguage{greek}{%
-%\fontfamily{porson}\selectfont
-%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.
-%
-% {\vskip2ex\footnotesize\centering  (b) Porson (Greek Font Society)\\}
-%\end{minipage}\hfill
-%\begin{minipage}[t]{.32\textwidth}
-% \raggedright
-%\foreignlanguage{greek}{%
-%\fontfamily{lmr}\selectfont
-%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.
-% {\vskip2ex\footnotesize\centering  (c) CB Greek (Claudio Beccari)\\}
-%\end{minipage}
-% \end{mdframed}
-% 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. 
-%
-% \subsection{Frontispiece} 
+% 
+%The default roman font is Cochineal by Michael Sharpe,
+%the sans serif font is Linux Biolinum O, designed by Philipp H. Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastina Kosch, a font inspired by masterpieces like Sabon and Minion. It is a very complete typeface and it offers full support for Greek and Cyrillic, real small caps (even in italic shape) and four figure styles. Moreover it provides support for mathematics through the \sty{newtxmath} package.
+%
+%The \opt{defaultfont}  option allows you to can change the default roman font to New PX (Palatino), Linux Libertine O, or Latin modern. 
+%You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} class option which turns off the default font settings (see section \ref{sec:options} for details). 
+%
+%Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at
+%\url{http://tug.org/fonts/getnonfreefonts/}.
+%
+%
+% \subsubsection[Mathematics]{Typesetting mathematics}
+%
+% All the non-standard fonts selectable with the \opt{defaultfont}  option, i.e. Cochineal (default), Linux Libertine O and New PX, have a very good mathematical support, but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard} (see section \ref{sec:fonts}). 
+%
+%
+% \subsubsection[Greek]{Typesetting Greek}
+% 
+% The Cochineal default font is complete of Greek and Cyrillic. Anyway the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) to select four different Greek fonts for use with the roman typeface
+% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson, by the Greek Font Society and CB Greek by Claudio Beccari. You may, of course, choose a different font but, as previously cleared, remember to load the \opt{defaultfont=none} option.
+% 
+%
+% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{12}
+% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{10}
+% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10.4}
+% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{10}
+% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{10}
+% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{12}
+% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10.5}
+% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10.9}
+% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{10}
+% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{11}
+% \greekexample{zplosf}{bodoni}{Palatino/Bodoni}{11}
+% \greekexample{zplosf}{artemisia}{Palatino/Artemisia}{11}
+% \greekexample{zplosf}{porson}{Palatino/Porson}{11.3}
+% \greekexample{zplosf}{lmr}{Palatino/CB Greek}{11}
+% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{11}
+%
+%
+% \subsection{The frontispiece} \enlargethispage{\baselineskip}
 %
 % 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}\oar{suftesi}\ar{frontespizio}
-% \end{ttquote}
-% 
-% 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 (see package documentation for details).
+% with the \opt{suftesi} option. It is meant only for Italian users
+% \parencite[see][version 1.4 or later]{Gregorio:frontespizio}:
+%\begin{latexcode}
+%\begin{verbatim}
+%\usepackage[suftesi]{frontespizio}
+%\end{verbatim}
+%\end{latexcode}
+% Note that this frontispiece requires the use of a logo which could be restricted by some institutions. So before using it you have to be sure that you have the required permissions.
 %
+% The \sty{frontespizio} package produces a frontispiece in the standard Computer Modern typeface. If you prefer a consistent font remember to load the needed packages or commands in the \cmd{Preambolo} command:
+%\begin{latexcode}
+%\begin{verbatim}
+%\begin{document}
+%...
+%  \begin{frontespizio} 
+%    \Preambolo{\usepackage[osf]{cochineal}}%  <===
+%    \Universita{Paperopoli} 
+%    \Dipartimento{Filosofia, Pedagogia e Psicologia} 
+%    \Corso[Laurea]{Filosofia} 
+%    \Annoaccademico{2030--2031} 
+%    \Titolo{La mia tesi:\\ una lunga serie di risultati\\
+%        difficilissimi e complicatissimi} 
+%    \Sottotitolo{Alcune considerazioni mutevoli} 
+%    \Candidato[vr12301231]{Paolo Rossi} 
+%    \Relatore{Guido Bianchi} 
+%  \end{frontespizio}
+%...
+%\end{document}
+%\end{verbatim}
+%\end{latexcode}
 %
-% \begin{figure}
-%\begin{tikzpicture}
-% \draw[draw=none,fill=gray!20,xshift=-10mm] (0,0) rectangle (13.9cm,20cm);
-% \draw[draw=none,fill=gray!5,xshift=-12mm,yshift=2mm] (0,0) rectangle (13.9,20cm);
-%\draw[line width=1.5mm,fill=sufred!50,text=white,draw=sufred!60] (1.2,18.1) circle (9mm) node {\parbox{12mm}{\centering\scriptsize * * * \\  St. Anford\\ University\\[1mm] * * * }};
+%
+%\begin{figure}
+% \centering
+%\begin{tikzpicture}[scale=0.9]
+% \draw[drop shadow,draw=none,fill=gray!2.5,xshift=-12mm,yshift=2mm] (0,0) rectangle (13.9,20cm);
+%\draw[line width=1.5mm,fill=sufred!50,text=white,draw=sufred!60] (1.2,18.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\  St. Anford\\ University\\[1mm] * * * }};
 %\node[anchor=north west] at (3cm,19cm) {%
 %  \parbox{8cm}{%
 %    \small University of St. Anford\par
@@ -545,7 +500,7 @@
 %      \vskip1ex\hrule\vskip1.2ex
 %        \large Ph.D. degree in \TeX{} and \LaTeX
 %
-% \vspace{4cm}
+% \vspace{3cm}
 %
 %    {\LARGE\sffamily\color{sufred} How to prepare\par
 %      a formal frontispiece\par}
@@ -553,7 +508,7 @@
 %      
 %      {\normalsize\sffamily Theory and practice\par}
 %
-% \vspace{3cm}
+% \vspace{2cm}
 %
 %    {\normalsize\sffamily Candidate:\par}
 %    \small Enrico Gregorio
@@ -565,27 +520,24 @@
 %
 %    {\normalsize\sffamily Research supervisors:\par}
 %    \small J. H. Quick\par 
-%     B. L. User\vspace{2.5cm}
+%     B. L. User\vspace{1.5cm}
 %
 % Thesis submitted in 2010
 % }
 %      };
 %
 %\end{tikzpicture}
-% \vspace{-4mm}
-%
 %\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
-% \end{figure}
+%\end{figure}
 %
 % \section{Options}\label{sec:options}
 %
 % \subsection{Layout}\label{sec:page-styles}
 %
 %\begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
-%\optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
-% \changes{v0.9b}{2012/09/23}{New option \opt{documentstructure}} 
-% \begin{valuelist}[3cm]
+%\optitem[book]{structure}{\opt{book}, \opt{article}, \opt{collection}}
+% \changes{v0.9b}{2012/09/23}{New option \opt{structure}} 
+% \begin{valuelist}
 % \item[book] For typesetting texts with chapters.
 % \item[article] For typesetting articles or short theses 
 % (that is  without chapter division).
@@ -601,7 +553,7 @@
 % 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}[3.2cm]
+%\begin{valuelist}
 %\item[periodical]
 % Prints a typeblock  of $\SI{17}{cm} \times \SI{24}{cm}$ with a text area of  $\SI{11}{cm} \times \SI{16,5}{cm}$.
 %\item[periodicalaureo] The same of \opt{periodical} but with a 
@@ -633,45 +585,50 @@
 % \end{valuelist}
 %\end{optionlist}
 %
-%\subsection{Fonts}
+%\subsection{Fonts}\label{sec:fonts}
 %
 % The first two options are available only with \LaTeX.
 % Using \XeLaTeX{} or \LuaLaTeX{} 
 % the default font is the Computer Modern but you can change it through 
-% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. With these engines I do suggest the EB Garamond or Linux Libertine font families.
+% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family. 
 % 
 %\begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
-% \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}, \opt{cochineal}, \opt{libertine}, \opt{palatino}, \opt{standard}}
 %   \begin{valuelist}
-%     \item[palatino] Loads the Palatino font family.
+%     \item[none] Does not load any font. Use this option 
+%		if you want full control over the font selection.
+%     \item[cochineal] Loads the Cochineal serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
+%     \item[libertine] Loads the Linux Libertine O serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
+%     \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisa} option offers a very good solution.
+%^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text.
 %     \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}}
+% \optitem[cbgreek]{greekfont}{\opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
-%     \item[artemisia] Loads the Artemisia font.
-%     \item[porson] Loads the Porson font.
-%     \item[cbgreek] Loads the standard CB~Greek font.
+%     \item[none] Does not load any Greek font.
+%     \item[artemisia] Loads the Artemisia font by the Greek Font Society.
+%     \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font 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.}
+%     \item[bodoni] Loads the Bodoni font by the Greek Font Society.
+%     \item[cbgreek] Loads the standard CB~Greek font by Claudio Beccari.
 %   \end{valuelist}
 % \end{optionlist}
 %
-%\noindent The next option is active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
 % \begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
 %   \begin{valuelist}
 %     \item[low] Prints lowercase \textsc{small capitals}.
 %     \item[upper] Prints \textsc{Small Capitals} without changing the case.
 %   \end{valuelist}
+%Active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
 % \end{optionlist}
 %
 % 	\subsection{Titles}\label{sec:titles}
 %
 % \begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[roman]{\meta{level}font}{\opt{roman}, \opt{italic}, 
 % \opt{smallcaps}}
 %   \begin{valuelist}
@@ -721,7 +678,6 @@
 %
 %
 % \begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, 
 % \opt{ragged}, \opt{leftpage}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
@@ -765,11 +721,10 @@
 % \subsection{Headings}
 %
 % \begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
 % \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}, 
 % \opt{elements}}
-%   \begin{valuelist}[3.1cm]
+%   \begin{valuelist}
 %     \item[inner] Prints the chapter title and the string ``Chapter~ 
 %     \meta{n}'' in the inner side 
 %      respectively of even and odd 
@@ -803,7 +758,6 @@
 % \subsection{Notes, lists, quotations}
 %
 % \begin{optionlist}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} 
 % \begin{valuelist}
@@ -816,7 +770,7 @@
 % \end{valuelist}
 % \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
-% \begin{valuelist}[2.3cm]
+% \begin{valuelist}
 % \item[footnotesize] 
 % Prints the block quotations 
 % in \cmd{footnotesize} size.
@@ -828,7 +782,7 @@
 % \opt{dotted}, \opt{superscript}}
 % \changes{v0.9b}{2012/09/23}{Changed \opt{standardfootnote} option 
 % and renamed to \opt{footnotestyle}}
-% \begin{valuelist}[2cm]
+% \begin{valuelist}
 % \item[bulged] The footnote number protrudes beyond the left margin.
 % \item[hung] 
 % Indents the footnote text, so it will hang 
@@ -870,7 +824,6 @@
 % \subsection{Other options}
 %
 %\begin{optionlist}
-% \settowidth{\labelwidth}{marginpar}
 % \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
 % \begin{valuelist}
@@ -887,17 +840,17 @@
 % \end{valuelist}
 %\boolitem[false]{partpage}
 % \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
-% \redtriangle{} This option is active only with \opt{documentstructure=article}.
+%  Active only with \opt{structure=article}.
 % \begin{valuelist}
 % \item[true] Prints the part title in a separate page as in 
-% \opt{documentstructure=book}
+% \opt{structure=book}
 % \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
 % \end{valuelist}
 % \optitem[false]{draftdate}{\opt{true}, \opt{false}}
 %  \changes{v1.0}{2012/10/14}{First stable release. Renamed option \opt{bozza} to \opt{draftdate}} 
 % If \opt{true} it prints the string ``Version of \meta{date}'' in the footer. It requires the \cmd{date}\ar{\meta{date}} command.
 %\boolitem[true]{crop}
-% \redtriangle{}  This option is actually useless. Use the \opt{version} option instead.
+%   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 
@@ -915,7 +868,7 @@
 % \begin{optionlist}
 % \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
 % \opt{smallcaps(1-6)}, \opt{elements}, \opt{sufelements}}
-% \begin{valuelist}[3cm]
+% \begin{valuelist}
 % \item[roman(1-6)] The titles of chapters and headers are printed 
 % in roman. The number of the chapter is on the same line in styles 
 % 1-3 and above the title in styles 4-6.
@@ -931,70 +884,7 @@
 % \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}
-% \begin{mdframed}[frametitle={The FSPL styles},linecolor=black!30,linewidth=1pt]
-% 
-% The following 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{optionlist}
-% \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
-%   \begin{valuelist}
-%     \item[FSPLa] Equal to: 
-%   \opt{pagelayout=periodical},
-%    \opt{style=roman1},\\
-%    \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{secstyle=center},
-%    \opt{quotestyle=right},
-%    \opt{footnotestyle=hung},
-%    \opt{liststyle=indented}.
-%    \opt{tocstyle=dotted}.
-%     \item[FSPLc] Equal to:
-%    \opt{pagelayout=periodical},
-%    \opt{style=smallcaps5},\\
-%    \opt{secfont=smallcaps},
-%    \opt{headerstyle=center},\\
-%    \opt{footnotestyle=dotted},
-%    \opt{liststyle=indented},\\
-%    \opt{tocstyle=leftpage}.
-%   \end{valuelist}
-% \end{optionlist}
-% \begin{ltxsyntax}
-% \cmditem{FSPLcolophon}
-% \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
-%
-% \hskip-2mm\parbox{12.5cm}{To typeset the colophon in the FSPL style (see example below), according to the\\ Joint Project \emph{Formal Style for PhD Theses with \LaTeX} of the Verona University~(Italy):}
-% 
-% \begin{minipage}{.85\textwidth}
-% \raggedright
-% \rule{\textwidth}{.4pt}
-%
-%\noindent\textcircled{\raisebox{1pt}{\scalebox{.7}{cc}}} \the\year{} \meta{Name Surname}%
-%\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/.
-%
-%\footnotesize
 %
-%\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.
-% \rule{\textwidth}{.4pt}
-% \end{minipage}
-% \end{ltxsyntax}
-% \end{mdframed}
 %
 % \section{New commands}\label{sec:commands}
 %
@@ -1022,7 +912,8 @@
 %\begin{verbatim}
 %\author{Name Surname
 %  \thanks{This work has been typeset with \LaTeX,
-%          using the  \textsf{suftesi} class by Ivan Valbusa}.}
+%          using the  \textsf{suftesi} class 
+%          by Ivan Valbusa}.}
 %\end{verbatim}
 %\end{latexcode}
 %
@@ -1041,8 +932,9 @@
 %    This work has been typeset with \LaTeX,
 %    using the  \textsf{suftesi} class
 %    by Ivan Valbusa\index{Valbusa, Ivan}.
-%    The normal font  is Palatino by Hermann Zapf.
-%    The sans serif font is Iwona by Janusz M.~Nowacki.}
+%    The serif font is Cochineal and the sans serif font 
+%    is Linux Biolinum O by Michael Sharpe.
+% }
 %\end{verbatim}
 %\end{latexcode}
 %
@@ -1057,16 +949,17 @@
 %\begin{verbatim}
 % \artcolophon{%
 %    This work is licensed under the Creative Commons 
-%    Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
-%    To view a copy of this license, visit
-%      \begin{center}
-%        \texttt{http://creativecommons.org/licenses/by-nc-nd/3.0}
-%      \end{center}
-%    or send a letter to Creative Commons, 444 Castro Street,
-%    Suite 900, Mountain View, California, 94041, USA.\\[1ex]
-%
-%    Typeset with \LaTeX,  using the \textsf{suftesi} class 
-%    by Ivan Valbusa.}
+%    Attribution-NonCommercial-NoDerivs 3.0 Unported 
+%    License. To view a copy of this license, visit
+%     \begin{center}
+%       http://creativecommons.org/licenses/by-nc-nd/3.0
+%     \end{center}
+%    or send a letter to Creative Commons, 444 
+%    Castro Street, Suite 900, Mountain View, 
+%    California, 94041, USA.\\[1ex]
+%
+%    Typeset with \LaTeX,  using the \textsf{suftesi} 
+%    class by Ivan Valbusa.}
 %\end{verbatim}
 %\end{latexcode}
 %
@@ -1078,7 +971,7 @@
 %
 % \end{ltxsyntax}
 %
-% \subsection[Breaking titles]{Breaking titles in text body, headers and table of contents}
+% \subsection[Breaking titles]{Breaking titles}
 %
 % \begin{ltxsyntax}
 % \cmditem{headbreak}
@@ -1086,7 +979,7 @@
 % A manual break which is active for the table of contents but not in the text or in the headers.
 %
 % \begin{latexcode}
-% \begin{verbatim}
+%\begin{verbatim}
 % \section{This title will be break here \headbreak{} 
 %     inside the table of contents}
 %\end{verbatim}
@@ -1096,7 +989,7 @@
 % A manual break which is active in the text but not in the headers and in the table of contents.
 %
 % \begin{latexcode}
-% \begin{verbatim}
+%\begin{verbatim}
 % \section{This title will be break here \xheadbreak{} 
 %     inside the text}
 %\end{verbatim}
@@ -1126,8 +1019,8 @@
 % symbols given in the optional argument (default=*).  
 % It does not increment the footnote counter.
 % \begin{ttquote}
-% \cmd{xfootnote}\oar{\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
-% \cmd{xfootnote}\oar{\cmd{textdagger}}\arm{Footnote text}
+% \cmd{xfootnote}\oar{\em\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
+% \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
 % \end{ttquote}
 % \end{ltxsyntax}
 %
@@ -1161,8 +1054,8 @@
 % \cmditem{chapnumfont}{name}
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% Sets the font of the chapter number of \opt{style=elements/sufelements} styles. 
-% The default is Palatino (\LaTeX) or Computer Modern  (\XeLaTeX{} and \LuaLaTeX). Using (pdf)\LaTeX{} you can change it simply giving the name of the font family. 
+% Sets the font of the chapter number of \opt{style=elements} and \opt{style=sufelements} styles. 
+% The default is Libertine (\LaTeX) or Computer Modern  (\XeLaTeX{} and \LuaLaTeX). 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{latexcode}
@@ -1178,8 +1071,8 @@
 %\end{latexcode}
 % \end{ltxsyntax} 
 %
-% \section{The \opt{collection} document structure}\label{sec:collection}
-% 
+% \section{Collections}\label{sec:collection}
+%
 % The \opt{collection} document structure is thought to compose a collection of papers. Each paper has to be typeset in a separate \file{.tex} inside the \env{article} environment:
 %\begin{latexcode}
 %\begin{verbatim}
@@ -1202,7 +1095,7 @@
 %
 %\begin{latexcode}
 %\begin{verbatim}
-% \documentclass[documentstructure=collection]{suftesi}
+% \documentclass[structure=collection]{suftesi}
 %
 % \begin{document}
 %  \input{article1}
@@ -1212,13 +1105,11 @@
 %\end{verbatim}
 %\end{latexcode}
 %
-%
 % \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}
-% \setlength{\labelwidth}{2.5cm}%
 % \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \opt{right}}
 %   \begin{valuelist}
 %     \item[left] Aligns the author-title block on the left.
@@ -1243,10 +1134,10 @@
 %     \item[italic] Prints the author's name in \emph{italic}.
 %     \item[smallcaps] Prints the author's name in \textsc{small caps}. 
 %
-%       \redtriangle{} Note that if you use this last option you need 
+%        Note that if you use this last option you need 
 %         to protect the \cmd{thanks} command:
 % \begin{latexcode}
-% \begin{verbatim}
+%\begin{verbatim}
 %\author{The Author\protect\thanks{...}}
 %\end{verbatim}
 % \end{latexcode}
@@ -1271,6 +1162,45 @@
 % Sets the editor(s) of the collection.
 %\end{ltxsyntax}
 %
+% \section{Backward compatibility}
+% \addcontentsline{toc}{section}{Backward compatibility}
+% \begin{optionlist}
+% \optitem{defaultfont}{\opt{compatibility}}
+% Loads the fonts of \sty{suftesi} v2.3 (or previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font (Artemisia) of those versions add the \opt{greekfont=artemisia} option.
+% \optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
+% An alias for \opt{structure}
+% \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
+% \end{optionlist}
+% These styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the Verona University  (Italy).
+%
+% 
+%
+% \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
+%\noindent The \cmd{FSPLcolophon}\ar{\meta{Name Surname}} command is provided to typeset the colophon according to these styles:
+%\medskip
+%
+%\noindent\rule{\textwidth}{.4pt}
+%
+%\noindent\textcircled{\raisebox{1pt}{\scalebox{.7}{cc}}} \the\year{} \meta{Name Surname}%
+%\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://creativecommons.org/licenses/by-nc-nd/3.0/.
+%
+%\footnotesize
+%
+%\bigskip
+%
+%\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 Janus M. Nowacki.
+%
+%
+%\noindent\rule{\textwidth}{.4pt}
 %
 % ^^A\section*{Obsolete options}
 %
@@ -1419,14 +1349,15 @@
 % ^^A \end{ltxsyntax}
 % ^^A \end{multicols}
 %
-%
 % \defbibnote{note}{\sffamily This bibliography has been typeset with 
 % the \sty{biblatex-philosophy} package, created by the same author of this class.}
+%
 % \addcontentsline{toc}{section}{\refname}
 % \printbibliography[prenote=note]
 %
 % \StopEventually{\PrintChanges\PrintIndex}
-% \section{The Code}
+%
+% \section*{The Code}
 % \iffalse
 %<*class>
 % \fi
@@ -1441,8 +1372,17 @@
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
   ******************************************}{}%
 \RequirePackage{xkeyval}
-\newif\ifsuftesi@standardfont 
+\newif\ifsuftesi@compatibility
+\newif\ifsuftesi@nofont 
+\newif\ifsuftesi@greekfont 
+\newif\ifsuftesi@standard
+\newif\ifsuftesi@cochineal
+\newif\ifsuftesi@libertine 
+\newif\ifsuftesi@palatino 
 \newif\ifsuftesi@porson 
+\newif\ifsuftesi@artemisia
+\newif\ifsuftesi@bodoni
+\newif\ifsuftesi@cbgreek
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@article
@@ -1498,8 +1438,19 @@
 \relax
 \LoadClass{book} 
 %    \end{macrocode}
-% \subsection{Document srtucture}
+% \subsection*{Document structure}
 %    \begin{macrocode}
+\define@choicekey{}{structure}[\val\nr]
+    {book,article,collection}[book]{%
+\ifcase\nr\relax
+\disable@keys{}{secnumstyle}
+\or
+\suftesi@articletrue
+\@titlepagefalse
+\or
+\suftesi@collectiontrue
+  \setkeys{}{headerstyle=authortitleinner}
+\fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
 \ifcase\nr\relax
@@ -1512,7 +1463,7 @@
   \setkeys{}{headerstyle=authortitleinner}
 \fi}
 %    \end{macrocode}
-% \subsection{Page layout}
+% \subsection*{Page layout}
 %    \begin{macrocode}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
@@ -1633,7 +1584,7 @@
 \or
 \fi}
 %    \end{macrocode}
-% \subsection{Sections style}
+% \subsection*{Sections style}
 %    \begin{macrocode}
 \define@choicekey{}{partstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
@@ -1708,7 +1659,7 @@
   \def\SUF@lr@SUBSUBSECSwitch{\filleft}
 \fi}
 %    \end{macrocode}
-% \subsection{Sections font}
+% \subsection*{Sections font}
 %    \begin{macrocode}
 \define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1751,7 +1702,7 @@
 \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \subsection{TOC font}
+% \subsection*{TOC font}
 %    \begin{macrocode}
 \define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1786,8 +1737,8 @@
 \def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \subsection{Sections number style}
-% \subsubsection{Part number style}
+% \subsection*{Sections number style}
+% \subsubsection*{Part number style}
 %    \begin{macrocode}
 \define@choicekey{}{partnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1817,7 +1768,7 @@
   \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Chapter number style}
+% \subsubsection*{Chapter number style}
 %    \begin{macrocode}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
 dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1847,7 +1798,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Section number style}
+% \subsubsection*{Section number style}
 %    \begin{macrocode}
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1888,8 +1839,9 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\suftesi@MakeTextLowercase{\relax}
 \fi}
 %    \end{macrocode}
-% \subsection{Headers}
-% \subsubsection{Header style}
+% \subsection*{Headers}
+%
+% \subsubsection*{Header style}
 %    \begin{macrocode}
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
@@ -1916,7 +1868,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \suftesi@elementsheadertrue
 \fi}
 %    \end{macrocode}
-% \subsubsection{Header font}
+% \subsubsection*{Header font}
 %    \begin{macrocode}
 \define@choicekey{}{headerfont}[\val\nr]
     {roman,italic,smallcaps}[roman]{%
@@ -1934,8 +1886,8 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
 \fi}
 %    \end{macrocode}
-% \subsection{Text elements}
-% \subsubsection{Lists}
+% \subsection*{Text elements}
+% \subsubsection*{Lists}
 %    \begin{macrocode}
 \RequirePackage[inline]{enumitem}
 \renewcommand\labelitemi{\color{sufgray}\textbullet}
@@ -1966,8 +1918,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     \setlist[itemize,3]{leftmargin=2.5\parindent}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Block quotations}
-% \paragraph{Quotation style}
+% \subsubsection*{Quotations}
 %    \begin{macrocode}
 \define@choicekey{}{quotestyle}[\val\nr]
     {center,right}[center]{%
@@ -1976,9 +1927,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
 \def\SUF@quote@style{}
 \fi}
-%    \end{macrocode}
-% \paragraph{Quotation size}
-%    \begin{macrocode}
 \define@choicekey{}{quotesize}[\val\nr]
     {footnotesize,small}[footnotesize]{%
 \ifcase\nr\relax
@@ -1987,7 +1935,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \def\SUF@quotation@size{\small}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Footnotes}
+% \subsubsection*{Footnotes}
 %    \begin{macrocode}
 \define@choicekey{}{footnotestyle}[\val\nr]
     {bulged,hung,dotted,superscript}[bulged]{%
@@ -2013,7 +1961,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \relax
 \fi}
 %    \end{macrocode}
-% \subsubsection{Captions}
+% \subsubsection*{Captions}
 %    \begin{macrocode}
 \RequirePackage{caption}
 \define@choicekey{}{captionstyle}[\val\nr]
@@ -2034,7 +1982,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi
 }
 %    \end{macrocode}
-% \subsubsection{Marginal notes}
+% \subsubsection*{Marginal notes}
 %    \begin{macrocode}
 \define@choicekey{}{marginpar}[\val\nr]
     {true,false}[true]{%
@@ -2043,7 +1991,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \renewcommand\marginpar[2][]{}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Table of contents}
+% \subsubsection*{Table of contents}
 %    \begin{macrocode}
 \define@choicekey{}{tocstyle}[\val\nr]{%
     standard,dotted,ragged,leftpage}[standard]{%
@@ -2092,32 +2040,43 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi
 }
 %    \end{macrocode}
-% \subsection{Fonts}
-% \subsubsection{Roman fonts}
+% \subsection*{Fonts}
+% \subsubsection*{Roman fonts}
 %    \begin{macrocode}
 \define@choicekey{}{defaultfont}[\val\nr]{%
-    palatino,standard}[palatino]{%
+    none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
 \ifcase\nr\relax
+  \suftesi@nofonttrue\suftesi@greekfontfalse
+\or
+  \suftesi@cochinealtrue
+\or
+  \suftesi@libertinetrue
+\or
+  \suftesi@palatinotrue
+\or
+  \suftesi@standardtrue
 \or
-  \suftesi@standardfonttrue
-	\def\SUF@greekfamily{lmr}
+  \suftesi@compatibilitytrue
 \fi}
 %    \end{macrocode}
-% \subsubsection{Greek fonts}
+% \subsubsection*{Greek fonts}
 %    \begin{macrocode}
 \define@choicekey{}{greekfont}[\val\nr]{%
-    artemisia,porson,cbgreek}[artemisia]{%
+    none,artemisia,porson,bodoni,cbgreek}[none]{%
 \ifcase\nr\relax
-	\def\SUF@greekfamily{artemisiaeuler}
+\suftesi@greekfontfalse
 \or
-	\def\SUF@greekfamily{porson}
-	\suftesi@porsontrue
+\suftesi@greekfonttrue\suftesi@artemisiatrue
 \or
-	\def\SUF@greekfamily{lmr}
+\suftesi@greekfonttrue\suftesi@porsontrue
+\or
+\suftesi@greekfonttrue\suftesi@bodonitrue
+\or
+\suftesi@greekfonttrue\suftesi@cbgreektrue
 \fi}
 %    \end{macrocode}
-% \subsection{Other options}
-% \subsubsection{Indentation}
+% \subsection*{Other options}
+% \subsubsection*{Indentation}
 %    \begin{macrocode}
 \define@choicekey{}{parindent}[\val\nr]
     {compact,wide}[compact]{%
@@ -2127,7 +2086,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \setlength\parindent{1.5em}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Part page}
+% \subsubsection*{Part page}
 %    \begin{macrocode}
 \define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
 \ifcase\nr\relax
@@ -2136,7 +2095,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \relax
 \fi}
 %    \end{macrocode}
-% \subsubsection{Crop marks}
+% \subsubsection*{Crop marks}
 %    \begin{macrocode}
 \define@choicekey{}{crop}[\val\nr]
     {true,false}[true]{%
@@ -2146,7 +2105,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \newcommand*\crop[1][]{}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Draftdate}
+% \subsubsection*{Draftdate}
 %    \begin{macrocode}
 \define@choicekey{}{draftdate}[\val\nr]
     {true,false}[true]{%
@@ -2155,7 +2114,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
 \fi}
 %    \end{macrocode}
-% \subsubsection{View mode}
+% \subsubsection*{View mode}
 %    \begin{macrocode}
 \define@choicekey{}{version}[\val\nr]
     {screen,draft,final}[draft]{%
@@ -2168,7 +2127,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \AtBeginDocument{\crop[off]}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Titlepage}
+% \subsubsection*{Titlepage}
 %    \begin{macrocode}
 \define@choicekey{}{titlepage}[\val\nr]
     {true,false}[true]{%
@@ -2178,7 +2137,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \@titlepagefalse
 \fi}
 %    \end{macrocode}
-% \subsubsection{Pre-defined styles}
+% \subsubsection*{Pre-defined styles}
 %    \begin{macrocode}
 \define@choicekey{}{style}[\val\nr]
   {roman1,roman2,roman3,roman4,roman5,roman6,
@@ -2190,7 +2149,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   [roman1]{%
 \ifcase\nr\relax
 %    \end{macrocode}
-% The 'roman' styles:
+% \paragraph{The `roman' styles}
 %    \begin{macrocode}
   \setkeys{}{chapstyle=left}
 \or
@@ -2205,7 +2164,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \setkeys{}{chapstyle=parright}
 \or
 %    \end{macrocode}
-% The 'italic' styles:
+% \paragraph{The `italic' styles}
 %    \begin{macrocode}
   \setkeys{}{
   chapstyle=left,
@@ -2285,7 +2244,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     headerfont=italic}
 \or
 %    \end{macrocode}
-% The 'smallcaps' styles:
+% \paragraph{The smallcaps' styles}
 %    \begin{macrocode}
   \setkeys{}{
   chapstyle=left,
@@ -2366,7 +2325,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   headerfont=smallcaps}
 \or
 %    \end{macrocode}
-% The 'elements' style:
+% \paragraph{The `elements' style}
 %    \begin{macrocode}
   \setkeys{}{
     pagelayout=elements,
@@ -2379,7 +2338,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle}
 \or
 %    \end{macrocode}
-% The 'sufelements' style:
+% \paragraph{The sufelements' style}
 %    \begin{macrocode}
   \setkeys{}{
     chapstyle=elements,
@@ -2390,7 +2349,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     {headerstyle,chapstyle,secfont,subsecfont}
 \or
 %    \end{macrocode}
-% The \opt{FSPLa} style:
+% \paragraph{The \opt{FSPL} styles}
 %    \begin{macrocode}
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
@@ -2403,15 +2362,12 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
 quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \or
-%    \end{macrocode}
-% The \opt{FSPLb} style:
-%    \begin{macrocode}
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%  
@@ -2424,15 +2380,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
 quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \or
-%    \end{macrocode}
-% The \opt{FSPLc} style:
-%    \begin{macrocode}
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%
@@ -2446,13 +2399,15 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
 quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \fi}
-% EXPERIMENTAL
+%    \end{macrocode}
+% \subsubsection*{Options for \opt{collection} document structure}
+%    \begin{macrocode}
 \define@choicekey{}{papertitlestyle}[\val\nr]{%
     left,center,right}[left]{%
 \ifcase\nr\relax
@@ -2486,14 +2441,15 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% Execute and process options:
+% \subsection*{Execute and process options}
 %    \begin{macrocode}
 \ExecuteOptionsX<>{
   captionstyle=standard,
   marginpar=true,
   parindent=compact,
   tocstyle=standard,
-  greekfont=artemisia,
+  defaultfont=cochineal,
+  greekfont=none,
   pagelayout=standard,
   headerstyle=inner,
   liststyle=bulged,
@@ -2550,7 +2506,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 %    \begin{macrocode}
 \def\XKV@classoptionslist{}
 %    \end{macrocode}
-% \subsection{Basic packages}
+% \subsection*{Basic packages}
 %    \begin{macrocode}
 \RequirePackage{color}
     \definecolor{sufred}{rgb}{0.5,0,0}
@@ -2570,7 +2526,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \def\@uclcnotmath#1#2#3#4{\begingroup #1%
     \def \({$}\let \)\(\def \NoCaseChange ##1{%
     \noexpand \NoCaseChange {\noexpand ##1}}%
-    \def\hyper@linkstart##1##2##3{$\valign$\noexpand\hyper@linkstart{##1}{##2}{%
+    \def\hyper@linkstart##1##2##3{%
+    $\valign$\noexpand\hyper@linkstart{##1}{##2}{%
     \noexpand\@skipmath #3
     ##3$\valign $}\noexpand\@skipmath}\def\hyper@linkend{%
     \noexpand\hyper@linkend}%
@@ -2580,8 +2537,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \def \cite ##1##{\toks@ {\noexpand \cite ##1}\@citex }%
     \def \@citex ##1{\NoCaseChange {\the \toks@ {##1}}}%
     \def \reserved@a ##1##2{\let #2\reserved@a }%
-    \expandafter \reserved@a \@uclclist \reserved@b {\reserved@b \@gobble }%
-    \protected@edef \reserved@a {\endgroup\noexpand \@skipmath #3#4$\valign $}%
+    \expandafter \reserved@a \@uclclist \reserved@b %
+    {\reserved@b \@gobble }%
+    \protected@edef \reserved@a {\endgroup\noexpand %
+    \@skipmath #3#4$\valign $}%
     \reserved@a}}{}}
 %    \end{macrocode}
 % The FSPL style requires a verbose colophon which uses specific icons:
@@ -2591,8 +2550,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  \else
 \fi
 %    \end{macrocode}
-% \subsection{Greek fonts}
-% Thanks to Claudio Beccari and Enrico Gregorio for these macros:
+% \subsection*{Greek fonts}
 %    \begin{macrocode}
 \ifthenelse{\boolean{xetex}\or\boolean{luatex}}
 {% if xetex or luatex
@@ -2618,74 +2576,247 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
-\ifsuftesi@standardfont
+\ifsuftesi@nofont\relax
+\else
+\ifsuftesi@standard
      \RequirePackage{lmodern}
-  \relax
-   \else
-     \RequirePackage[osf,sc]{mathpazo}
-     \RequirePackage[scaled=0.8]{beramono}
-       \renewcommand{\sfdefault}{iwona}
-\AtBeginDocument{
-\substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
-  \DeclareRobustCommand{\greektext}{%
-     \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
-     \def\encodingdefault{LGR}}
-  \DeclareTextFontCommand{\textgreek}{\greektext}
-    }
+      \else
+    \ifsuftesi@compatibility
+      \RequirePackage[osf,sc]{mathpazo}
+      \RequirePackage[scaled=0.8]{beramono}
+        \renewcommand{\sfdefault}{iwona}
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.955}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.97}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.18}
+      \else
+      \fi 
+      \fi 
+      \fi 
+    \else
+    \ifsuftesi@palatino
+    \RequirePackage[full]{textcomp}
+         \RequirePackage[osf]{newpxtext}
+         \RequirePackage[scaled=1.06]{biolinum}
+         \RequirePackage[varqu,varl]{inconsolata}
+         \RequirePackage[bigdelims,vvarbb]{newpxmath}
+         \RequirePackage[cal=boondoxo]{mathalfa} 
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.955}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.97}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.18}
+      \else
+      \fi 
+      \fi 
+      \fi 
+\else
+    \ifsuftesi@libertine
+    \RequirePackage{textcomp}
+         \RequirePackage[sb]{libertine}
+         \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+         \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
+         \RequirePackage[cal=boondoxo]{mathalfa} 
+         \useosf
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.89}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.91}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.08}
+      \else
+      \fi 
+      \fi 
+      \fi 
+    \else
+    \ifsuftesi@cochineal
+    \RequirePackage{textcomp}
+        \RequirePackage{cochineal}
+        \RequirePackage[varqu,varl,var0]{inconsolata}
+        \RequirePackage{biolinum}
+        \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+        \RequirePackage[cal=boondoxo]{mathalfa}
+        \useosf
+        \useproportional
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.88}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.89}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.04}
+      \else
+      \fi 
+      \fi 
+      \fi 
+    \else
+    \fi
+    \fi
+    \fi
+    \fi
+    \fi
+    \fi
 %    \end{macrocode}
-% Thanks to Claudio Beccari for these macros.
+% The greek fonts are available only with \opt{palatino}, \opt{libertine} and \opt{cochineal} options.
 %    \begin{macrocode}
- \DeclareFontFamily{LGR}{pplj}{}
- \DeclareFontShape{LGR}{pplj}{m}{n}{<->ssub * lmr/m/n}{}
- \DeclareFontShape{LGR}{pplj}{m}{it}{<->ssub * lmr/m/it}{}
- \DeclareFontShape{LGR}{pplj}{m}{sl}{<->ssub * lmr/m/sl}{}
- \DeclareFontShape{LGR}{pplj}{m}{sc}{<->ssub * lmr/m/sc}{}
- \DeclareFontShape{LGR}{pplj}{b}{n}{<->ssub * lmr/bx/n}{}
- \DeclareFontShape{LGR}{pplj}{b}{it}{<->ssub * lmr/bx/it}{}
- \DeclareFontShape{LGR}{pplj}{b}{sl}{<->ssub * lmr/bx/sl}{}
- \DeclareFontShape{LGR}{pplj}{b}{sc}{<->ssub * lmr/bx/sc}{}
- \DeclareFontShape{LGR}{pplj}{bx}{n}{<->ssub * lmr/bx/n}{}
- \DeclareFontShape{LGR}{pplj}{bx}{it}{<->ssub * lmr/bx/it}{}
- \DeclareFontShape{LGR}{pplj}{bx}{sl}{<->ssub * lmr/bx/sl}{}
- \DeclareFontShape{LGR}{pplj}{bx}{sc}{<->ssub * lmr/bx/sc}{} 
- \DeclareFontShape{LGR}{pplj}{m}{li}{<->ssub * lmr/m/li}{}
- \DeclareFontShape{LGR}{pplj}{b}{li}{<->ssub * lmr/b/li}{}
- \DeclareFontShape{LGR}{pplj}{bx}{li}{<->ssub * lmr/bx/li}{}
- \DeclareFontShape{LGR}{pplj}{m}{ui}{<->ssub * lmr/m/ui}{}
- \DeclareFontShape{LGR}{pplj}{b}{ui}{<->ssub * lmr/m/ui}{}
- \DeclareFontShape{LGR}{pplj}{bx}{ui}{<->ssub * lmr/bx/ui}{}
- \DeclareFontShape{LGR}{pplj}{m}{rs}{<->ssub * lmr/m/rs}{}
- \DeclareFontShape{LGR}{pplj}{b}{rs}{<->ssub * lmr/m/rs}{}
- \DeclareFontShape{LGR}{pplj}{bx}{rs}{<->ssub * lmr/bx/rs}{}
+\ifsuftesi@greekfont
+\ifsuftesi@artemisia
+  \def\SUF@greekfamily{artemisia}
+    \else
+      \ifsuftesi@porson
+        \def\SUF@greekfamily{porson}
+             \else
+            \ifsuftesi@bodoni
+          \def\SUF@greekfamily{bodoni}
+          \else
+            \ifsuftesi@cbgreek
+           \def\SUF@greekfamily{lmr}
+        \else
+      \fi
+    \fi
+  \fi
 \fi
 %    \end{macrocode}
-% Scale the Porson font:
+% Thanks to Claudio Beccari for this macro.
 %    \begin{macrocode}
-\ifsuftesi@porson
-\sbox\z@{\fontsize{10}{10}\normalfont A}
-\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
-\dimen@=\dimexpr \p@*\ht\z@/\ht\tw@\relax
-\sbox\z@{\normalfont\fontsize{10}{10}\selectfont a}
-\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp a}
-\dimen2=\dimexpr \p@*\ht\z@/\ht\tw@\relax
-\dimen4= 0.6\p@
-\dimen@=\dimexpr \dimen@ - \dimen4*\dimen@/\p@+\dimen4*\dimen2/\p@\relax
-\edef\art@scale{\strip@pt\dimen@}
-	\DeclareFontFamily{LGR}{porson}{} 
-	\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{} 
-	\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{b}{n}  {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{} 
-   \fi
+\AtBeginDocument{
+  \substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
+      \DeclareRobustCommand{\greektext}{%
+         \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
+         \def\encodingdefault{LGR}}
+      \DeclareTextFontCommand{\textgreek}{\greektext}}
+\else
+\fi
+% \DeclareFontFamily{LGR}{pplj}{}
+% \DeclareFontShape{LGR}{pplj}{m}{n}{<->ssub * lmr/m/n}{}
+% \DeclareFontShape{LGR}{pplj}{m}{it}{<->ssub * lmr/m/it}{}
+% \DeclareFontShape{LGR}{pplj}{m}{sl}{<->ssub * lmr/m/sl}{}
+% \DeclareFontShape{LGR}{pplj}{m}{sc}{<->ssub * lmr/m/sc}{}
+% \DeclareFontShape{LGR}{pplj}{b}{n}{<->ssub * lmr/bx/n}{}
+% \DeclareFontShape{LGR}{pplj}{b}{it}{<->ssub * lmr/bx/it}{}
+% \DeclareFontShape{LGR}{pplj}{b}{sl}{<->ssub * lmr/bx/sl}{}
+% \DeclareFontShape{LGR}{pplj}{b}{sc}{<->ssub * lmr/bx/sc}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{n}{<->ssub * lmr/bx/n}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{it}{<->ssub * lmr/bx/it}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{sl}{<->ssub * lmr/bx/sl}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{sc}{<->ssub * lmr/bx/sc}{}
+% \DeclareFontShape{LGR}{pplj}{m}{li}{<->ssub * lmr/m/li}{}
+% \DeclareFontShape{LGR}{pplj}{b}{li}{<->ssub * lmr/b/li}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{li}{<->ssub * lmr/bx/li}{}
+% \DeclareFontShape{LGR}{pplj}{m}{ui}{<->ssub * lmr/m/ui}{}
+% \DeclareFontShape{LGR}{pplj}{b}{ui}{<->ssub * lmr/m/ui}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{ui}{<->ssub * lmr/bx/ui}{}
+% \DeclareFontShape{LGR}{pplj}{m}{rs}{<->ssub * lmr/m/rs}{}
+% \DeclareFontShape{LGR}{pplj}{b}{rs}{<->ssub * lmr/m/rs}{}
+% \DeclareFontShape{LGR}{pplj}{bx}{rs}{<->ssub * lmr/bx/rs}{}
+%\ifsuftesi@porson
+%\sbox\z@{\fontsize{10}{10}\normalfont A}
+%\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
+%\dimen@=\dimexpr \p@*\ht\z@/\ht\tw@\relax
+%\sbox\z@{\normalfont\fontsize{10}{10}\selectfont a}
+%\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp a}
+%\dimen2=\dimexpr \p@*\ht\z@/\ht\tw@\relax
+%\dimen4= 0.6\p@
+%\dimen@=\dimexpr \dimen@ - \dimen4*\dimen@/\p@+\dimen4*\dimen2/\p@\relax
+%\edef\art@scale{\strip@pt\dimen@}
+%\DeclareFontFamily{LGR}{porson}{}
+%\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{}
+%\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{b}{n}  {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
+%\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
+%   \fi
 }
 %    \end{macrocode}
-% \subsection{Page layout}
+% 
+%    \begin{macrocode}
+\ifsuftesi@nofont
+  \ifsuftesi@greekfont
+    \ClassError{suftesi}
+          {'greekfont' option\MessageBreak
+          You can not use 'greekfont' option\MessageBreak
+          with 'defaultfont=none' option\MessageBreak
+          Set 'greekfont=none' or do not load\MessageBreak 
+          the 'greekfont' option}
+          {'greekfont' option\MessageBreak
+          You can not use 'greekfont' option\MessageBreak
+          with 'defaultfont=none' option\MessageBreak
+          Set 'greekfont=none' or do not load\MessageBreak 
+          the 'greekfont' option}
+      \else
+    \fi
+  \else
+\fi
+
+\ifxetex
+  \else
+    \ifsuftesi@greekfont
+\DeclareFontFamily{LGR}{bodoni}{}
+\DeclareFontShape{LGR}{bodoni}{m}{n}{<-> s * [\SUFfntscale] gbodonirg6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{it}{<-> s * [\SUFfntscale] gbodonii6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{n}{<-> s * [\SUFfntscale] gbodonib6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{it}{<-> s * [\SUFfntscale] gbodonibi6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sl}{<-> s * [\SUFfntscale] gbodonio6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{sl}{<-> s * [\SUFfntscale] gbodonibo6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sc}{<-> s * [\SUFfntscale] gbodonisc6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sco}{<-> s * [\SUFfntscale] gbodonisco6a}{}
+
+\DeclareFontShape{LGR}{bodoni}{bx}{n}{<-> s * [\SUFfntscale] gbodonib6a}{}
+\DeclareFontShape{LGR}{bodoni}{bx}{it}{<-> s * [\SUFfntscale] gbodonibi6a}{}
+\DeclareFontShape{LGR}{bodoni}{bx}{sl}{<-> s * [\SUFfntscale] gbodonibo6a}{}
+
+\DeclareFontFamily{LGR}{artemisia}{}
+\DeclareFontShape{LGR}{artemisia}{m}{n}{<-> s * [\SUFfntscale] gartemisiarg6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{it}{<-> s * [\SUFfntscale] gartemisiai6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{n}{<-> s * [\SUFfntscale] gartemisiab6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{it}{<-> s * [\SUFfntscale] gartemisiabi6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sl}{<-> s * [\SUFfntscale] gartemisiao6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{sl}{<-> s * [\SUFfntscale] gartemisiabo6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sc}{<-> s * [\SUFfntscale] gartemisiasc6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sco}{<-> s * [\SUFfntscale] gartemisiasco6a}{}
+
+\DeclareFontShape{LGR}{artemisia}{bx}{n}{<-> s * [\SUFfntscale] gartemisiab6a}{}
+\DeclareFontShape{LGR}{artemisia}{bx}{it}{<-> s * [\SUFfntscale] gartemisiabi6a}{}
+\DeclareFontShape{LGR}{artemisia}{bx}{sl}{<-> s * [\SUFfntscale] gartemisiabo6a}{}
+
+\DeclareFontFamily{LGR}{porson}{}
+\DeclareFontShape{LGR}{porson}{m}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{sc}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+
+\DeclareFontShape{LGR}{porson}{bx}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{bx}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\else
+  \ifsuftesi@nofont
+    \else
+      \ifsuftesi@standard
+        \else
+      \fi
+    \fi
+  \fi
+\fi
+%    \end{macrocode}
+% \subsection*{Page layout}
 %    \begin{macrocode}
 \ifsuftesi@nocrop
   \relax
@@ -2701,7 +2832,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
    \geometry{hmarginratio=1:1}
 \fi
 %    \end{macrocode}
-% \subsection{Section titles}
+% \subsection*{Section titles}
 %    \begin{macrocode}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
@@ -2726,15 +2857,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \chapnumfont{pplj}
   }
 %    \end{macrocode}
-% \paragraph{The \opt{elements} style} 
+% The chapter for \opt{elements} style:
 %    \begin{macrocode}
 \define@key[SUF]{elements}{chapsize}[90]{%
   \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}}
 \define@key[SUF]{elements}{chapposition}[-83]{%
   \def\cmdSUF@elements@chapposition{#1}}
-%    \end{macrocode}
-% The chapter for \opt{elements} style:
-%    \begin{macrocode}
 \def\SUF@elements@CHAPTER{%
   \titleformat{\chapter}[block]
      {\Large}%
@@ -2920,14 +3048,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \fi
 \fi
 %    \end{macrocode}
-% \subparagraph{Redefinitions for \opt{`article'} mode}
+% \paragraph{Redefinitions for \opt{`article'} mode}
 %    \begin{macrocode}
 \ifsuftesi@article
 \def\chapter#1{\ClassError{suftesi}
   {\noexpand\chapter level is undefined 
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {\noexpand\chapter level is undefined 
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
   \setcounter{tocdepth}{3}
     \setcounter{secnumdepth}{3}
  		  \renewcommand\thesection{%
@@ -2969,7 +3097,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \fi
 \else
 %    \end{macrocode}
-% \subparagraph{The default \opt{`book'} mode}
+% \paragraph{The default \opt{`book'} mode}
 %    \begin{macrocode}
 \ifsuftesi@numparpart
 \titleformat{\part}[display]
@@ -3078,7 +3206,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 }%
 \fi
 %    \end{macrocode}
-% \subsection{Title page}
+% \subsection*{Title page}
 % The new \cmd{title} command has an optional argument 
 % which can be used in the headers.
 %    \begin{macrocode}
@@ -3294,7 +3422,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \vskip 1.5em}
 \fi
 %    \end{macrocode}
-% \subsection{The \opt{collection} document structure}
+% \subsection*{The \opt{collection} document structure}
 %    \begin{macrocode}
 \ifsuftesi@collection
 \newcounter{journalnumber}
@@ -3337,7 +3465,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     No \noexpand\collectioneditor given}}
 %    \end{macrocode}
 %    \begin{macrocode}
-\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
+\renewcommand*{\title}[2][]{%
+  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
     \edef\title{\noexpand\@dblarg
   \expandafter\noexpand\csname\string\title\endcsname}
     \def\@headtitle{--missing title--%
@@ -3373,9 +3502,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
               \ClassError{suftesi}
                 {\MessageBreak
                 You can not use tocstyle=leftpage\MessageBreak
-                  with documentstructure=collection}
+                  with structure=collection}
                 {You can not use tocstyle=leftpage\MessageBreak
-                  with documentstructure=collection}
+                  with structure=collection}
             \else
           \nobreak\hfill #2\par
         \fi
@@ -3436,7 +3565,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \csname toc@entry@\endcsname
     \begingroup%
     \let\thanks\@gobble
-    \addcontentsline{toc}{title}{\normalfont{\@author}\texorpdfstring{\newline}{, }%
+    \addcontentsline{toc}{title}{%
+    \normalfont{\@author}\texorpdfstring{\newline}{, }%
     \itshape\@headtitle}
     \endgroup%
     \par\nobreak\vspace{2ex}
@@ -3506,7 +3636,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \else
 \fi
 %    \end{macrocode}
-% \subsection{Frontispiece}
+% \subsection*{Frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
 \@ifpackagewith{frontespizio}{suftesi}
@@ -3569,7 +3699,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
                 \let\item\@idxitem}
                {\if@restonecol\onecolumn\else\clearpage\fi}
 %    \end{macrocode}
-% \subsection{Appendix}
+% \subsection*{Appendix}
 %    \begin{macrocode}
 \newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
     \appendicesname{Appendici}
@@ -3634,7 +3764,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
 \fi
 %    \end{macrocode}
-% \subsection{Headings}
+% \subsection*{Headings}
 %    \begin{macrocode}
 \RequirePackage{fancyhdr}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -3736,9 +3866,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
 }
 %    \end{macrocode}
-% \subsection{Text elements}
+% \subsection*{Text elements}
 %
-% \subsubsection{Block Quotations}
+% \paragraph{Block Quotations}
 %
 % New environments for block quotations according to a popular Italian style. 
 % The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
@@ -3792,12 +3922,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \xdef\@thefnmark{#1}%
     \@footnotemark\@footnotetext}
 %    \end{macrocode}
-% \subsubsection{Marginal notes}
+% \paragraph{Marginal notes}
 % The |\marginpar| command is redefined according to the look 
 % of \emph{Classic Thesis} by 
 % André \textcite{Miede:2011}\index{Miede, André}. 
-% Thanks to Lorenzo Pantieri\index{Pantieri, Lorenzo} 
-% and Enrico Gregorio\index{Gregorio, Enrico}.
 %    \begin{macrocode}
 \def\SUF@mpsetup{%
 %    \end{macrocode}
@@ -3839,7 +3967,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 }
 {\relax}}
 %    \end{macrocode}
-% \subsubsection{Abstract}
+% \paragraph{Abstract}
 %    \begin{macrocode}
 \ifsuftesi@collection
   \newenvironment{abstract}{%
@@ -3880,7 +4008,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \fi
 \newcommand\abstractname{Abstract}
 %    \end{macrocode}
-% \subsubsection{Colophon or copyright notice} 
+% \paragraph{Colophon or copyright notice} 
 %    \begin{macrocode}
 \newcommand{\colophon}[3][]{%
   \thispagestyle{empty}
@@ -3968,7 +4096,7 @@ Janusz M. Nowacki.
      only for the FSPL styles}}
 \fi
 %    \end{macrocode}
-% \subsection{Toc, lof, lot}
+% \subsection*{Toc, lof, lot}
 %    \begin{macrocode}
 \RequirePackage{titletoc}
 %    \end{macrocode}
@@ -4041,7 +4169,7 @@ Janusz M. Nowacki.
   {}
   [\addvspace{1ex}]
 %    \end{macrocode}
-% \subsubsection{'\opt{tocpageleft}' toc}
+% \paragraph{`\opt{tocpageleft}' toc}
 %    \begin{macrocode}
 \ifsuftesi@pagelefttoc
 %    \end{macrocode}
@@ -4186,7 +4314,7 @@ Janusz M. Nowacki.
   {}
 \else
 %    \end{macrocode}
-% \subsubsection{Default toc}
+% \paragraph{Default toc}
 %    \begin{macrocode}
 \AtBeginDocument{
 \newlength\SUF@tocindent@chap
@@ -4416,15 +4544,15 @@ Janusz M. Nowacki.
     }
 \fi
 %    \end{macrocode}
-% \subsection{New commands}
+% \subsection*{New commands}
 %    \begin{macrocode}
 \ifsuftesi@article
 \def\chapterintro{%
 \ClassError{suftesi}
   {Command \noexpand\chapterintro is undefined\MessageBreak 
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\chapterintro is undefined\MessageBreak 
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \else
 \def\chapterintro{
   \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
@@ -4435,7 +4563,7 @@ Janusz M. Nowacki.
 \chapterintroname{Introduzione}
 \fi
 %    \end{macrocode}
-% \subsubsection{Manual breaks}
+% \paragraph{Manual breaks}
 % Active in the table of contents but not in the text.
 %    \begin{macrocode}
 \newif\ifheadbreak\headbreakfalse
@@ -4454,7 +4582,7 @@ Janusz M. Nowacki.
     \begingroup\headbreaktrue\xheadbreakfalse%
   \origtableofcontents\endgroup}
 %    \end{macrocode}
-% \subsubsection{Backward compatibility}
+% \paragraph{Backward compatibility}
 % An environment to manually typeset the bibliography. (Use \sty{biblatex} instead!)
 %    \begin{macrocode}
 \newenvironment{bibliografia}{%
@@ -4489,26 +4617,26 @@ Janusz M. Nowacki.
   {\endlist}
 %    \end{macrocode}
 %
-% \subsection{Final settings}
+% \subsection*{Final settings}
 % Renew  |\frontmatter| to have arabic page numbering:
 %
 %    \begin{macrocode}
 \ifsuftesi@article
 \renewcommand\frontmatter{\ClassError{suftesi}
   {Command \noexpand\frontmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\frontmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \renewcommand\mainmatter{\ClassError{suftesi}
   {Command \noexpand\mainmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\mainmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \renewcommand\backmatter{\ClassError{suftesi}
   {Command \noexpand\backmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\backmatter is undefined\MessageBreak 
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \else
 \renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse} 
 \renewcommand\mainmatter{\cleardoublepage\@mainmattertrue} 
@@ -4530,7 +4658,7 @@ Janusz M. Nowacki.
 \let\hemph\emph
 %    \end{macrocode}
 % The first line of all sections is indented by default
-% using \XeLaTeX{} with italian as main language. Anyway this is 
+% using \XeLaTeX{} with Italian as the main language. Anyway this is 
 % incongruous with the \LaTeX{} default.
 %    \begin{macrocode}
 \ifthenelse{\boolean{xetex}\or\boolean{luatex}}
@@ -4545,7 +4673,6 @@ Janusz M. Nowacki.
 %</class>
 % \fi
 %
-% \restoregeometry
 %
 % \iffalse
 %<*bib>
@@ -4657,6 +4784,21 @@ Janusz M. Nowacki.
   Title = {Gestire la bibliografia con {\LaTeX}},
   Volume = {6},
   Year = {2008}}
+
+
+@article{valbusa:20122,
+	Author = {Ivan Valbusa},
+	Date = {2012},
+	Date-Added = {2013-08-23 10:45:16 +0200},
+	Date-Modified = {2013-08-23 10:48:03 +0200},
+	Journaltitle = {\Ars},
+	Month = {10},
+	Number = {14},
+	Pages = {15-30},
+	Subtitle = {La classe suftesi},
+	Title = {La forma del testo umanistico}}
+
 %</bib>
 % \fi
+%
 % \Finale
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 245076d2c02..fa415411daa 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,7 +19,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2015/09/19 v2.3 A class for typesetting theses, books and articles]
+    [2016/02/26 v2.4 A class for typesetting theses, books and articles]
+%%
+%% \subsection*{Feedback}
+ % \begin{table}[h]
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
@@ -30,8 +33,17 @@
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
   ******************************************}{}%
 \RequirePackage{xkeyval}
-\newif\ifsuftesi@standardfont
+\newif\ifsuftesi@compatibility
+\newif\ifsuftesi@nofont
+\newif\ifsuftesi@greekfont
+\newif\ifsuftesi@standard
+\newif\ifsuftesi@cochineal
+\newif\ifsuftesi@libertine
+\newif\ifsuftesi@palatino
 \newif\ifsuftesi@porson
+\newif\ifsuftesi@artemisia
+\newif\ifsuftesi@bodoni
+\newif\ifsuftesi@cbgreek
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@article
@@ -83,6 +95,17 @@
 \ProcessOptions
 \relax
 \LoadClass{book}
+\define@choicekey{}{structure}[\val\nr]
+    {book,article,collection}[book]{%
+\ifcase\nr\relax
+\disable@keys{}{secnumstyle}
+\or
+\suftesi@articletrue
+\@titlepagefalse
+\or
+\suftesi@collectiontrue
+  \setkeys{}{headerstyle=authortitleinner}
+\fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
 \ifcase\nr\relax
@@ -619,21 +642,32 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi
 }
 \define@choicekey{}{defaultfont}[\val\nr]{%
-    palatino,standard}[palatino]{%
+    none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
 \ifcase\nr\relax
+  \suftesi@nofonttrue\suftesi@greekfontfalse
 \or
-  \suftesi@standardfonttrue
-\def\SUF@greekfamily{lmr}
+  \suftesi@cochinealtrue
+\or
+  \suftesi@libertinetrue
+\or
+  \suftesi@palatinotrue
+\or
+  \suftesi@standardtrue
+\or
+  \suftesi@compatibilitytrue
 \fi}
 \define@choicekey{}{greekfont}[\val\nr]{%
-    artemisia,porson,cbgreek}[artemisia]{%
+    none,artemisia,porson,bodoni,cbgreek}[none]{%
 \ifcase\nr\relax
-\def\SUF@greekfamily{artemisiaeuler}
+\suftesi@greekfontfalse
+\or
+\suftesi@greekfonttrue\suftesi@artemisiatrue
 \or
-\def\SUF@greekfamily{porson}
-\suftesi@porsontrue
+\suftesi@greekfonttrue\suftesi@porsontrue
 \or
-\def\SUF@greekfamily{lmr}
+\suftesi@greekfonttrue\suftesi@bodonitrue
+\or
+\suftesi@greekfonttrue\suftesi@cbgreektrue
 \fi}
 \define@choicekey{}{parindent}[\val\nr]
     {compact,wide}[compact]{%
@@ -883,7 +917,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -901,7 +935,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -920,7 +954,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{documentstructure,pagelayout,partfont,chapfont,secfont,%
+{structure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -963,7 +997,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   marginpar=true,
   parindent=compact,
   tocstyle=standard,
-  greekfont=artemisia,
+  defaultfont=cochineal,
+  greekfont=none,
   pagelayout=standard,
   headerstyle=inner,
   liststyle=bulged,
@@ -1022,7 +1057,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \def\@uclcnotmath#1#2#3#4{\begingroup #1%
     \def \({$}\let \)\(\def \NoCaseChange ##1{%
     \noexpand \NoCaseChange {\noexpand ##1}}%
-    \def\hyper@linkstart##1##2##3{$\valign$\noexpand\hyper@linkstart{##1}{##2}{%
+    \def\hyper@linkstart##1##2##3{%
+    $\valign$\noexpand\hyper@linkstart{##1}{##2}{%
     \noexpand\@skipmath #3
     ##3$\valign $}\noexpand\@skipmath}\def\hyper@linkend{%
     \noexpand\hyper@linkend}%
@@ -1032,8 +1068,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \def \cite ##1##{\toks@ {\noexpand \cite ##1}\@citex }%
     \def \@citex ##1{\NoCaseChange {\the \toks@ {##1}}}%
     \def \reserved@a ##1##2{\let #2\reserved@a }%
-    \expandafter \reserved@a \@uclclist \reserved@b {\reserved@b \@gobble }%
-    \protected@edef \reserved@a {\endgroup\noexpand \@skipmath #3#4$\valign $}%
+    \expandafter \reserved@a \@uclclist \reserved@b %
+    {\reserved@b \@gobble }%
+    \protected@edef \reserved@a {\endgroup\noexpand %
+    \@skipmath #3#4$\valign $}%
     \reserved@a}}{}}
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
@@ -1063,66 +1101,192 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
-\ifsuftesi@standardfont
+\ifsuftesi@nofont\relax
+\else
+\ifsuftesi@standard
      \RequirePackage{lmodern}
-  \relax
-   \else
-     \RequirePackage[osf,sc]{mathpazo}
-     \RequirePackage[scaled=0.8]{beramono}
-       \renewcommand{\sfdefault}{iwona}
+      \else
+    \ifsuftesi@compatibility
+      \RequirePackage[osf,sc]{mathpazo}
+      \RequirePackage[scaled=0.8]{beramono}
+        \renewcommand{\sfdefault}{iwona}
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.955}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.97}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.18}
+      \else
+      \fi
+      \fi
+      \fi
+    \else
+    \ifsuftesi@palatino
+    \RequirePackage[full]{textcomp}
+         \RequirePackage[osf]{newpxtext}
+         \RequirePackage[scaled=1.06]{biolinum}
+         \RequirePackage[varqu,varl]{inconsolata}
+         \RequirePackage[bigdelims,vvarbb]{newpxmath}
+         \RequirePackage[cal=boondoxo]{mathalfa}
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.955}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.97}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.18}
+      \else
+      \fi
+      \fi
+      \fi
+\else
+    \ifsuftesi@libertine
+    \RequirePackage{textcomp}
+         \RequirePackage[sb]{libertine}
+         \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+         \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
+         \RequirePackage[cal=boondoxo]{mathalfa}
+         \useosf
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.89}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.91}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.08}
+      \else
+      \fi
+      \fi
+      \fi
+    \else
+    \ifsuftesi@cochineal
+    \RequirePackage{textcomp}
+        \RequirePackage{cochineal}
+        \RequirePackage[varqu,varl,var0]{inconsolata}
+        \RequirePackage{biolinum}
+        \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+        \RequirePackage[cal=boondoxo]{mathalfa}
+        \useosf
+        \useproportional
+      \ifsuftesi@bodoni
+      \def\SUFfntscale{0.88}
+      \else
+      \ifsuftesi@artemisia
+      \def\SUFfntscale{0.89}
+      \else
+      \ifsuftesi@porson
+      \def\SUFfntscale{1.04}
+      \else
+      \fi
+      \fi
+      \fi
+    \else
+    \fi
+    \fi
+    \fi
+    \fi
+    \fi
+    \fi
+\ifsuftesi@greekfont
+\ifsuftesi@artemisia
+  \def\SUF@greekfamily{artemisia}
+    \else
+      \ifsuftesi@porson
+        \def\SUF@greekfamily{porson}
+             \else
+            \ifsuftesi@bodoni
+          \def\SUF@greekfamily{bodoni}
+          \else
+            \ifsuftesi@cbgreek
+           \def\SUF@greekfamily{lmr}
+        \else
+      \fi
+    \fi
+  \fi
+\fi
 \AtBeginDocument{
-\substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
-  \DeclareRobustCommand{\greektext}{%
-     \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
-     \def\encodingdefault{LGR}}
-  \DeclareTextFontCommand{\textgreek}{\greektext}
-    }
- \DeclareFontFamily{LGR}{pplj}{}
- \DeclareFontShape{LGR}{pplj}{m}{n}{<->ssub * lmr/m/n}{}
- \DeclareFontShape{LGR}{pplj}{m}{it}{<->ssub * lmr/m/it}{}
- \DeclareFontShape{LGR}{pplj}{m}{sl}{<->ssub * lmr/m/sl}{}
- \DeclareFontShape{LGR}{pplj}{m}{sc}{<->ssub * lmr/m/sc}{}
- \DeclareFontShape{LGR}{pplj}{b}{n}{<->ssub * lmr/bx/n}{}
- \DeclareFontShape{LGR}{pplj}{b}{it}{<->ssub * lmr/bx/it}{}
- \DeclareFontShape{LGR}{pplj}{b}{sl}{<->ssub * lmr/bx/sl}{}
- \DeclareFontShape{LGR}{pplj}{b}{sc}{<->ssub * lmr/bx/sc}{}
- \DeclareFontShape{LGR}{pplj}{bx}{n}{<->ssub * lmr/bx/n}{}
- \DeclareFontShape{LGR}{pplj}{bx}{it}{<->ssub * lmr/bx/it}{}
- \DeclareFontShape{LGR}{pplj}{bx}{sl}{<->ssub * lmr/bx/sl}{}
- \DeclareFontShape{LGR}{pplj}{bx}{sc}{<->ssub * lmr/bx/sc}{}
- \DeclareFontShape{LGR}{pplj}{m}{li}{<->ssub * lmr/m/li}{}
- \DeclareFontShape{LGR}{pplj}{b}{li}{<->ssub * lmr/b/li}{}
- \DeclareFontShape{LGR}{pplj}{bx}{li}{<->ssub * lmr/bx/li}{}
- \DeclareFontShape{LGR}{pplj}{m}{ui}{<->ssub * lmr/m/ui}{}
- \DeclareFontShape{LGR}{pplj}{b}{ui}{<->ssub * lmr/m/ui}{}
- \DeclareFontShape{LGR}{pplj}{bx}{ui}{<->ssub * lmr/bx/ui}{}
- \DeclareFontShape{LGR}{pplj}{m}{rs}{<->ssub * lmr/m/rs}{}
- \DeclareFontShape{LGR}{pplj}{b}{rs}{<->ssub * lmr/m/rs}{}
- \DeclareFontShape{LGR}{pplj}{bx}{rs}{<->ssub * lmr/bx/rs}{}
+  \substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
+      \DeclareRobustCommand{\greektext}{%
+         \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
+         \def\encodingdefault{LGR}}
+      \DeclareTextFontCommand{\textgreek}{\greektext}}
+\else
 \fi
-\ifsuftesi@porson
-\sbox\z@{\fontsize{10}{10}\normalfont A}
-\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
-\dimen@=\dimexpr \p@*\ht\z@/\ht\tw@\relax
-\sbox\z@{\normalfont\fontsize{10}{10}\selectfont a}
-\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp a}
-\dimen2=\dimexpr \p@*\ht\z@/\ht\tw@\relax
-\dimen4= 0.6\p@
-\dimen@=\dimexpr \dimen@ - \dimen4*\dimen@/\p@+\dimen4*\dimen2/\p@\relax
-\edef\art@scale{\strip@pt\dimen@}
-\DeclareFontFamily{LGR}{porson}{}
-\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{}
-\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{b}{n}  {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
-   \fi
 }
+\ifsuftesi@nofont
+  \ifsuftesi@greekfont
+    \ClassError{suftesi}
+          {'greekfont' option\MessageBreak
+          You can not use 'greekfont' option\MessageBreak
+          with 'defaultfont=none' option\MessageBreak
+          Set 'greekfont=none' or do not load\MessageBreak
+          the 'greekfont' option}
+          {'greekfont' option\MessageBreak
+          You can not use 'greekfont' option\MessageBreak
+          with 'defaultfont=none' option\MessageBreak
+          Set 'greekfont=none' or do not load\MessageBreak
+          the 'greekfont' option}
+      \else
+    \fi
+  \else
+\fi
+
+\ifxetex
+  \else
+    \ifsuftesi@greekfont
+\DeclareFontFamily{LGR}{bodoni}{}
+\DeclareFontShape{LGR}{bodoni}{m}{n}{<-> s * [\SUFfntscale] gbodonirg6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{it}{<-> s * [\SUFfntscale] gbodonii6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{n}{<-> s * [\SUFfntscale] gbodonib6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{it}{<-> s * [\SUFfntscale] gbodonibi6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sl}{<-> s * [\SUFfntscale] gbodonio6a}{}
+\DeclareFontShape{LGR}{bodoni}{b}{sl}{<-> s * [\SUFfntscale] gbodonibo6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sc}{<-> s * [\SUFfntscale] gbodonisc6a}{}
+\DeclareFontShape{LGR}{bodoni}{m}{sco}{<-> s * [\SUFfntscale] gbodonisco6a}{}
+
+\DeclareFontShape{LGR}{bodoni}{bx}{n}{<-> s * [\SUFfntscale] gbodonib6a}{}
+\DeclareFontShape{LGR}{bodoni}{bx}{it}{<-> s * [\SUFfntscale] gbodonibi6a}{}
+\DeclareFontShape{LGR}{bodoni}{bx}{sl}{<-> s * [\SUFfntscale] gbodonibo6a}{}
+
+\DeclareFontFamily{LGR}{artemisia}{}
+\DeclareFontShape{LGR}{artemisia}{m}{n}{<-> s * [\SUFfntscale] gartemisiarg6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{it}{<-> s * [\SUFfntscale] gartemisiai6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{n}{<-> s * [\SUFfntscale] gartemisiab6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{it}{<-> s * [\SUFfntscale] gartemisiabi6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sl}{<-> s * [\SUFfntscale] gartemisiao6a}{}
+\DeclareFontShape{LGR}{artemisia}{b}{sl}{<-> s * [\SUFfntscale] gartemisiabo6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sc}{<-> s * [\SUFfntscale] gartemisiasc6a}{}
+\DeclareFontShape{LGR}{artemisia}{m}{sco}{<-> s * [\SUFfntscale] gartemisiasco6a}{}
+
+\DeclareFontShape{LGR}{artemisia}{bx}{n}{<-> s * [\SUFfntscale] gartemisiab6a}{}
+\DeclareFontShape{LGR}{artemisia}{bx}{it}{<-> s * [\SUFfntscale] gartemisiabi6a}{}
+\DeclareFontShape{LGR}{artemisia}{bx}{sl}{<-> s * [\SUFfntscale] gartemisiabo6a}{}
+
+\DeclareFontFamily{LGR}{porson}{}
+\DeclareFontShape{LGR}{porson}{m}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{b}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{sc}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+
+\DeclareFontShape{LGR}{porson}{bx}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{bx}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\else
+  \ifsuftesi@nofont
+    \else
+      \ifsuftesi@standard
+        \else
+      \fi
+    \fi
+  \fi
+\fi
 \ifsuftesi@nocrop
   \relax
     \else
@@ -1334,9 +1498,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \ifsuftesi@article
 \def\chapter#1{\ClassError{suftesi}
   {\noexpand\chapter level is undefined
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {\noexpand\chapter level is undefined
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
   \setcounter{tocdepth}{3}
     \setcounter{secnumdepth}{3}
     \renewcommand\thesection{%
@@ -1703,7 +1867,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \def\collectioneditor#1{\gdef\@collectioneditor{#1}}
   \def\@collectioneditor{\@latex@warning@no@line{%
     No \noexpand\collectioneditor given}}
-\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
+\renewcommand*{\title}[2][]{%
+  \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
     \edef\title{\noexpand\@dblarg
   \expandafter\noexpand\csname\string\title\endcsname}
     \def\@headtitle{--missing title--%
@@ -1739,9 +1904,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
               \ClassError{suftesi}
                 {\MessageBreak
                 You can not use tocstyle=leftpage\MessageBreak
-                  with documentstructure=collection}
+                  with structure=collection}
                 {You can not use tocstyle=leftpage\MessageBreak
-                  with documentstructure=collection}
+                  with structure=collection}
             \else
           \nobreak\hfill #2\par
         \fi
@@ -1789,7 +1954,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \csname toc@entry@\endcsname
     \begingroup%
     \let\thanks\@gobble
-    \addcontentsline{toc}{title}{\normalfont{\@author}\texorpdfstring{\newline}{, }%
+    \addcontentsline{toc}{title}{%
+    \normalfont{\@author}\texorpdfstring{\newline}{, }%
     \itshape\@headtitle}
     \endgroup%
     \par\nobreak\vspace{2ex}
@@ -2624,9 +2790,9 @@ Janusz M. Nowacki.
 \def\chapterintro{%
 \ClassError{suftesi}
   {Command \noexpand\chapterintro is undefined\MessageBreak
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\chapterintro is undefined\MessageBreak
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \else
 \def\chapterintro{
   \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
@@ -2676,19 +2842,19 @@ Janusz M. Nowacki.
 \ifsuftesi@article
 \renewcommand\frontmatter{\ClassError{suftesi}
   {Command \noexpand\frontmatter is undefined\MessageBreak
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\frontmatter is undefined\MessageBreak
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \renewcommand\mainmatter{\ClassError{suftesi}
   {Command \noexpand\mainmatter is undefined\MessageBreak
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\mainmatter is undefined\MessageBreak
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \renewcommand\backmatter{\ClassError{suftesi}
   {Command \noexpand\backmatter is undefined\MessageBreak
-     using 'documentstructure=article'}
+     using 'structure=article'}
   {Command \noexpand\backmatter is undefined\MessageBreak
-     using 'documentstructure=article'}}
+     using 'structure=article'}}
 \else
 \renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse}
 \renewcommand\mainmatter{\cleardoublepage\@mainmattertrue}