suftesi (4apr16)

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

1 files changed, 209 insertions, 142 deletions

diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index de6820b4a58..cda67eb087e 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -67,7 +67,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2016/03/30 v2.8 A class for typesetting theses, books and articles]
+    [2016/04/04 v2.9 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -160,7 +160,7 @@
 % Informations
 \author{Ivan Valbusa\thanks{Dipartimento di Scienze Umane, Università degli Studi di Verona --- 
 	\texttt{ivan dot valbusa at univr dot it}}}
-\title{User's Guide to \textsf{suftesi}\\
+\title{\vspace*{-\baselineskip}User's Guide to \textsf{suftesi}\\
 	\large A document class for typesetting\\ theses,  books and articles}
 \date{\fileversion{} -- \filedate}
 
@@ -175,7 +175,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4559}
+% \CheckSum{4650}
 %
 % \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
@@ -193,6 +193,8 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% 
+% \changes{v2.9}{2016/04/04}{New options \opt{tocauthorfont} and \opt{toctitlefont}. Added macros\cmd{suftesi@MakeTextTOCLowercase} and \cmd{SUF@TOCtitlesmallcaps}. Improved \cmd{xheadbreak} command. New templates \texttt{book}, \texttt{theses-template-article}, \texttt{theses-template-book}.}
 % \changes{v2.8}{2016/03/30}{\sty{textcase} no longer loaded. Changed definitions of \cmd{suftesi@MakeTextLowercase}, \cmd{SUF@titlesmallcaps}, \cmd{headbreak}, \cmd{xheadbreak}.}
 % \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.}
@@ -314,7 +316,7 @@
 %
 % \section*{A brief history}\thispagestyle{empty}
 %
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona.
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona. 
 %
 % \section*{Acknowledgments}
 %
@@ -323,6 +325,8 @@
 % Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
 %I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
 %
+%
+%
 % \section*{Feedback}
 %
 % \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
@@ -356,8 +360,8 @@
 %\toprule
 %&\textrm{Global}&{caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks}, 
 %{fancyhdr}, {fixltxhyph}, {fontenc}, {geometry}, {iftex},
-%{microtype}, {multicol}, {titlesec}, {titletoc}, {xkeyval}\\\midrule
-%&\textrm{pdf\LaTeX{} only}&substitutefont, fontenc\\\midrule
+%{microtype}, {multicol}, {titlesec}, {titletoc}, {xkeyval}, (cclicenses)\\\midrule
+%&\textrm{pdf\LaTeX{} only}&fontenc, substitutefont\\\midrule
 %defaultfont=&standard&lmodern\\
 %
 %&palatino&textcomp, newpxtext, biolinum, inconsolata, {newpxmath}\\
@@ -389,8 +393,7 @@
 %^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\}
 %\end{ttquote}
 %
-% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
-% It is not compatible with \sty{crop}}
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. It is not compatible with \sty{crop}.}
 % 
 % \subsection{Page layouts}
 %
@@ -529,7 +532,7 @@
 % \centering
 %\begin{tikzpicture}
 % \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight);
-%\draw[line width=1.5mm,fill=sufred!50,text=white,draw=sufred!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\  St. Anford\\ University\\[1mm] * * * }};
+%\draw[line width=.5mm,fill=white,text=black,draw=black!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\  St. Anford\\ University\\[1mm] * * * }};
 %\node[anchor=north west] at (-2.5cm,18cm) {%
 %  \parbox{8cm}{%
 %    \small University of St. Anford\par
@@ -569,7 +572,7 @@
 %\begin{figure}
 % \centering
 %\begin{tikzpicture}
-% \draw[draw=gray,fill=blue!10,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight);
+% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight);
 % \node at (0,.7\textheight) (c) {};
 % \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
 % \node[anchor=center,text=white] at (c) {\parbox{6cm}{%
@@ -733,7 +736,7 @@
 %
 % \optitem[minimal]{mathfont}{\opt{none},\opt{minimal},\opt{extended}}
 % 
-% Available only with Cochineal, Libertine and New PX default fonts.
+% Available only with Cochineal, Libertine and New PX fonts.
 %   \begin{valuelist}
 %     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
 %     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
@@ -747,7 +750,7 @@
 % 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 spaced \textsc{\lsstyle small capitals}.
-%     \item[upper] Prints spaced \textsc{\lsstyle Small Capitals} without changing the case.
+%     \item[upper] Prints spaced \textsc{\lsstyle Small Capitals} with uppercase initials.
 %   \end{valuelist}
 % \end{optionlist}
 %
@@ -834,8 +837,7 @@
 %    and the list of tables in two columns.
 %		\item[loflot] Prints the list of figures 
 %    and the list of tables in two columns.
-%		\item[all] Prints the table of contents, 
-%    the list of figures and the list of tables in two columns.
+%		\item[all] Prints all the contents lists in two columns.
 %	\end{valuelist}
 % \end{optionlist}
 %
@@ -1331,6 +1333,20 @@
 %\end{verbatim}
 % \end{latexcode}
 %\end{valuelist}
+% \optitem[italic]{toctitlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+%   \begin{valuelist}
+%     \item[roman] Prints the title TOC entry in roman.
+%     \item[italic] Prints the  title TOC entry in \emph{italic}.
+%     \item[smallcaps] Prints the  title TOC entry  
+%      in \textsc{\lsstyle spaced small caps}.
+%   \end{valuelist}
+% \optitem[roman]{tocauthorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+%   \begin{valuelist}
+%     \item[roman] Prints the author’s name TOC entry in roman.
+%     \item[italic] Prints the  author’s name TOC entry in \emph{italic}.
+%     \item[smallcaps] Prints the  author’s name TOC entry  
+%      in \textsc{\lsstyle spaced small caps}. 
+%\end{valuelist}
 % \end{optionlist}
 %
 % \subsection{Commands} 
@@ -1351,11 +1367,36 @@
 % Sets the editor(s) of the collection.
 %\end{ltxsyntax}
 %
+% \section{Known issues}
+%
+% A problem occurs with the article document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
+%\begin{latexcode}
+%\begin{verbatim}
+%\markboth{Section title}{Section title}
+%\part{The title of the part}
+% %
+%\section{Section title}
+%\end{verbatim}
+%\end{latexcode}
+%If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterapge} command:
+%\begin{latexcode}
+%\begin{verbatim}
+%\afterpage{
+%  \markboth{Section title}{Section title}
+%    \part{The title of the part}
+%   }
+% %
+%\section{Section title}
+%\end{verbatim}
+%\end{latexcode}
+%
+%
+%
 % \section{Backward compatibility}
 %
 % \begin{optionlist}
 % \optitem{defaultfont}{\opt{compatibility}}
-% Loads the fonts of \sty{suftesi} v2.3 (or previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font (Artemisia) of those versions add the \opt{greekfont=artemisia} option.
+% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (i.e. Artemisia) add the \opt{greekfont=artemisia} option.
 % \optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
 % An alias for \opt{structure}
 %\boolitem[true]{crop}
@@ -1593,7 +1634,6 @@
 \newif\ifsuftesi@compactaureo
 \newif\ifsuftesi@supercompact
 \newif\ifsuftesi@supercompactaureo
-\newif\ifsuftesi@nocrop
 \newif\ifsuftesi@screen
 \newif\ifsuftesi@screencentered
 \newif\ifsuftesi@dottedtoc
@@ -1655,13 +1695,11 @@
   'documentstructure' option is deprecated.\MessageBreak
   Use 'structure' option instead}
 \ifcase\nr\relax
-\disable@keys{}{secnumstyle}
+  \setkeys{}{structure=book}
 \or
-\suftesi@articletrue
-\@titlepagefalse
+  \setkeys{}{structure=article}
 \or
-\suftesi@collectiontrue
-  \setkeys{}{headerstyle=authortitleinner}
+  \setkeys{}{structure=collection}
 \fi}
 %    \end{macrocode}
 % \subsection*{Page layout}
@@ -1803,71 +1841,95 @@
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@PARTSwitch{\filright}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@PARTSwitch{\filcenter}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@PARTSwitch{\filleft}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numpar
   \def\SUF@lr@PARTSwitch{\filright}
   \suftesi@numparparttrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@PARTSwitch{\filcenter}
   \suftesi@numparparttrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@PARTSwitch{\filleft}
   \suftesi@numparparttrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{chapstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@CHAPSwitch{\filright}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@CHAPSwitch{\filcenter}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numparchap
   \def\SUF@lr@CHAPSwitch{\filright}
   \suftesi@numparchaptrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@CHAPSwitch{\filcenter}
   \suftesi@numparchaptrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@CHAPSwitch{\filleft}
   \suftesi@numparchaptrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{secstyle}[\val\nr]{%
     left,center,right,parleft,parcenter,parright}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SECSwitch{\filright}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SECSwitch{\filcenter}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SECSwitch{\filleft}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or%numparsec
   \def\SUF@lr@SECSwitch{\filright}
   \suftesi@numparsectrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SECSwitch{\filcenter}
   \suftesi@numparsectrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SECSwitch{\filleft}
   \suftesi@numparsectrue
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSECSwitch{\filright}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SUBSECSwitch{\filcenter}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SUBSECSwitch{\filleft}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 \define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
 \ifcase\nr\relax
   \def\SUF@lr@SUBSUBSECSwitch{\filright}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
 \or
   \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \or
   \def\SUF@lr@SUBSUBSECSwitch{\filleft}
+  \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
 \fi}
 %    \end{macrocode}
 % \subsection*{Sections font}
@@ -1921,7 +1983,7 @@
 \or
 \def\SUF@tocCHAP@font{\itshape}
 \or
-\def\SUF@tocCHAP@font{\expandafter\SUF@titlesmallcaps}
+\def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
 \define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
@@ -1929,7 +1991,7 @@
 \or
 \def\SUF@tocSEC@font{\itshape}
 \or
-\def\SUF@tocSEC@font{\expandafter\SUF@titlesmallcaps}
+\def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1937,7 +1999,7 @@
 \or
 \def\SUF@tocSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSEC@font{\expandafter\SUF@titlesmallcaps}
+\def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1945,7 +2007,23 @@
 \or
 \def\SUF@tocSUBSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@titlesmallcaps}
+\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@tocAUT@font{\relax}
+\or
+\def\SUF@tocAUT@font{\itshape}
+\or
+\def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+\def\SUF@tocTIT@font{\relax}
+\or
+\def\SUF@tocTIT@font{\itshape}
+\or
+\def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
 \fi}
 %    \end{macrocode}
 % \subsection*{Sections number style}
@@ -2045,9 +2123,11 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \define@choicekey{}{smallcapsstyle}[\val\nr]
     {low,upper}[low]{%
 \ifcase\nr\relax
-  \def\suftesi@MakeTextLowercase{\lowercase}
+  \def\suftesi@MakeTextLowercase{\MakeLowercase}
+  \def\suftesi@MakeTextTOCLowercase{\lowercase}
 \or
   \def\suftesi@MakeTextLowercase{\relax}
+  \def\suftesi@MakeTextTOCLowercase{\relax}
 \fi}
 %    \end{macrocode}
 % \subsection*{Headers}
@@ -2326,11 +2406,9 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     {screen,cscreen,draft,final}[draft]{%
 \ifcase\nr\relax
   \suftesi@screentrue
-  \suftesi@nocroptrue
 \or
   \suftesi@screentrue
   \suftesi@screencenteredtrue
-  \suftesi@nocroptrue
 \or
 \or
   \AtBeginDocument{\crop[off]}
@@ -2341,11 +2419,9 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   'crop' option is deprecated.\MessageBreak
   Use 'version' option instead}
 \ifcase\nr\relax
-  \suftesi@screenfalse
+  \setkeys{}{version=draft}
 \or
-  \suftesi@nocroptrue
-  \suftesi@screentrue
-  \suftesi@screencenteredfalse
+  \setkeys{}{version=screen}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Titlepage}
@@ -2672,6 +2748,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   smallcapsstyle=low,
   titlefont=italic,
   authorfont=roman,
+  toctitlefont=italic,
+  tocauthorfont=roman,
   revauthortitle=false,
   papertitlestyle=left,
   authorfont=roman,
@@ -2714,31 +2792,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{emptypage}
 \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{
-%    \@ifpackageloaded{hyperref}{%
-%    \def\@uclcnotmath#1#2#3#4{\begingroup #1%
-%    \def \({$}\let \)\(\def \NoCaseChange ##1{%
-%    \noexpand \NoCaseChange {\noexpand ##1}}%
-%    \def\hyper@linkstart##1##2##3{%
-%    $\valign$\noexpand\hyper@linkstart{##1}{##2}{%
-%    \noexpand\@skipmath #3
-%    ##3$\valign $}\noexpand\@skipmath}\def\hyper@linkend{%
-%    \noexpand\hyper@linkend}%
-%    \@nonchangecase \label
-%    \@nonchangecase \ref
-%    \@nonchangecase \ensuremath
-%    \def \cite ##1##{\toks@ {\noexpand \cite ##1}\@citex }%
-%    \def \@citex ##1{\NoCaseChange {\the \toks@ {##1}}}%
-%    \def \reserved@a ##1##2{\let #2\reserved@a }%
-%    \expandafter \reserved@a \@uclclist \reserved@b %
-%    {\reserved@b \@gobble }%
-%    \protected@edef \reserved@a {\endgroup\noexpand %
-%    \@skipmath #3#4$\valign $}%
-%    \reserved@a}}{}}
 %    \end{macrocode}
 % The FSPL style requires a verbose colophon which uses specific icons:
 %    \begin{macrocode}
@@ -2747,11 +2800,24 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
  \else
 \fi
 %    \end{macrocode}
+% \subsection*{Page layout}
+% The \cmd{geometry} command must be declare before the \sty{fontenc} package. If declared after it, the \opt{heightrounded} option becomes ineffective and many underfull vertical boxes may occur. 
+%    \begin{macrocode}
+\ifsuftesi@screen
+  \newcommand*\crop[1][]{}
+    \ifsuftesi@screencentered
+      \geometry{hmarginratio=1:1}
+    \else
+  \fi
+\else
+  \RequirePackage[a4,cam,center]{crop}
+\fi
+%    \end{macrocode}
 %
 % \subsection*{Fonts}
 %
 % 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.
+% package is required because some commands of the class are base on it. 
 %    \begin{macrocode}
 \unless\ifPDFTeX%if xelatex or lualatex
 \AtBeginDocument{%
@@ -2771,9 +2837,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     * load 'fontspec' \MessageBreak
     ************************************}}
   }
-%    \end{macrocode}
-% 
-%    \begin{macrocode}
 \else% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
@@ -3024,41 +3087,25 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \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
-  \RequirePackage[a4,cam,center]{crop}
-\fi
-%    \end{macrocode}
 % \subsection*{Section titles}
 %    \begin{macrocode}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \unless\ifPDFTeX% if xetex or luatex
+  \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
+    \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextTOCLowercase{#1}}
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
 \else% if pdftex
+  \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
+    \scshape\suftesi@MakeTextTOCLowercase{\textls*{#1}}}%
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
-    \scshape\suftesi@MakeTextLowercase{\kern-0.1em\lsstyle#1}}%
+    \scshape\suftesi@MakeTextLowercase{\textls*{#1}}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
-    \scshape\suftesi@MakeTextLowercase{\kern-0.1em\lsstyle#1}}%
+    \scshape\suftesi@MakeTextLowercase{\textls*{#1}}}%
 \fi
 %    \end{macrocode}
 % Default styles:
@@ -3140,28 +3187,38 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 }
 \SUF@default@CHAPTER
 \SUF@default@SECTIONS
-\ifsuftesi@periodicalaureo
+\ifsuftesi@periodical
   \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else
-\ifsuftesi@periodical
+\ifsuftesi@periodicalaureo
   \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
-    \else
-      \ifsuftesi@compact
-        \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
-        \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
-         \else
-           \ifsuftesi@supercompact
-            \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
-            \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
-          \else
-        \titlespacing*{\chapter}{0em}{%
+\else
+\ifsuftesi@compact
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
+\ifsuftesi@compactaureo
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
+\ifsuftesi@supercompact
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
+\ifsuftesi@supercompactaureo
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else%standard/standardaureo
+  \titlespacing*{\chapter}{0em}{%
      \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}	
-        \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
+         \fi
        \fi
      \fi
-  \fi
+   \fi
+ \fi
 \fi
 %    \end{macrocode}
 % \paragraph{Redefinitions for \opt{`article'} mode}
@@ -3755,8 +3812,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \begingroup%
     \let\thanks\@gobble
     \addcontentsline{toc}{title}{%
-    \normalfont{\@author}\texorpdfstring{\newline}{, }%
-    \itshape\@headtitle}
+    {\SUF@tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
+    {\SUF@tocTIT@font{\@headtitle}}}
     \endgroup%
     \par\nobreak\vspace{2ex}
     {\ifsuftesi@reverseauthortitle
@@ -3828,42 +3885,52 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsection*{Frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
-\@ifpackagewith{frontespizio}{suftesi}
-     {\ifsuftesi@periodical
-          \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-        \else
-      \ifsuftesi@compact
-          \Margini {4.5cm}{7cm}{4.5cm}{0cm}
-        \else
-          \ifsuftesi@supercompact
-          \Margini {4.5cm}{10cm}{6cm}{1cm}
-        \else
-      \ifsuftesi@periodicalaureo
-          \Margini {5.5cm}{7cm}{4.5cm}{0cm}
-      \fi
-    \fi
-  \fi
-\fi}
-{\@ifpackageloaded{frontespizio}
-     {\ifsuftesi@periodical
-          \Margini {1cm}{7cm}{5cm}{1cm}
-          \Rientro{1cm}
-        \else
-      \ifsuftesi@compact
-          \Margini {1cm}{7cm}{6cm}{1cm}
-          \Rientro{1cm}
-        \else
-          \ifsuftesi@supercompact
-          \Margini {1cm}{10cm}{8cm}{1cm}
-          \Rientro{1cm}
-        \else
-          \ifsuftesi@periodicalaureo
-          \Margini {1cm}{7cm}{5cm}{1cm}
-          \Rientro{1cm}
-        \fi
-     \fi
-  \fi
-\fi}
+\@ifpackagewith{frontespizio}{suftesi}{%
+\ifsuftesi@periodical
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi@compact
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi@supercompact
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi@compactaureo
+  \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\ifsuftesi@supercompactaureo
+  \Margini {4.5cm}{10cm}{6cm}{1cm}
+    \else
+\ifsuftesi@periodicalaureo
+  \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+    \else
+\fi\fi\fi\fi\fi\fi}
+{\@ifpackageloaded{frontespizio}{%
+\ifsuftesi@periodical
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi@compact
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi@supercompact
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi@compactaureo
+  \Margini {1cm}{7cm}{6cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi@supercompactaureo
+  \Margini {1cm}{10cm}{8cm}{1cm}
+  \Rientro{1cm}
+    \else
+\ifsuftesi@periodicalaureo
+  \Margini {1cm}{7cm}{5cm}{1cm}
+  \Rientro{1cm}
+    \else
+\fi\fi\fi\fi\fi\fi}
 {\relax}}}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -4692,8 +4759,8 @@ Janusz M. Nowacki.
   {Command \noexpand\chapterintro is undefined\MessageBreak 
      using 'structure=article'}}
 \else
-\def\chapterintro{
-  \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
+\def\chapterintro{\@ifstar{%
+  \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
 \def\@chapterintro{\phantomsection
   \if@tempswa\section*{\SUF@fchapterintroname}\fi
   \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
@@ -4706,13 +4773,13 @@ Janusz M. Nowacki.
 %    \begin{macrocode}
 \newif\ifheadbreak\headbreakfalse
   \DeclareRobustCommand{\headbreak}  
-    {\ifheadbreak\newline\else\fi}
+    {\ifheadbreak\\\else\fi}
 %    \end{macrocode}
 % Active in the text but not in the table of contents.
 %    \begin{macrocode}
 \newif\ifxheadbreak\xheadbreaktrue
-  \DeclareRobustCommand{\xheadbreak} 
-    {\ifxheadbreak\newline\else\fi}
+  \def\xheadbreakNL{\ifxheadbreak\newline\else\fi}
+  \def\xheadbreakBB{\ifxheadbreak\\\else\fi}
 %    \end{macrocode}
 %    \begin{macrocode}
 \let\origtableofcontents\tableofcontents