suftesi (22mar16)

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

4 files changed, 542 insertions, 810 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 45a9e4628db..3ea67ee0083 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 bfb2530b90c..ec93f8bb168 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 4295edd4e96..6ad449e778a 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -4,7 +4,7 @@
 \input docstrip
 \preamble
 
- Copyright 2009-2015 by Ivan Valbusa
+ Copyright 2009-2016 by Ivan Valbusa
 
  This program is provided under the terms of the
  LaTeX Project Public License distributed from CTAN
@@ -44,7 +44,7 @@
 \endgroup
 %</internal>
 %
-% Copyright (C) 2009-2015 by Ivan Valbusa 
+% Copyright (C) 2009-2016 by Ivan Valbusa 
 % <ivan dot valbusa at univr dot it>
 % -------------------------------------------------------
 % 
@@ -67,7 +67,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2016/03/13 v2.6 A class for typesetting theses, books and articles]
+    [2016/03/22 v2.7.1 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -83,7 +83,6 @@
 \DeclareFontFamily{T1}{Cochineal-LF}{}
 \DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
       <-> s*[1.0] Cochineal-Roman-osf-t1}{}
-\def\lmfntscale{1}
 % Doc facilities
 \let\cs\relax
 \let\cmd\relax
@@ -115,9 +114,9 @@
 \usepackage{guit}
 %%% Greek examples
 \def\latintxt{Aliquam auctor, pede consequat
-  laoreet varius, eros tellus scelerisque quam, pellentesque hendrerit.}  
+  laoreet varius, eros tellus maris quam, pellentesque hendrerit.}  
 \def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
-  nibh est placerat odio.}
+  nibh est placerat.}
 \def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
 ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
 ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
@@ -137,9 +136,11 @@
 \newenvironment{ttquote}
   {\begin{mdframed}[default]
   \ttfamily\microtypesetup{activate=false}}
-  {\end{mdframed}}
+  {\end{mdframed}
+  }
 \newenvironment{latexcode}
-  {\begin{mdframed}[default]}
+  {\begin{mdframed}[default]
+  }
   {\end{mdframed}}
 % Correct (?) \optitem to use \meta inside #2
 \makeatletter
@@ -174,7 +175,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4770}
+% \CheckSum{4559}
 %
 % \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
@@ -192,8 +193,10 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.7.1}{2016/03/22}{Corrected a bug in v.2.7 (missing some \cmd{fi} commands).}
+% \changes{v2.7}{2016/03/22}{New value \opt{cscreen} for \opt{version} option. Updated documentation. Removed value \opt{elements} for options:\opt{pagelayout}, \opt{headerstyle}, \opt{captionstyle}, \opt{chapstyle}, \opt{style}; \opt{sufelements} for  option: \opt{style}. The \cmd{chapnumfont} command is no longer available.}
 % \changes{v2.6}{2016/03/13}{New \opt{mathfont} option for non-standard fonts. New command \cmd{makecover} for printing the cover page. Updated documentation.}
-% \changes{v2.5}{2016/03/02}{Corrected a bug when loading CB Greek fonts. Updated documentation.}
+% \changes{v2.5}{2016/03/02}{Corrected a bug when loading CB Greek fonts. Renamed option \opt{documentstructure} to \opt{structure}.  Updated documentation.}
 % \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.}
@@ -223,7 +226,7 @@
 % \changes{v0.9a}{2012/08/31}{Added \option{inline} option to 
 % \sty{enumitem} package. Deleted \opt{centertitle} option. 
 % Deleted \opt{sctitles} option. 
-% Changed code for toc, lot and lof elements. }
+% Changed code for toc, lot and lof elements.}
 % \changes{v0.9}{2012/04/22}{Improved compatibility 
 % with \sty{mathspec}}
 % \changes{v0.8}{2012/03/19}{Added macro for using \sty{frontespizio} 
@@ -281,7 +284,7 @@
 % 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
+% finding an aesthetic harmony in the formal simplicity  \parencite[see][]{valbusa:20122}. They are
 % largely inspired by some interesting readings, particularly
 % \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
 % \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}.
@@ -290,7 +293,7 @@
 % \tableofcontents
 %\end{multicols}
 %
-% \section*{Legalese}\enlargethispage{3\baselineskip}
+% \section*{Legalese}
 %
 %\noindent Copyright \copyright\ 2009-\the\year{} Ivan Valbusa
 % \smallskip
@@ -299,12 +302,6 @@
 %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.
 %
-%
-%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.}
-%
 % 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. 
@@ -324,8 +321,8 @@
 % Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
 % Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
 %I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
-%%
-%% \section*{Feedback}
+%
+% \section*{Feedback}
 %
 % \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
 %
@@ -335,7 +332,6 @@
 % \begin{ttquote}
 % \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.
 % ^^A \begin{verbatim}
 % ^^A \cmd{documentclass}[\\
@@ -347,15 +343,30 @@
 % ^^A ]\ar{suftesi}
 % ^^A \end{verbatim}
 % 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.
+% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are automatically disabled. The class loads the packages listed in table \ref{tab:pkgloaded}.
+%
+% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX) and to select a main font. 
 %
-% 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. 
 %
-%\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{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}).
+%\begin{table}[h]
+%\centering 
+%\fontsize{9.5}{11.5}\selectfont
+%\begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{7.6cm}}
+%\toprule
+%&\textrm{Global}&{caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks}, 
+%{fancyhdr}, {fixltxhyph}, {fontenc}, {geometry}, {iftex},
+%{microtype}, {multicol}, {textcase}, {titlesec}, {titletoc}, {xkeyval}\\\midrule
+%&\textrm{pdf\LaTeX{} only}&substitutefont, fontenc\\\midrule
+%defaultfont=&standard&lmodern\\
+%
+%&palatino&textcomp, newpxtext, biolinum, inconsolata, {newpxmath}\\
+%&{libertine}&{textcomp}, {libertine}, {biolinum}, {inconsolata}, {newtxmath}\\
+%&cochineal&{textcomp}, {cochineal}, {biolinum}, {inconsolata}, {newtxmath}\\
+%&compatibility&{mathpazo}, {beramono}\\\midrule
+%mathfont=&extended&amsthm, mathalfa\\\bottomrule
+%\end{tabular}
+% \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
+%\end{table}
 %
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
@@ -363,10 +374,8 @@
 %
 % \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 \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} 
-%\textcolor{magenta}{\url{https://www.ctan.org/tex-archive/macros/latex/contrib/suftesi}}
-%\end{center}
+% The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at 
+%\textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
 %
 %
 % \subsection{Document structure}
@@ -384,9 +393,9 @@
 % 
 % \subsection{Page layouts}
 %
-% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset  A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts 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.
+% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset  A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts  the \opt{version=screen} and \opt{version=cscreen} options are particularly useful as they show the output in its real size. See section \ref{sec:page-styles} for details.
 %
- % \begin{table}[h]
+% \begin{table}[h]
 %\centering
 %\makebox[\textwidth][c]{\begin{tabular}{@{}lcccccccc@{}}
 %\toprule
@@ -402,11 +411,9 @@
 %\opt{periodical}	&110&	165&	170&	240&$2:3$&$2:3$&$2:3$&$1:\kern-3pt\sqrt{2}$\\
 %\opt{periodicalaureo}&	120&	194&	170&	240&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\kern-3pt\sqrt{2}$\\
 %
-%^^A\opt{elements} (pt)&	251&	502&	374&	648&$1:2$&$2:5$&$1:2$&$1:\kern-3pt\sqrt{3}$\\
-%\opt{elements} ($\approx$)&	88&	176&	131&	227&$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}}\\[-3ex]
 % \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
 % \end{table}
 % 
@@ -422,14 +429,14 @@
 %^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
 %^^A\end{figure}
 %
-% \subsection{Font}
+% \subsection{Fonts}
 %
 % 
 %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 sans serif font is Linux Biolinum O, designed by Philipp H. Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastina Kosch, a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion (Robert Slimbach). It is a very complete typeface and it offers full support for Greek and Cyrillic, real small caps (even in italic shape) and four figure styles. Moreover it provides support for mathematics through the \sty{newtxmath} package.
 %
 %The \opt{defaultfont}  option allows you to can change the default roman font to New PX (Palatino), 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). 
+%You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} option which turns off the default font settings (see section \ref{sec:options} for details). 
 %
 %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/}.
@@ -437,13 +444,67 @@
 %
 % \subsubsection[Mathematics]{Typesetting mathematics}
 %
-% The class loads by default a minimal mathematical support for Cochineal (default), Linux Libertine O or New PX and the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. Even if these non-standard fonts have a very good mathematical support, if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details. 
+% The class loads by default a ‘minimal’ mathematical support for Cochineal (default), Linux Libertine O or New PX via the \sty{newtxmath} or \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. These non-standard fonts have a very good mathematical support but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details. 
+%
+% If some of the loaded packages conflict or if you simply want to change some of the default font settings you should first reset the font default with \opt{defaultfont=none} option and then load the packages in the right order and with your favorite options. 
+%^^AFor example, these are the codes loaded for the three non-standard fonts:
+%^^A
+%^^A\paragraph{defaultfont=cochineal}
+%^^A
+%^^A\begin{latexcode}
+%^^A\begin{verbatim}
+%^^A\documentclass[defaultfont=none]{suftesi}
+%^^A...
+%^^A\usepackage{textcomp}
+%^^A\usepackage{cochineal}
+%^^A\usepackage[varqu,varl,var0]{inconsolata}
+%^^A\usepackage{biolinum}
+%^^A\usepackage{cochineal}
+%^^A\usepackage{amsthm}
+%^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+%^^A\usepackge[cal=boondoxo]{mathalfa}
+%^^A\useosf
+%^^A\useproportional
+%^^A\end{verbatim}
+%^^A\end{latexcode}
+%^^A
+%^^A\paragraph{defaultfont=palatino}
+%^^A
+%^^A\begin{latexcode}
+%^^A\begin{verbatim}
+%^^A\usepackage[full]{textcomp}
+%^^A\usepackage{newpxtext}
+%^^A\usepackage[scaled=1.06]{biolinum}
+%^^A\usepackage[varqu,varl]{inconsolata}
+%^^A\usepackage{amsthm}
+%^^A\usepackage[bigdelims,vvarbb]{newpxmath}
+%^^A\usepackage[cal=boondoxo]{mathalfa} 
+%^^A\useosf
+%^^A\useproportional
+%^^A\end{verbatim}
+%^^A\end{latexcode}
+%^^A
+%^^A\paragraph{defaultfont=libertine}
+%^^A
+%^^A\begin{latexcode}
+%^^A\begin{verbatim}
+%^^A\usepackage{textcomp}
+%^^A\usepackage[sb]{libertine}
+%^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata}
+%^^A\usepackage{amsthm}
+%^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
+%^^A\usepackage[cal=boondoxo]{mathalfa} 
+%^^A\useosf
+%^^A\end{verbatim}
+%^^A\end{latexcode}
+% 
+%
 %
 %
 % \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.
+% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) and CB Greek (by Claudio Beccari). You may, of course, choose a different font but in this case, as previously cleared, remember to load the \opt{defaultfont=none} option.
 % 
 %
 % \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{10}
@@ -463,40 +524,6 @@
 % \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{10}
 %
 %
-% \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. 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{frontespizio} 
-%  \Preambolo{\usepackage[osf]{cochineal}}%  <===
-%  \Universita{Paperopoli} 
-%  \Dipartimento{Filosofia, Pedagogia e Psicologia} 
-%  \Corso[Laurea]{Filosofia} 
-%  \Annoaccademico{2030--2031} 
-%  \Titolo{La mia tesi:\\ una lunga serie di risultati\\
-%      difficilissimi e complicatissimi} 
-%  \Sottotitolo{Alcune considerazioni mutevoli} 
-%  \Candidato[vr12301231]{Paolo Rossi} 
-%  \Relatore{Guido Bianchi} 
-%\end{frontespizio}
-%\end{verbatim}
-%\end{latexcode}
-%
-%
 %\begin{figure}
 % \centering
 %\begin{tikzpicture}
@@ -543,7 +570,7 @@
 %\begin{tikzpicture}
 % \draw[draw=gray,fill=blue!10,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight);
 % \node at (0,.7\textheight) (c) {};
-% \draw[fill=DarkBlue,draw=none,circular drop shadow] (c) circle (4.5cm);
+% \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
 % \node[anchor=center,text=white] at (c) {\parbox{6cm}{%
 %  \centering
 %       {\scriptsize\scshape Bruce Lee\\}
@@ -559,12 +586,63 @@
 %\caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
 %\end{figure}
 %
+% \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. 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{frontespizio} 
+%  \Preambolo{\usepackage[osf]{cochineal}}%  <===
+%  \Universita{Paperopoli} 
+%  \Dipartimento{Filosofia, Pedagogia e Psicologia} 
+%  \Corso[Laurea]{Filosofia} 
+%  \Annoaccademico{2030--2031} 
+%  \Titolo{La mia tesi:\\ una lunga serie di risultati\\
+%      difficilissimi e complicatissimi} 
+%  \Sottotitolo{Alcune considerazioni mutevoli} 
+%  \Candidato[vr12301231]{Paolo Rossi} 
+%  \Relatore{Guido Bianchi} 
+%\end{frontespizio}
+%\end{verbatim}
+%\end{latexcode}
+%
+%
+%
 %^^A\subsection{Title page}
 % 
 %^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of  the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
 %
 % \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle such as other graphical elements are customizable (see section \ref{sec:options} for details). To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
+% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
+%\begin{latexcode}
+%\begin{verbatim}
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
+%\Cfootcolor{black}
+%
+%\makecover[ball color=DarkBlue,draw=none]
+%\end{verbatim}
+%\end{latexcode}
+%
+%To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
 %
 %
 % \section{Options}\label{sec:options}
@@ -577,56 +655,56 @@
 % \begin{valuelist}
 % \item[book] For typesetting texts with chapters.
 % \item[article] For typesetting articles or short theses 
-% (that is  without chapter division).
+% (without chapters).
 % \item[collection] For typesetting journals or collections of articles (see section \ref{sec:collection}).
 % \end{valuelist}
-%\optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo},  \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo},  \opt{supercompact}, \opt{supercompact}, \opt{elements}}
+%\optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo},  \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo},  \opt{supercompact}, \opt{supercompactaureo}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
 %\begin{valuelist}
 %\item[standard]
-% Prints an A4 typeblock with a 
-% text area of $\SI{110}{mm} \times \SI{220}{mm}$.
+% Prints an A4 page with a 
+% typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
 %\end{valuelist}
 % With the following values the option prints the typeblock 
 % on a an A4 paper showing the crop marks which can be controlled 
 % by the \opt{version} option.
 %\begin{valuelist}
 %\item[periodical]
-% Prints a typeblock  of $\SI{17}{cm} \times \SI{24}{cm}$ with a text area of  $\SI{11}{cm} \times \SI{16,5}{cm}$.
+% Prints a page  of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of  $\SI{11}{cm} \times \SI{16,5}{cm}$.
 %\item[periodicalaureo] The same of \opt{periodical} but with a 
-% \emph{golden ratio} text area of $\SI{120}{cm} \times \SI{194}{mm}$. 
+% \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$. 
 %\item[compact]
-% Prints a typeblock  of $\SI{16}{cm} \times \SI{24}{cm}$ with a text area of $\SI{11}{cm} \times \SI{16,5}{cm}$. 
+% Prints a page  of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of $\SI{11}{cm} \times \SI{16,5}{cm}$. 
 %\item[compactaureo]
 % The same as \opt{compact} but with 
-% a \emph{golden ratio} text area of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.%\item[supercompact]
-% Prints a typeblock  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a text area of $\SI{10}{cm} \times \SI{15,5}{cm}$.
+% a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.%\item[supercompact]
+% Prints a page  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a typeblock of $\SI{10}{cm} \times \SI{15,5}{cm}$.
 %\item[supercompactaureo]
 % The same as \opt{supercompact} but with 
-% a \emph{golden ratio} text area of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
-% \item[elements] Prints a typeblock with the dimensions of 
-% \textcite{Bringhurst:1992}.
-% To reproduce the whole 
-% style of this book use \opt{style=elements} option instead.
+% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
 %\end{valuelist}
 % The details of this option are shown in table \ref{tab:layouts}.
-% \optitem[final]{version}{\opt{screen}, \opt{draft}, \opt{final}}
+% \optitem[final]{version}{\opt{screen}, \opt{cscreen}, \opt{draft}, \opt{final}}
+% \begin{valuelist}
+% \item[screen] Prints the \textsc{pdf} with its real dimensions.
+% \item[cscreen] The same as \opt{version=screen} but with a centered typeblock.
+% \end{valuelist}
+% These previous two options are provided to have a better view when you are 
+% typesetting and reading the \textsc{pdf} on the screen or for online publications. The following options meant for printed documents.
 % \begin{valuelist}
-% \item[screen] Prints the \textsc{pdf} with its real dimensions and if \emph{loaded after the \opt{pagelayout} option} defines \texttt{hmarginratio=1:1}.
-% It is provided to have a better view when you are 
-% typesetting and reading the \textsc{pdf} on the screen. 
 % \item[draft] 
-% Prints the output on a A4 paper, showing the crop marks.
-% \item[final] Prints the output on a A4 paper, hiding the crop marks.
+% Prints the output on a A4 paper, showing the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
+% \item[final] Prints the output on a A4 paper, hiding the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
 % \end{valuelist}
+% Sometimes it is not desirable to have the crop marks on every page. In such a case you can use the \cmd{crop}|[off]| command after the first page of the document.
 %\end{optionlist}
 %
-%\subsection{Fonts}\label{sec:fonts}
+%\subsection{Font}\label{sec:fonts}
 %
-% The first two options are available only with \LaTeX.
+% The first three 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. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family. 
+% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family by Georg Duffner.
 % 
 %\begin{optionlist}
 % \optitem[cochineal]{defaultfont}{\opt{none}, \opt{cochineal}, \opt{libertine}, \opt{palatino}, \opt{standard}}
@@ -640,12 +718,12 @@
 %     \item[standard] Loads the \sty{lmodern} package: Latin Modern font family and CB Greek.
 %   \end{valuelist}
 % \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
-% Not available with \opt{defaultfont=none} or \opt{defaultfont=standard} options.
+% Actually useless  with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
-%     \item[none] Does not load any Greek font.
+%     \item[none] Does not load any Greek font. 
 %     \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 
+%     \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font (\sty{suftesi} <v.2.4) has been written by Enrico 
 % Gregorio. Claudio Beccari successively added the code to improve the 
 % scale factor when using this greek font in combination with Palatino.}
 %     \item[bodoni] Loads the Bodoni font by the Greek Font Society.
@@ -656,19 +734,20 @@
 % 
 % Available only with Cochineal, Libertine and Palatino default fonts.
 %   \begin{valuelist}
-%     \item[none] Do not load any math support. Use this option if you need full control over mathematics settings.
-%     \item[minimal]  Loads \sty{newtxmaht} (or \sty{newpxmaht}) and \sty{mathalfa}.  
-%     \item[extended] Loads the previous option plus \sty{amsmath} and \sty{amsthm}. 
+%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+%     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
+%     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalfa} packages. 
 %   \end{valuelist}
 % \end{optionlist}
 %
 % \begin{optionlist}
 % \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
+%Active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
+% With \XeLaTeX{} or \LuaLaTeX{} this option is effective only if a font selection command (such as \cmd{setmainfont}) is given.
 %   \begin{valuelist}
-%     \item[low] Prints lowercase \textsc{small capitals}.
-%     \item[upper] Prints \textsc{Small Capitals} without changing the case.
+%     \item[low] Prints lowercase spaced \textsc{\lsstyle small capitals}.
+%     \item[upper] Prints spaced \textsc{\lsstyle 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}
@@ -680,7 +759,7 @@
 %     \item[roman] Prints the \meta{level} title in roman.
 %     \item[italic] Prints the \meta{level} title in \emph{italic}.
 %     \item[smallcaps] Prints the \meta{level} title 
-%      in \textsc{small caps}
+%      in \textsc{\lsstyle spaced small caps}
 %   \end{valuelist}
 %   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
 %   \opt{subsec}, \opt{subsubsec}.
@@ -700,10 +779,6 @@
 %     \item[parright] As \opt{right} but with the title below the number.
 %   \end{valuelist}
 %   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
-%   \begin{valuelist}
-%     \item[elements] Print a chapter number in the style of \textcite{Bringhurst:1992}.
-%   \end{valuelist}
-%   Where \meta{level} can be \opt{chap}.
 % \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}, 
 % \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, 
 % \opt{dotRoman}}
@@ -719,7 +794,7 @@
 % \end{optionlist}
 %
 %
-% 	\subsection{Table of contents}\label{sec:toc}
+% 	\subsection{Contents lists}\label{sec:toc}
 %
 %
 % \begin{optionlist}
@@ -741,7 +816,7 @@
 %     \item[roman] Prints the \meta{level} TOC entry in roman.
 %     \item[italic] Prints the \meta{level} TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the \meta{level} TOC entry 
-%      in \textsc{small caps}
+%      in \textsc{\lsstyle spaced small caps}
 %	\end{valuelist}
 %   Where \meta{level} can be \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
 % \optitem[all]{twocolcontents}{\opt{toc}, \opt{lof}, 
@@ -767,8 +842,7 @@
 %
 % \begin{optionlist}
 % \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
-% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}, 
-% \opt{elements}}
+% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
 %   \begin{valuelist}
 %     \item[inner] Prints the chapter title and the string ``Chapter~ 
 %     \meta{n}'' in the inner side 
@@ -785,18 +859,13 @@
 %       \cmd{author} commands are required.
 %     \item[authortitlecenter]
 %       As the previous one but with centered headers and footers.
-%     \item[elements]
-%       Prints the chapter title and the section title in the margin 
-%       respectively of even pages and odd pages. The page number is 
-%       put in the outer side of the footer. This is the style loaded 
-%       by the option \opt{style=elements}.
 %   \end{valuelist}
 % \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, 
 % \opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the headers in roman.
 %     \item[italic] Prints the headers in \emph{italic}.
-%     \item[smallcaps] Prints the headers in \textsc{small caps}.
+%     \item[smallcaps] Prints the headers in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
 % \end{optionlist}
 %
@@ -854,19 +923,18 @@
 % \item[indented]
 %  Prints standard indented lists.
 % \end{valuelist}
-% \optitem[standard]{captionstyle}{\opt{standard}, \opt{sanserif}, \opt{italic}, \opt{smallcaps}, \opt{elements}}
+% \optitem[standard]{captionstyle}{\opt{standard}, \opt{sanserif}, \opt{italic}, \opt{smallcaps}}
 % All these values print the caption in small size, changing the shape:
 % \begin{valuelist}
 % \item[standard] Prints the caption text and label in normal font.
 % \item[sanserif] Prints the caption text and label in \textsf{sanserif}.
 % \item[italic] Prints the caption text and label in \emph{italic}. 
-% \item[smallcaps] Prints only the caption label in \textsc{small caps}.
-% \item[elements] An alias of \opt{sanserif}.
+% \item[smallcaps] Prints only the caption label in \textsc{\lsstyle spaced small caps}.
 % \end{valuelist}
 % \end{optionlist}
 %
 %
-% \subsection{Other options}
+% \subsection{Miscellaneous}
 %
 %\begin{optionlist}
 % \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
@@ -894,25 +962,18 @@
 % \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}
-%   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 
-% according to the \opt{pagelayout} option. Similar to \opt{version=screen}.
-% \end{valuelist}
 % \end{optionlist}
 %
 % \subsection{Pre-defined styles}\label{sec:predefined-styles}
 %
 % These pre-defined styles are intended as shotrcuts to some groups of 
 % class options. Combining them
-% with \opt{dottedchap} and \opt{romanchapnum} options 
+% with \opt{chapnumstyle} options 
 % you can get up to 120 variants. 
 %
 % \begin{optionlist}
 % \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
-% \opt{smallcaps(1-6)}, \opt{elements}, \opt{sufelements}}
+% \opt{smallcaps(1-6)}}
 % \begin{valuelist}
 % \item[roman(1-6)] The titles of chapters and headers are printed 
 % in roman. The number of the chapter is on the same line in styles 
@@ -920,13 +981,11 @@
 % The title can be printed on the left (styles 1 and 4), 
 % in the center (styles 2 and 5) or on the right (styles 3 and 6).
 % \item[italic(1-12)]
-% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  in styles 1-6 and in \textsc{small caps}  in styles 7-12.
+% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
 % There are three position for the title and two positions for the number as above.
 % \item[smallcaps(1-12)]
-% The titles of chapters and headers are in \textsc{small caps}. The  title of the section is in \emph{italic}  in styles 1-6 and in \textsc{small caps}  in styles 7-12.
+% The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}. The  title of the section is in \emph{italic}  in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
 % There are three position for the title and two positions for the chapter as above.
-% \item[elements] Reproduces the style of the Italian edition of \textcite{Bringhurst:1992}.
-% \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}
 %
@@ -936,8 +995,8 @@
 % \subsection{Printing the cover page}
 %
 % \begin{ltxsyntax}
-% \cmditem{makeover}
-% \cmditem{makeover}[tikz options]
+% \cmditem{makecover}
+% \cmditem{makecover}[tikz options]
 %
 % Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz} and the optional arguments accepts the same options of the \cmd{draw} command of that package (see the examples below). Commands available:
 %
@@ -1036,24 +1095,22 @@
 %
 % \subsection{Printing the colophon} 
 % 
-% As explained at the beginning of this documentation, in addition to the terms of the \LaTeX{} Project Public License, \textsf{suftesi} requires a specific attribution notice. You can typeset the attribution notice manually or using one of these commands.
-%
 % \begin{ltxsyntax}
 %
 % \cmditem{colophon}[OS]{name and surname}{additional info}
 % 
 % This command is provided only for Italian documents. It prints a page with 
 % a copyright notice and the colophon in the bottom of the page. For different languages 
-% use the \cmd{bookcolophon} instead (see below).
+% use \cmd{bookcolophon} instead (see below).
 % 
 % If you don't need the copyright notice, leave the second argument of 
 % the command empty:
 % \begin{ttquote}
 % \cmd{colophon\oarm{OS}\ar{}\arm{additional info}}
 % \end{ttquote}
-% With the \opt{article} option, you can use the \cmd{artcolophon} command 
+% With the \opt{article} document structure, you can use the \cmd{artcolophon} command 
 % (see below) 
-% or  the \cmd{thanks} command:
+% as well as  the \cmd{thanks} command:
 %
 %\begin{latexcode}
 %\begin{verbatim}
@@ -1067,7 +1124,7 @@
 % other informations}
 % \changes{v0.6}{2011/10/21}{New command \cmd{bookcolophon}}
 %
-% Similar to \cmd{colophon} but completely customizable. 
+% Similar to \cmd{colophon} but fully customizable. 
 % The first argument prints its content (usually the copyright notice) in the center of the page. 
 % The second one prints its content at the bottom. For example:
 %
@@ -1076,7 +1133,7 @@
 % \bookcolophon{%
 %    Copyright © 2007 by Ivan Valbusa}{%
 %    This work has been typeset with \LaTeX, using the  \textsf{suftesi} 
-%    class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is %
+%    class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is 
 %    Cochineal by Michael Sharpe and the sans serif font is Linux 
 %    Biolinum O by Philipp H. Poll.}
 %\end{verbatim}
@@ -1141,20 +1198,7 @@
 %
 % \end{ltxsyntax}
 %
-% \subsection{Other commands}
-%
-% \begin{ltxsyntax}
-% \cmditem{toclabelwidth}{level}{dim}
-%  \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
-%
-% Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap},  \opt{sec},  \opt{subsec},  \opt{subsubsec},  \opt{par},  \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
-%
-%\begin{latexcode}
-%\begin{verbatim}
-% \toclabelwidth{chap}{1em}
-%\end{verbatim}
-%\end{latexcode}
-% \end{ltxsyntax}
+% \subsection{Miscellaneous}
 %
 % \begin{ltxsyntax}
 % \cmditem{xfootnote}[symbol]{footnote text}
@@ -1167,17 +1211,32 @@
 % \cmd{xfootnote}\oar{\em\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
 % \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
 % \end{ttquote}
-% \end{ltxsyntax}
-%
-%
-% \begin{ltxsyntax}
 %
 % \cmditem{title}[short title for headers]{complete title for titlepage}
 % \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command}
 % 
-% Useful with \opt{authortitle} option if the title is too long
+% Useful with \opt{headerstyle=authortitle} option if the title is too long
 % or has some breaks. 
 %
+% \end{ltxsyntax}
+%
+% \begin{ltxsyntax}
+% \cmditem{toclabelwidth}{level}{dim}
+%  \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
+%
+% Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap},  \opt{sec},  \opt{subsec},  \opt{subsubsec},  \opt{par},  \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
+%
+%\begin{latexcode}
+%\begin{verbatim}
+% \toclabelwidth{chap}{1em}
+%\end{verbatim}
+%\end{latexcode}
+% \end{ltxsyntax}
+%
+%
+%
+% \begin{ltxsyntax}
+%
 % \cmditem{chapterintro}
 %
 % Prints an unnumbered introduction at the beginning of the chapter, 
@@ -1195,33 +1254,13 @@
 %
 % Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
 %
-%
-% \cmditem{chapnumfont}{name}
+%\end{ltxsyntax}
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% Sets the font of the chapter number of \opt{style=elements} and \opt{style=sufelements} styles. 
-% The default is 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}
-%\begin{verbatim}
-% \chapnumfont{phv}
-%\end{verbatim}
-%\end{latexcode}
-%
-% With \XeLaTeX{} and \LuaLaTeX{} the \cmd{fontspec} command is required:
-%
-%\begin{latexcode}
-%\begin{verbatim}
-% \chapnumfont{\fontspec[Numbers=OldStyle]{Helvetica}}
-%\end{verbatim}
-%\end{latexcode}
-% \end{ltxsyntax} 
 %
 % \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:
+% The \opt{collection} document structure is thought to create a collection of papers. Each paper has to be typeset in a separate \file{.tex} file inside the \env{article} environment:
 %
 %\begin{latexcode}
 %\begin{verbatim}
@@ -1274,13 +1313,13 @@
 %     \item[roman] Prints the title of the articles in roman.
 %     \item[italic] Prints the  title of the articles in \emph{italic}.
 %     \item[smallcaps] Prints the  title of the articles 
-%      in \textsc{small caps}.
+%      in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
 % \optitem[roman]{authorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the author's name in roman.
 %     \item[italic] Prints the author's name in \emph{italic}.
-%     \item[smallcaps] Prints the author's name in \textsc{small caps}. 
+%     \item[smallcaps] Prints the author's name in \textsc{\lsstyle spaced small caps}. 
 %
 %        Note that if you use this last option you need 
 %         to protect the \cmd{thanks} command:
@@ -1318,6 +1357,13 @@
 % 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}
+%\boolitem[true]{crop}
+% \begin{valuelist}
+% \item[true] An alias for \opt{version=draft} option.
+% \item[false] An alias for \opt{version=center} option.
+% \end{valuelist}
+%
+%
 % \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
 % \end{optionlist}
 % 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).
@@ -1336,7 +1382,8 @@
 %
 %\small\noindent This work is licensed under the Creative Commons 
 %Attribution-NonCommercial-NoDerivs 3.0 Unported License. 
-%To view a copy of this license, 
+%
+%\noindent To view a copy of this license, 
 %visit http://creativecommons.org/licenses/by-nc-nd/3.0/.
 %
 %\footnotesize
@@ -1520,7 +1567,7 @@
   * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
   * ANYWAY, DON'T WORRY!\MessageBreak
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
-  ******************************************}{}%
+  ******************************************}
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@compatibility
 \newif\ifsuftesi@nofont 
@@ -1533,6 +1580,8 @@
 \newif\ifsuftesi@artemisia
 \newif\ifsuftesi@bodoni
 \newif\ifsuftesi@cbgreek
+\newif\ifsuftesi@mathminimal
+\newif\ifsuftesi@mathextended
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@article
@@ -1543,8 +1592,9 @@
 \newif\ifsuftesi@compactaureo
 \newif\ifsuftesi@supercompact
 \newif\ifsuftesi@supercompactaureo
-\newif\ifsuftesi@sufelements
 \newif\ifsuftesi@nocrop
+\newif\ifsuftesi@screen
+\newif\ifsuftesi@screencentered
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
 \newif\ifsuftesi@numparpart
@@ -1555,33 +1605,28 @@
 \newif\ifsuftesi@smallcapspart
 \newif\ifsuftesi@smallcapschap
 \newif\ifsuftesi@smallcapssec
-\newif\ifsuftesi@elementschap
-\newif\ifsuftesi@elementsheader
-\newif\ifsuftesi@elementsstructure
-\newif\ifsuftesi@elementspagelayout
 \newif\ifsuftesi@draftdate
 \newif\ifsuftesi@fewfootnotes
 \newif\ifsuftesi@partpage
 \newif\ifsuftesi@FSPL
-\newif\ifsuftesi@screen
 \newif\ifsuftesi@pagelefttoc
 \newif\ifsuftesi@twocolumntoc
 \newif\ifsuftesi@twocolumnlof
 \newif\ifsuftesi@twocolumnlot
 \newif\ifsuftesi@reverseauthortitle
 \newif\ifsuftesi@collection
-\newif\ifsuftesi@mathminimal
-\newif\ifsuftesi@mathextended
+\DeclareOption{a4paper}{%
+  \ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
 \DeclareOption{a5paper}{%
-  \ClassError{suftesi}{Option 'a5paper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'a5paper' not available}{}}
 \DeclareOption{b5paper}{%
-  \ClassError{suftesi}{Option 'b5paper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'b5paper' not available}{}}
 \DeclareOption{legalpaper}{%
-  \ClassError{suftesi}{Option 'legalpaper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'legalpaper' not available}{}}
 \DeclareOption{executivepaper}{%
-  \ClassError{suftesi}{Option 'executivepaper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'executivepaper' not available}{}}
 \DeclareOption{landscape}{%
-  \ClassError{suftesi}{Option 'landscape' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'landscape' not available}{}}
 %    \end{macrocode}
 % The \sty{suftesi} class is based on the standard \sty{book} class but the previous options are disabled as they contrast with the layouts provided by the class.
 %    \begin{macrocode}
@@ -1605,6 +1650,9 @@
 \fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
+\ClassWarningNoLine{suftesi}{%
+  'documentstructure' option is deprecated.\MessageBreak
+  Use 'structure' option instead}
 \ifcase\nr\relax
 \disable@keys{}{secnumstyle}
 \or
@@ -1620,7 +1668,7 @@
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
     {standard,standardaureo,periodical,compact,compactaureo,supercompact,
-    supercompactaureo,elements,periodicalaureo}[standard]{%
+    supercompactaureo,periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
   \DeclareRobustCommand{\SUF@sectionsize}{\large}
@@ -1632,7 +1680,7 @@
     includeheadfoot=true,
     textwidth=      110mm,
     textheight=     220mm,
-    marginratio=    1:2,
+    marginratio=    2:3,
     marginparwidth= 30mm,
     marginparsep=   12pt}
 \or
@@ -1728,19 +1776,7 @@
     paperheight=    210mm,
     marginratio=    1:1,
     marginparwidth= 11mm,
-    marginparsep=   7pt}\or
-\suftesi@elementspagelayouttrue
-  \geometry{%
-    heightrounded,
-    includeheadfoot=false,
-    textwidth=      251pt,
-    textheight=     502pt,
-    paperwidth=     374pt,
-    paperheight=    648pt,
-    vmarginratio=   1:2,
-    marginparwidth= 60pt,
-    marginparsep=   18pt,
-    outer=          90pt}
+    marginparsep=   7pt}
 \or
 \suftesi@periodicalaureotrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
@@ -1781,7 +1817,7 @@
   \suftesi@numparparttrue
 \fi}
 \define@choicekey{}{chapstyle}[\val\nr]{%
-    left,center,right,parleft,parcenter,parright,elements}[left]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@CHAPSwitch{\filright}
 \or
@@ -1797,8 +1833,6 @@
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
   \suftesi@numparchaptrue
-\or
-  \suftesi@elementschaptrue
 \fi}
 \define@choicekey{}{secstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
@@ -2021,7 +2055,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
-     authortitlecenter,elements}[inner]{%
+     authortitlecenter}[inner]{%
 \ifcase\nr\relax
   \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
   \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
@@ -2040,8 +2074,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}}
   \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}}
   \suftesi@centerheadertrue
-\or
-  \suftesi@elementsheadertrue
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Header font}
@@ -2141,7 +2173,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \RequirePackage{caption}
 \define@choicekey{}{captionstyle}[\val\nr]
-    {standard,sanserif,italic,smallcaps,elements}[standard]{%
+    {standard,sanserif,italic,smallcaps}[standard]{%
 \ifcase\nr\relax
    \captionsetup{labelsep=period,font=small}
 \or
@@ -2152,9 +2184,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
    \captionsetup{font+=it}
 \or
    \captionsetup{labelsep=period,font=small,labelfont=sc}
-\or
-   \captionsetup{labelsep=period,font=small}
-   \captionsetup{font+=sf}
 \fi
 }
 %    \end{macrocode}
@@ -2293,21 +2322,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 % \subsubsection*{View mode}
 %    \begin{macrocode}
 \define@choicekey{}{version}[\val\nr]
-    {screen,draft,final}[draft]{%
+    {screen,cscreen,draft,final}[draft]{%
 \ifcase\nr\relax
+  \suftesi@screentrue
+  \suftesi@nocroptrue
+\or
+  \suftesi@screentrue
+  \suftesi@screencenteredtrue
   \suftesi@nocroptrue
-  \newcommand*\crop[1][]{}
-  \geometry{hmarginratio=1:1}
 \or
 \or
   \AtBeginDocument{\crop[off]}
 \fi}
 \define@choicekey{}{crop}[\val\nr]
     {true,false}[true]{%
+\ClassWarningNoLine{suftesi}{%
+  'crop' option is deprecated.\MessageBreak
+  Use 'version' option instead}
 \ifcase\nr\relax
+  \suftesi@screenfalse
 \or
   \suftesi@nocroptrue
-  \newcommand*\crop[1][]{}
+  \suftesi@screentrue
+  \suftesi@screencenteredfalse
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Titlepage}
@@ -2328,7 +2365,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   italic7,italic8,italic9,italic10,italic11,italic12,
   smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
   smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
-  elements,sufelements,FSPLa,FSPLb,FSPLc}  
+  FSPLa,FSPLb,FSPLc}  
   [roman1]{%
 \ifcase\nr\relax
 %    \end{macrocode}
@@ -2350,60 +2387,60 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 % \paragraph{The `italic' styles}
 %    \begin{macrocode}
   \setkeys{}{
-  chapstyle=left,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=left,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=center,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=center,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=right,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=right,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parleft,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=parleft,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parcenter,
-  chapfont=italic,
-  headerfont=italic}
+   chapstyle=parcenter,
+   chapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parright,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=parright,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=left,
-  chapfont=italic,
-  tocchapfont=italic,
-  secfont=smallcaps,
-  headerfont=italic}
+   chapstyle=left,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=center,
-  chapfont=italic,
-  tocchapfont=italic,
-  secfont=smallcaps,
-  headerfont=italic}
+   chapstyle=center,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=right,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=right,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
    chapstyle=parleft,
@@ -2413,18 +2450,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
    headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=parcenter,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=parcenter,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=parright,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=parright,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
 %    \end{macrocode}
 % \paragraph{The smallcaps' styles}
@@ -2508,30 +2545,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   headerfont=smallcaps}
 \or
 %    \end{macrocode}
-% \paragraph{The `elements' style}
-%    \begin{macrocode}
-  \setkeys{}{
-    pagelayout=elements,
-    headerstyle=elements,
-    chapstyle=elements,
-    secfont=smallcaps,
-    subsecfont=italic,    
-    captionstyle=elements}
-\disable@keys{}
-    {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle}
-\or
-%    \end{macrocode}
-% \paragraph{The sufelements' style}
-%    \begin{macrocode}
-  \setkeys{}{
-    chapstyle=elements,
-    headerfont=smallcaps,
-    secfont=smallcaps,
-    subsecfont=italic}
-\disable@keys{}
-    {headerstyle,chapstyle,secfont,subsecfont}
-\or
-%    \end{macrocode}
 % \paragraph{The \opt{FSPL} styles}
 %    \begin{macrocode}
 \suftesi@periodicalaureotrue
@@ -2545,7 +2558,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -2563,7 +2576,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -2582,7 +2595,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -2697,15 +2710,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{ifxetex}
-\RequirePackage{ifluatex}
-\RequirePackage{ifthen}
+\RequirePackage{iftex}
 \RequirePackage{microtype}
 \RequirePackage{textcase}
 %    \end{macrocode}
 % The \cmd{MakeTextLowercase} command provided by \sty{textcase} conflicts with \sty{hyperref} when the command is used to format the TOC entries (for example when unsing the \opt{tocchapfont=smallcaps} option). Thanks to the user \emph{skevin93} of the GuIT forum (www.guitex.org/home/it/forum) for this macro:
 %    \begin{macrocode}
-    \AtBeginDocument{
+\AtBeginDocument{
     \@ifpackageloaded{hyperref}{%
     \def\@uclcnotmath#1#2#3#4{\begingroup #1%
     \def \({$}\let \)\(\def \NoCaseChange ##1{%
@@ -2733,7 +2744,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \RequirePackage{cclicenses}
  \else
 \fi
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
 %    \end{macrocode}
 %
 % \subsection*{Fonts}
@@ -2741,7 +2751,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % With \XeTeX{} we do not load any fonts. Anyway the \sty{fontspec}
 % package is required because some commands of the class are base on it.
 %    \begin{macrocode}
-{% if xetex or luatex
+\unless\ifPDFTeX%if xelatex or lualatex
 \AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
@@ -2759,11 +2769,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     * load 'fontspec' \MessageBreak
     ************************************}}
   }
-  }
 %    \end{macrocode}
 % 
 %    \begin{macrocode}
-{% if pdftex
+\else% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
@@ -2776,7 +2785,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \ifsuftesi@nofont
     \ifsuftesi@greekfont
       \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}{}%
+        Unused 'greekfont' option}%
         \suftesi@greekfontfalse  
           \else\suftesi@greekfontfalse\fi     
 \else
@@ -2784,7 +2793,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \RequirePackage{lmodern}
     \ifsuftesi@greekfont
       \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}{}%
+        Unused 'greekfont' option}%
         \suftesi@greekfontfalse  
           \else\suftesi@greekfontfalse\fi     
 \else
@@ -2816,34 +2825,32 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi 
       \fi 
       \else
-      \ClassError{suftesi}{\MessageBreak
-      Set one of the following options\MessageBreak
-      greekfont=artemisia,\MessageBreak 
-      greekfont=porson,\MessageBreak 
-      greekfont=cbgreek}{\MessageBreak
-      Set one of the following options\MessageBreak
-      greekfont=artemisia,\MessageBreak 
-      greekfont=porson,\MessageBreak 
+      \ClassWarningNoLine{suftesi}{\MessageBreak
+      If you need the Greek font remember\MessageBreak
+      to set one of the following options:\MessageBreak
+      greekfont=artemisia,\MessageBreak
+      greekfont=porson,\MessageBreak
       greekfont=cbgreek}
       \fi
 \else
   \ifsuftesi@palatino
     \RequirePackage[full]{textcomp}
-         \RequirePackage[osf]{newpxtext}
+         \RequirePackage{newpxtext}
          \RequirePackage[scaled=1.06]{biolinum}
          \RequirePackage[varqu,varl]{inconsolata}
          \ifsuftesi@mathextended
-         \RequirePackage{amsmath}
          \RequirePackage{amsthm}
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
          \RequirePackage[cal=boondoxo]{mathalfa} 
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa} 
          \else
          \fi
          \fi
+         \useosf
+         \useproportional
+      \ifsuftesi@greekfont
       \ifsuftesi@bodoni
       \gdef\SUFfntscale{0.96}
       \else
@@ -2860,20 +2867,26 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi 
       \fi 
       \fi 
+      \else
+      \ClassWarningNoLine{suftesi}{\MessageBreak
+      If you need the Greek font remember\MessageBreak
+      to set one of the following options:\MessageBreak
+      greekfont=artemisia,\MessageBreak
+      greekfont=porson,\MessageBreak
+      greekfont=cbgreek}
+      \fi
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
          \RequirePackage[sb]{libertine}
          \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
          \ifsuftesi@mathextended
-         \RequirePackage{amsmath}
          \RequirePackage{amsthm}
          \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
          \RequirePackage[cal=boondoxo]{mathalfa} 
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa} 
          \else
          \fi
          \fi
@@ -2897,14 +2910,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \RequirePackage[varqu,varl,var0]{inconsolata}
         \RequirePackage{biolinum}
         \ifsuftesi@mathextended
-        \RequirePackage{amsmath}
         \RequirePackage{amsthm}
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
         \RequirePackage[cal=boondoxo]{mathalfa}
         \else
         \ifsuftesi@mathminimal
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalfa}
         \else
         \fi
         \fi
@@ -2929,11 +2940,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
     \fi
     \fi
-}
+\fi
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ifxetex\else\ifluatex\else
+\unless\ifPDFTeX\else
 \ifsuftesi@greekfont
     \ifsuftesi@artemisia
       \def\SUF@greekfamily{artemisia}
@@ -3010,10 +3021,21 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \else
 \fi
 \fi
-\fi
 %    \end{macrocode}
 % \subsection*{Page layout}
 %    \begin{macrocode}
+\ifsuftesi@screen
+  \newcommand*\crop[1][]{}
+    \ifsuftesi@screencentered
+      \geometry{hmarginratio=1:1}
+    \else
+  \fi
+\else
+  \RequirePackage[a4,cam,center]{crop}
+\fi
+%    \end{macrocode}
+% The \opt{crop} option is provided only for backward compatibility.
+%    \begin{macrocode}
 \ifsuftesi@nocrop
   \relax
     \else
@@ -3025,70 +3047,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
-  {% if xetex or luatex
+\unless\ifPDFTeX% if xetex or luatex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
-    \newcommand{\chapnumfont}[1]{%
-      \def\SUF@chapnumfont{#1}}
-      \chapnumfont{\relax}%
-  }
-  {% if pdftex
+\else% if pdftex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
-  \newcommand{\chapnumfont}[1]{%
-    \def\SUF@chapnumfont{\fontfamily{#1}}}
-    \chapnumfont{pplj}
-  }
-%    \end{macrocode}
-% 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}}
-\def\SUF@elements@CHAPTER{%
-  \titleformat{\chapter}[block]
-     {\Large}%
-     {\begin{picture}(0,0)
-     \setlength{\unitlength}{1pt}
-	     \SUF@chapnumfont%
-	     \cmdSUF@elements@chapsize
-	      \put(0,\cmdSUF@elements@chapposition){%
-       \hskip\dimexpr(\textwidth+0.9\marginparsep)%
-        \textcolor{sufgray}{\SUF@thechapter}}%
-   \end{picture}}%
-  {0pt}
-  {\SUF@titlesmallcaps}
-  [\vspace*{-6pt}\rule{\textwidth}{.1pt}]
-  }
-%    \end{macrocode}
-% The sections for elements style:
-%    \begin{macrocode}
-\def\SUF@elements@SECTIONS{
-\titleformat{\section}[block]
-	  {\extramarks{}{}\filright}
-	  {\textnormal\thesection}
-	  {1em}
-	  {\SUF@titlesmallcaps}
-	\titlespacing*{\section}{0em}{1em}{1em}[0em] 
-\titleformat{\subsection}[block]
-	  {\filright\normalsize\itshape}
-	  {\textnormal\thesubsection}
-	  {1em}
-	  {}
-  \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] 
-\titleformat{\subsubsection}[block]
-	  {\filright\normalsize}
-	  {\textnormal\thesubsubsection}
-	  {1em}
-	  {}
-  \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] 
-}
+\fi
 %    \end{macrocode}
 % Default styles:
 %    \begin{macrocode}
@@ -3167,50 +3136,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 	\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
   \fi
 }
-\ifsuftesi@elementschap
-\RequirePackage{extramarks}
-  \SUF@elements@CHAPTER
-  \SUF@elements@SECTIONS
-\ifsuftesi@periodical
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
-\else
-\ifsuftesi@periodicalaureo
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
-\else
-\ifsuftesi@compact
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
-\else
-\ifsuftesi@compactaureo
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
-\else
-\ifsuftesi@supercompact
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
-\else
-\ifsuftesi@supercompactaureo
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
-\else
-\ifsuftesi@elementspagelayout
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=60,chapposition=-73}
-\else
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=90,chapposition=-83}
-            \fi
-          \fi
-        \fi
-      \fi
-    \fi
-  \fi
-\fi
-\else
-  \SUF@default@CHAPTER
-  \SUF@default@SECTIONS
+\SUF@default@CHAPTER
+\SUF@default@SECTIONS
 \ifsuftesi@periodicalaureo
   \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
@@ -3230,9 +3157,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \titlespacing*{\chapter}{0em}{%
      \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}	
         \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
-        \fi
-      \fi
-    \fi
+       \fi
+     \fi
   \fi
 \fi
 %    \end{macrocode}
@@ -3460,7 +3386,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  ***********************************\MessageBreak
  * To use the \noexpand\makecover command\MessageBreak
  * load the 'tikz' package.\MessageBreak
- ************************************}{}}}
+ ************************************}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}}}
 }
 %    \end{macrocode}
 % \subsection*{Title page}
@@ -3990,35 +3920,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   {}
   [\addvspace{1ex}]
 }
-%    \end{macrocode}
-%    \begin{macrocode}
-\ifsuftesi@sufelements
-\renewcommand\appendix{\par
+\ifsuftesi@article
+  \renewcommand\appendix{\par
+    \setcounter{section}{0}%
+    \setcounter{subsection}{0}%
+    \gdef\SUF@thesection{\@Alph\c@section}}
+\else
+  \renewcommand\appendix{\par
     \setcounter{chapter}{0}%
     \setcounter{section}{0}%
     \gdef\@chapapp{\appendixname}%
-    \gdef\thechapter{\@Alph\c@chapter}
-    \titleformat{\chapter}[block]
-      {\vskip-22pt}%
-      {\small%
-      \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
-      {0pt}
-      {\small\SUF@titlesmallcaps}
-      [\rule{\textwidth}{.4pt}]
-      \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]}
-    \else
-      \ifsuftesi@article
-          \renewcommand\appendix{\par
-              \setcounter{section}{0}%
-              \setcounter{subsection}{0}%
-              \gdef\SUF@thesection{\@Alph\c@section}}
-   \else
-         \renewcommand\appendix{\par
-             \setcounter{chapter}{0}%
-             \setcounter{section}{0}%
-             \gdef\@chapapp{\appendixname}%
-             \gdef\SUF@thechapter{\@Alph\c@chapter}}
-    \fi
+    \gdef\SUF@thechapter{\@Alph\c@chapter}}
 \fi
 %    \end{macrocode}
 % \subsection*{Headings}
@@ -4032,40 +3944,15 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
 %    \end{macrocode}
-% \paragraph{The \opt{elements} headers}
-%    \begin{macrocode}
-\ifsuftesi@elementsheader% 
-  \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
-  \renewcommand{\sectionmark}[1]{\markright{#1}}
-		 \fancypagestyle{elements}{%
-		  \setlength{\unitlength}{1pt}
-		   \fancyhf{}
-		   \fancyfoot[LE,RO]{\thepage} 
-		   \fancyhead[RO]{%
-		    \begin{picture}(0,0)
-		      \put(0,-104){%
-		      \hskip\marginparsep
-		      \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
-		    \end{picture}}
-		   \fancyhead[LE]{%
-		     \begin{picture}(0,0)
-		       \put(0,-104){%
-		       \hskip-\dimexpr(\marginparwidth+\marginparsep)
-		       \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
-		    \end{picture}}%
-		  }%
-\else
-%    \end{macrocode}
 % \paragraph{The \opt{default} headers}
 %    \begin{macrocode}
-	\renewcommand{\chaptermark}[1]{%
-	    \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+\renewcommand{\chaptermark}[1]{%
+  \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
 	\ifsuftesi@article
 	  \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}}
 	    \else
 	  \renewcommand{\sectionmark}[1]{}
 	\fi
-\fi
 %    \end{macrocode}
 % \paragraph{The \opt{plain} style}
 %    \begin{macrocode}
@@ -4119,9 +4006,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 %    \begin{macrocode}
 \pagestyle{sufdefault}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
-  \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
-  \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
-}
+  \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
 %    \end{macrocode}
 % \subsection*{Text elements}
 %
@@ -4185,13 +4070,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % André \textcite{Miede:2011}\index{Miede, André}. 
 %    \begin{macrocode}
 \def\SUF@mpsetup{%
-%    \end{macrocode}
-% In the \emph{The Elements of Typographic Style} (with \opt{elements} option) 
-% the marginal notes are printed in roman, 
-% but I prefer italic shape for the other options:
-%    \begin{macrocode}
-    \ifsuftesi@elementsheader\relax
-      \else\itshape\fi
+  \itshape
     \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
@@ -4918,9 +4797,11 @@ Janusz M. Nowacki.
 % using \XeLaTeX{} with Italian as the main language. Anyway this is 
 % incongruous with the \LaTeX{} default.
 %    \begin{macrocode}
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
-  {\let\@afterindenttrue\@afterindentfalse}
-  {\relax}
+\unless\ifPDFTeX% if xetex or luatex
+  \let\@afterindenttrue\@afterindentfalse
+    \else
+  \relax
+\fi
 %    \end{macrocode}
 % Just one touch of french typography:
 %    \begin{macrocode}
@@ -5053,7 +4934,8 @@ Janusz M. Nowacki.
 	Number = {14},
 	Pages = {15-30},
 	Subtitle = {La classe suftesi},
-	Title = {La forma del testo umanistico}}
+	Title = {La forma del testo umanistico},
+	url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
 
 
 @book{munari:arte-come-mestiere,
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 01d9cb1d1dd..e737293a29b 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -6,7 +6,7 @@
 %%
 %% suftesi.dtx  (with options: `class')
 %% 
-%%  Copyright 2009-2015 by Ivan Valbusa
+%%  Copyright 2009-2016 by Ivan Valbusa
 %% 
 %%  This program is provided under the terms of the
 %%  LaTeX Project Public License distributed from CTAN
@@ -19,10 +19,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2016/03/13 v2.6 A class for typesetting theses, books and articles]
-%%
-%% \section*{Feedback}
- % \begin{table}[h]
+    [2016/03/22 v2.7.1 A class for typesetting theses, books and articles]
 
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
@@ -32,7 +29,7 @@
   * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
   * ANYWAY, DON'T WORRY!\MessageBreak
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
-  ******************************************}{}%
+  ******************************************}
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@compatibility
 \newif\ifsuftesi@nofont
@@ -45,6 +42,8 @@
 \newif\ifsuftesi@artemisia
 \newif\ifsuftesi@bodoni
 \newif\ifsuftesi@cbgreek
+\newif\ifsuftesi@mathminimal
+\newif\ifsuftesi@mathextended
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@article
@@ -55,8 +54,9 @@
 \newif\ifsuftesi@compactaureo
 \newif\ifsuftesi@supercompact
 \newif\ifsuftesi@supercompactaureo
-\newif\ifsuftesi@sufelements
 \newif\ifsuftesi@nocrop
+\newif\ifsuftesi@screen
+\newif\ifsuftesi@screencentered
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
 \newif\ifsuftesi@numparpart
@@ -67,33 +67,28 @@
 \newif\ifsuftesi@smallcapspart
 \newif\ifsuftesi@smallcapschap
 \newif\ifsuftesi@smallcapssec
-\newif\ifsuftesi@elementschap
-\newif\ifsuftesi@elementsheader
-\newif\ifsuftesi@elementsstructure
-\newif\ifsuftesi@elementspagelayout
 \newif\ifsuftesi@draftdate
 \newif\ifsuftesi@fewfootnotes
 \newif\ifsuftesi@partpage
 \newif\ifsuftesi@FSPL
-\newif\ifsuftesi@screen
 \newif\ifsuftesi@pagelefttoc
 \newif\ifsuftesi@twocolumntoc
 \newif\ifsuftesi@twocolumnlof
 \newif\ifsuftesi@twocolumnlot
 \newif\ifsuftesi@reverseauthortitle
 \newif\ifsuftesi@collection
-\newif\ifsuftesi@mathminimal
-\newif\ifsuftesi@mathextended
+\DeclareOption{a4paper}{%
+  \ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
 \DeclareOption{a5paper}{%
-  \ClassError{suftesi}{Option 'a5paper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'a5paper' not available}{}}
 \DeclareOption{b5paper}{%
-  \ClassError{suftesi}{Option 'b5paper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'b5paper' not available}{}}
 \DeclareOption{legalpaper}{%
-  \ClassError{suftesi}{Option 'legalpaper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'legalpaper' not available}{}}
 \DeclareOption{executivepaper}{%
-  \ClassError{suftesi}{Option 'executivepaper' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'executivepaper' not available}{}}
 \DeclareOption{landscape}{%
-  \ClassError{suftesi}{Option 'landscape' not available}}
+  \ClassWarningNoLine{suftesi}{Option 'landscape' not available}{}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ProcessOptions
 \relax
@@ -111,6 +106,9 @@
 \fi}
 \define@choicekey{}{documentstructure}[\val\nr]
     {book,article,collection}[book]{%
+\ClassWarningNoLine{suftesi}{%
+  'documentstructure' option is deprecated.\MessageBreak
+  Use 'structure' option instead}
 \ifcase\nr\relax
 \disable@keys{}{secnumstyle}
 \or
@@ -123,7 +121,7 @@
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
     {standard,standardaureo,periodical,compact,compactaureo,supercompact,
-    supercompactaureo,elements,periodicalaureo}[standard]{%
+    supercompactaureo,periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
   \DeclareRobustCommand{\SUF@sectionsize}{\large}
@@ -135,7 +133,7 @@
     includeheadfoot=true,
     textwidth=      110mm,
     textheight=     220mm,
-    marginratio=    1:2,
+    marginratio=    2:3,
     marginparwidth= 30mm,
     marginparsep=   12pt}
 \or
@@ -231,19 +229,7 @@
     paperheight=    210mm,
     marginratio=    1:1,
     marginparwidth= 11mm,
-    marginparsep=   7pt}\or
-\suftesi@elementspagelayouttrue
-  \geometry{%
-    heightrounded,
-    includeheadfoot=false,
-    textwidth=      251pt,
-    textheight=     502pt,
-    paperwidth=     374pt,
-    paperheight=    648pt,
-    vmarginratio=   1:2,
-    marginparwidth= 60pt,
-    marginparsep=   18pt,
-    outer=          90pt}
+    marginparsep=   7pt}
 \or
 \suftesi@periodicalaureotrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
@@ -281,7 +267,7 @@
   \suftesi@numparparttrue
 \fi}
 \define@choicekey{}{chapstyle}[\val\nr]{%
-    left,center,right,parleft,parcenter,parright,elements}[left]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@CHAPSwitch{\filright}
 \or
@@ -297,8 +283,6 @@
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
   \suftesi@numparchaptrue
-\or
-  \suftesi@elementschaptrue
 \fi}
 \define@choicekey{}{secstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
@@ -496,7 +480,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
-     authortitlecenter,elements}[inner]{%
+     authortitlecenter}[inner]{%
 \ifcase\nr\relax
   \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
   \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
@@ -515,8 +499,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}}
   \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}}
   \suftesi@centerheadertrue
-\or
-  \suftesi@elementsheadertrue
 \fi}
 \define@choicekey{}{headerfont}[\val\nr]
     {roman,italic,smallcaps}[roman]{%
@@ -600,7 +582,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 \RequirePackage{caption}
 \define@choicekey{}{captionstyle}[\val\nr]
-    {standard,sanserif,italic,smallcaps,elements}[standard]{%
+    {standard,sanserif,italic,smallcaps}[standard]{%
 \ifcase\nr\relax
    \captionsetup{labelsep=period,font=small}
 \or
@@ -611,9 +593,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
    \captionsetup{font+=it}
 \or
    \captionsetup{labelsep=period,font=small,labelfont=sc}
-\or
-   \captionsetup{labelsep=period,font=small}
-   \captionsetup{font+=sf}
 \fi
 }
 \define@choicekey{}{marginpar}[\val\nr]
@@ -726,21 +705,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \or
 \fi}
 \define@choicekey{}{version}[\val\nr]
-    {screen,draft,final}[draft]{%
+    {screen,cscreen,draft,final}[draft]{%
 \ifcase\nr\relax
+  \suftesi@screentrue
+  \suftesi@nocroptrue
+\or
+  \suftesi@screentrue
+  \suftesi@screencenteredtrue
   \suftesi@nocroptrue
-  \newcommand*\crop[1][]{}
-  \geometry{hmarginratio=1:1}
 \or
 \or
   \AtBeginDocument{\crop[off]}
 \fi}
 \define@choicekey{}{crop}[\val\nr]
     {true,false}[true]{%
+\ClassWarningNoLine{suftesi}{%
+  'crop' option is deprecated.\MessageBreak
+  Use 'version' option instead}
 \ifcase\nr\relax
+  \suftesi@screenfalse
 \or
   \suftesi@nocroptrue
-  \newcommand*\crop[1][]{}
+  \suftesi@screentrue
+  \suftesi@screencenteredfalse
 \fi}
 \define@choicekey{}{titlepage}[\val\nr]
     {true,false}[true]{%
@@ -755,7 +742,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   italic7,italic8,italic9,italic10,italic11,italic12,
   smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
   smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
-  elements,sufelements,FSPLa,FSPLb,FSPLc}
+  FSPLa,FSPLb,FSPLc}
   [roman1]{%
 \ifcase\nr\relax
   \setkeys{}{chapstyle=left}
@@ -771,60 +758,60 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \setkeys{}{chapstyle=parright}
 \or
   \setkeys{}{
-  chapstyle=left,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=left,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=center,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=center,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=right,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=right,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parleft,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=parleft,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parcenter,
-  chapfont=italic,
-  headerfont=italic}
+   chapstyle=parcenter,
+   chapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=parright,
-  chapfont=italic,
-  tocchapfont=italic,
-  headerfont=italic}
+   chapstyle=parright,
+   chapfont=italic,
+   tocchapfont=italic,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=left,
-  chapfont=italic,
-  tocchapfont=italic,
-  secfont=smallcaps,
-  headerfont=italic}
+   chapstyle=left,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-  chapstyle=center,
-  chapfont=italic,
-  tocchapfont=italic,
-  secfont=smallcaps,
-  headerfont=italic}
+   chapstyle=center,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=right,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=right,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
    chapstyle=parleft,
@@ -834,18 +821,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
    headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=parcenter,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=parcenter,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
-    chapstyle=parright,
-    chapfont=italic,
-    tocchapfont=italic,
-    secfont=smallcaps,
-    headerfont=italic}
+   chapstyle=parright,
+   chapfont=italic,
+   tocchapfont=italic,
+   secfont=smallcaps,
+   headerfont=italic}
 \or
   \setkeys{}{
   chapstyle=left,
@@ -925,24 +912,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   secfont=smallcaps,
   headerfont=smallcaps}
 \or
-  \setkeys{}{
-    pagelayout=elements,
-    headerstyle=elements,
-    chapstyle=elements,
-    secfont=smallcaps,
-    subsecfont=italic,
-    captionstyle=elements}
-\disable@keys{}
-    {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle}
-\or
-  \setkeys{}{
-    chapstyle=elements,
-    headerfont=smallcaps,
-    secfont=smallcaps,
-    subsecfont=italic}
-\disable@keys{}
-    {headerstyle,chapstyle,secfont,subsecfont}
-\or
 \suftesi@periodicalaureotrue
 \suftesi@FSPLtrue
   \setkeys{}{%
@@ -954,7 +923,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -972,7 +941,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -991,7 +960,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     liststyle=indented,
     tocstyle=leftpage}
 \disable@keys{}
-{structure,pagelayout,partfont,chapfont,secfont,%
+{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
 subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
 subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
 secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
@@ -1085,12 +1054,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{ifxetex}
-\RequirePackage{ifluatex}
-\RequirePackage{ifthen}
+\RequirePackage{iftex}
 \RequirePackage{microtype}
 \RequirePackage{textcase}
-    \AtBeginDocument{
+\AtBeginDocument{
     \@ifpackageloaded{hyperref}{%
     \def\@uclcnotmath#1#2#3#4{\begingroup #1%
     \def \({$}\let \)\(\def \NoCaseChange ##1{%
@@ -1115,8 +1082,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \RequirePackage{cclicenses}
  \else
 \fi
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
-{% if xetex or luatex
+\unless\ifPDFTeX%if xelatex or lualatex
 \AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
@@ -1134,15 +1100,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     * load 'fontspec' \MessageBreak
     ************************************}}
   }
-  }
-{% if pdftex
+\else% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
 \ifsuftesi@nofont
     \ifsuftesi@greekfont
       \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}{}%
+        Unused 'greekfont' option}%
         \suftesi@greekfontfalse
           \else\suftesi@greekfontfalse\fi
 \else
@@ -1150,7 +1115,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \RequirePackage{lmodern}
     \ifsuftesi@greekfont
       \ClassWarningNoLine{suftesi}{%
-        Unused 'greekfont' option}{}%
+        Unused 'greekfont' option}%
         \suftesi@greekfontfalse
           \else\suftesi@greekfontfalse\fi
 \else
@@ -1176,12 +1141,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi
       \fi
       \else
-      \ClassError{suftesi}{\MessageBreak
-      Set one of the following options\MessageBreak
-      greekfont=artemisia,\MessageBreak
-      greekfont=porson,\MessageBreak
-      greekfont=cbgreek}{\MessageBreak
-      Set one of the following options\MessageBreak
+      \ClassWarningNoLine{suftesi}{\MessageBreak
+      If you need the Greek font remember\MessageBreak
+      to set one of the following options:\MessageBreak
       greekfont=artemisia,\MessageBreak
       greekfont=porson,\MessageBreak
       greekfont=cbgreek}
@@ -1189,21 +1151,22 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \else
   \ifsuftesi@palatino
     \RequirePackage[full]{textcomp}
-         \RequirePackage[osf]{newpxtext}
+         \RequirePackage{newpxtext}
          \RequirePackage[scaled=1.06]{biolinum}
          \RequirePackage[varqu,varl]{inconsolata}
          \ifsuftesi@mathextended
-         \RequirePackage{amsmath}
          \RequirePackage{amsthm}
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
          \RequirePackage[cal=boondoxo]{mathalfa}
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa}
          \else
          \fi
          \fi
+         \useosf
+         \useproportional
+      \ifsuftesi@greekfont
       \ifsuftesi@bodoni
       \gdef\SUFfntscale{0.96}
       \else
@@ -1220,20 +1183,26 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \fi
       \fi
       \fi
+      \else
+      \ClassWarningNoLine{suftesi}{\MessageBreak
+      If you need the Greek font remember\MessageBreak
+      to set one of the following options:\MessageBreak
+      greekfont=artemisia,\MessageBreak
+      greekfont=porson,\MessageBreak
+      greekfont=cbgreek}
+      \fi
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
          \RequirePackage[sb]{libertine}
          \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
          \ifsuftesi@mathextended
-         \RequirePackage{amsmath}
          \RequirePackage{amsthm}
          \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
          \RequirePackage[cal=boondoxo]{mathalfa}
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa}
          \else
          \fi
          \fi
@@ -1257,14 +1226,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \RequirePackage[varqu,varl,var0]{inconsolata}
         \RequirePackage{biolinum}
         \ifsuftesi@mathextended
-        \RequirePackage{amsmath}
         \RequirePackage{amsthm}
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
         \RequirePackage[cal=boondoxo]{mathalfa}
         \else
         \ifsuftesi@mathminimal
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalfa}
         \else
         \fi
         \fi
@@ -1289,8 +1256,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
     \fi
     \fi
-}
-\ifxetex\else\ifluatex\else
+\fi
+\unless\ifPDFTeX\else
 \ifsuftesi@greekfont
     \ifsuftesi@artemisia
       \def\SUF@greekfamily{artemisia}
@@ -1360,6 +1327,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \else
 \fi
 \fi
+\ifsuftesi@screen
+  \newcommand*\crop[1][]{}
+    \ifsuftesi@screencentered
+      \geometry{hmarginratio=1:1}
+    \else
+  \fi
+\else
+  \RequirePackage[a4,cam,center]{crop}
 \fi
 \ifsuftesi@nocrop
   \relax
@@ -1369,64 +1344,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
-  {% if xetex or luatex
+\unless\ifPDFTeX% if xetex or luatex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
-    \newcommand{\chapnumfont}[1]{%
-      \def\SUF@chapnumfont{#1}}
-      \chapnumfont{\relax}%
-  }
-  {% if pdftex
+\else% if pdftex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
-  \newcommand{\chapnumfont}[1]{%
-    \def\SUF@chapnumfont{\fontfamily{#1}}}
-    \chapnumfont{pplj}
-  }
-\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}}
-\def\SUF@elements@CHAPTER{%
-  \titleformat{\chapter}[block]
-     {\Large}%
-     {\begin{picture}(0,0)
-     \setlength{\unitlength}{1pt}
-     \SUF@chapnumfont%
-     \cmdSUF@elements@chapsize
-      \put(0,\cmdSUF@elements@chapposition){%
-       \hskip\dimexpr(\textwidth+0.9\marginparsep)%
-        \textcolor{sufgray}{\SUF@thechapter}}%
-   \end{picture}}%
-  {0pt}
-  {\SUF@titlesmallcaps}
-  [\vspace*{-6pt}\rule{\textwidth}{.1pt}]
-  }
-\def\SUF@elements@SECTIONS{
-\titleformat{\section}[block]
-  {\extramarks{}{}\filright}
-  {\textnormal\thesection}
-  {1em}
-  {\SUF@titlesmallcaps}
-\titlespacing*{\section}{0em}{1em}{1em}[0em]
-\titleformat{\subsection}[block]
-  {\filright\normalsize\itshape}
-  {\textnormal\thesubsection}
-  {1em}
-  {}
-  \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em]
-\titleformat{\subsubsection}[block]
-  {\filright\normalsize}
-  {\textnormal\thesubsubsection}
-  {1em}
-  {}
-  \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
-}
+\fi
 \newlength\SUF@ADJnumparchap
 \def\SUF@default@CHAPTER{
 \ifsuftesi@numparchap
@@ -1496,50 +1424,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
   \fi
 }
-\ifsuftesi@elementschap
-\RequirePackage{extramarks}
-  \SUF@elements@CHAPTER
-  \SUF@elements@SECTIONS
-\ifsuftesi@periodical
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
-\else
-\ifsuftesi@periodicalaureo
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
-\else
-\ifsuftesi@compact
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
-\else
-\ifsuftesi@compactaureo
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
-\else
-\ifsuftesi@supercompact
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
-\else
-\ifsuftesi@supercompactaureo
-  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
-\else
-\ifsuftesi@elementspagelayout
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=60,chapposition=-73}
-\else
-  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
-    \setkeys[SUF]{elements}{chapsize=90,chapposition=-83}
-            \fi
-          \fi
-        \fi
-      \fi
-    \fi
-  \fi
-\fi
-\else
-  \SUF@default@CHAPTER
-  \SUF@default@SECTIONS
+\SUF@default@CHAPTER
+\SUF@default@SECTIONS
 \ifsuftesi@periodicalaureo
   \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
@@ -1559,9 +1445,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
         \titlespacing*{\chapter}{0em}{%
      \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
         \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
-        \fi
-      \fi
-    \fi
+       \fi
+     \fi
   \fi
 \fi
 \ifsuftesi@article
@@ -1762,7 +1647,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  ***********************************\MessageBreak
  * To use the \noexpand\makecover command\MessageBreak
  * load the 'tikz' package.\MessageBreak
- ************************************}{}}}
+ ************************************}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}}}
 }
 \def\isbn#1{\gdef\@isbn{#1}}
   \def\@issn{\@latex@warning@no@line{%
@@ -2227,33 +2116,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   {}
   [\addvspace{1ex}]
 }
-\ifsuftesi@sufelements
-\renewcommand\appendix{\par
+\ifsuftesi@article
+  \renewcommand\appendix{\par
+    \setcounter{section}{0}%
+    \setcounter{subsection}{0}%
+    \gdef\SUF@thesection{\@Alph\c@section}}
+\else
+  \renewcommand\appendix{\par
     \setcounter{chapter}{0}%
     \setcounter{section}{0}%
     \gdef\@chapapp{\appendixname}%
-    \gdef\thechapter{\@Alph\c@chapter}
-    \titleformat{\chapter}[block]
-      {\vskip-22pt}%
-      {\small%
-      \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
-      {0pt}
-      {\small\SUF@titlesmallcaps}
-      [\rule{\textwidth}{.4pt}]
-      \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]}
-    \else
-      \ifsuftesi@article
-          \renewcommand\appendix{\par
-              \setcounter{section}{0}%
-              \setcounter{subsection}{0}%
-              \gdef\SUF@thesection{\@Alph\c@section}}
-   \else
-         \renewcommand\appendix{\par
-             \setcounter{chapter}{0}%
-             \setcounter{section}{0}%
-             \gdef\@chapapp{\appendixname}%
-             \gdef\SUF@thechapter{\@Alph\c@chapter}}
-    \fi
+    \gdef\SUF@thechapter{\@Alph\c@chapter}}
 \fi
 \RequirePackage{fancyhdr}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2263,35 +2136,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
-\ifsuftesi@elementsheader%
-  \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
-  \renewcommand{\sectionmark}[1]{\markright{#1}}
- \fancypagestyle{elements}{%
-  \setlength{\unitlength}{1pt}
-   \fancyhf{}
-   \fancyfoot[LE,RO]{\thepage}
-   \fancyhead[RO]{%
-    \begin{picture}(0,0)
-      \put(0,-104){%
-      \hskip\marginparsep
-      \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
-    \end{picture}}
-   \fancyhead[LE]{%
-     \begin{picture}(0,0)
-       \put(0,-104){%
-       \hskip-\dimexpr(\marginparwidth+\marginparsep)
-       \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
-    \end{picture}}%
-  }%
-\else
 \renewcommand{\chaptermark}[1]{%
-    \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+  \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
 \ifsuftesi@article
   \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}}
     \else
   \renewcommand{\sectionmark}[1]{}
 \fi
-\fi
 \fancypagestyle{plain}{\fancyhf{}}
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
@@ -2329,9 +2180,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  \if@mainmatter\leftmark\else\rightmark\fi}
 \pagestyle{sufdefault}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
-  \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
-  \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
-}
+  \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
 \renewenvironment{quotation}
             {\list{}{\listparindent\parindent%
                      \itemindent    \listparindent
@@ -2373,8 +2222,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \xdef\@thefnmark{#1}%
     \@footnotemark\@footnotetext}
 \def\SUF@mpsetup{%
-    \ifsuftesi@elementsheader\relax
-      \else\itshape\fi
+  \itshape
     \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
@@ -2999,9 +2847,11 @@ Janusz M. Nowacki.
 \@ifpackageloaded{polyglossia}
   {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{}
 \let\hemph\emph
-\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
-  {\let\@afterindenttrue\@afterindentfalse}
-  {\relax}
+\unless\ifPDFTeX% if xetex or luatex
+  \let\@afterindenttrue\@afterindentfalse
+    \else
+  \relax
+\fi
 \frenchspacing
 \endinput
 %%