suftesi (28mar15)

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

5 files changed, 233 insertions, 852 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README
index b002c7f8424..1f7ccb4df57 100644
--- a/Master/texmf-dist/doc/latex/suftesi/README
+++ b/Master/texmf-dist/doc/latex/suftesi/README
@@ -45,14 +45,10 @@ DOCUMENTATION:
 
 To reproduce the complete documentation, follow these steps:
 
-$ mpost fakelogo.mp
-$ epstopdf --hires fakelogo.mps
 $ pdflatex suftesi.dtx
-$ pdflatex suftesi-frn.tex
 $ biber suftesi
 $ makeindex -s gind.ist -o suftesi.ind suftesi.idx
 $ makeindex -s gglo.ist -o suftesi.gls suftesi.glo
-$ pdflatex frontespizio.tex
 $ pdflatex suftesi.dtx
 $ pdflatex suftesi.dtx
 
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 22d010afd21..472cc9cb7f7 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 2ff096f890d..5e66cf286f1 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 e187de6f273..79b88460bca 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-2014 by Ivan Valbusa
+ Copyright 2009-2015 by Ivan Valbusa
 
  This program is provided under the terms of the
  LaTeX Project Public License distributed from CTAN
@@ -24,41 +24,6 @@
 \generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
    \nopreamble\nopostamble
    \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
-   \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
-   \file{style-roman1.tex}{\from{suftesi.dtx}{style-roman1}}
-   \file{style-roman2.tex}{\from{suftesi.dtx}{style-roman2}}
-   \file{style-roman3.tex}{\from{suftesi.dtx}{style-roman3}}
-   \file{style-roman4.tex}{\from{suftesi.dtx}{style-roman4}}
-   \file{style-roman5.tex}{\from{suftesi.dtx}{style-roman5}}
-   \file{style-roman6.tex}{\from{suftesi.dtx}{style-roman6}}
-   \file{style-italic1.tex}{\from{suftesi.dtx}{style-italic1}}
-   \file{style-italic2.tex}{\from{suftesi.dtx}{style-italic2}}
-   \file{style-italic3.tex}{\from{suftesi.dtx}{style-italic3}}
-   \file{style-italic4.tex}{\from{suftesi.dtx}{style-italic4}}
-   \file{style-italic5.tex}{\from{suftesi.dtx}{style-italic5}}
-   \file{style-italic6.tex}{\from{suftesi.dtx}{style-italic6}}
-   \file{style-italic7.tex}{\from{suftesi.dtx}{style-italic7}}
-   \file{style-italic8.tex}{\from{suftesi.dtx}{style-italic8}}
-   \file{style-italic9.tex}{\from{suftesi.dtx}{style-italic9}}
-   \file{style-italic10.tex}{\from{suftesi.dtx}{style-italic10}}
-   \file{style-italic11.tex}{\from{suftesi.dtx}{style-italic11}}
-   \file{style-italic12.tex}{\from{suftesi.dtx}{style-italic12}}
-   \file{style-smallcaps1.tex}{\from{suftesi.dtx}{style-smallcaps1}}
-   \file{style-smallcaps2.tex}{\from{suftesi.dtx}{style-smallcaps2}}
-   \file{style-smallcaps3.tex}{\from{suftesi.dtx}{style-smallcaps3}}
-   \file{style-smallcaps4.tex}{\from{suftesi.dtx}{style-smallcaps4}}
-   \file{style-smallcaps5.tex}{\from{suftesi.dtx}{style-smallcaps5}}
-   \file{style-smallcaps6.tex}{\from{suftesi.dtx}{style-smallcaps6}}
-   \file{style-smallcaps7.tex}{\from{suftesi.dtx}{style-smallcaps7}}
-   \file{style-smallcaps8.tex}{\from{suftesi.dtx}{style-smallcaps8}}
-   \file{style-smallcaps9.tex}{\from{suftesi.dtx}{style-smallcaps9}}
-   \file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}}
-   \file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}}
-   \file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}}
-   \file{style-elements.tex}{\from{suftesi.dtx}{style-elements}}
-   \file{style-sufelements.tex}{\from{suftesi.dtx}{style-sufelements}}
-   \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
-   \file{frontespizio.tex}{\from{suftesi.dtx}{frontespizio}}
  }
  
 \Msg{***********************************************************}
@@ -79,7 +44,7 @@
 \endgroup
 %</internal>
 %
-% Copyright (C) 2009-2014 by Ivan Valbusa 
+% Copyright (C) 2009-2015 by Ivan Valbusa 
 % <ivan dot valbusa at univr dot it>
 % -------------------------------------------------------
 % 
@@ -102,13 +67,13 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2014/04/05 v1.9c A class for typesetting theses, books and articles]
+    [2015/03/29 v2.0 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\documentclass{ltxdoc}
+\documentclass[12pt]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
-\usepackage[polutonikogreek,english]{babel}
+\usepackage[greek.ancient,english]{babel}
 \let\cs\relax
 \let\cmd\relax
 \usepackage{ltxdockit}
@@ -132,15 +97,18 @@
   \geometry{hmarginratio=1:1,a4paper,margin=2cm}
 \usepackage{sectsty}
   \allsectionsfont{\sffamily}
+  \sectionfont{\LARGE\sffamily}
+  \subsectionfont{\Large\sffamily}
+
 \usepackage{fancyhdr}
   \fancyhf{}
   \fancyhead[L]{© 2009--\the\year\quad Ivan Valbusa}
   \fancyfoot[L]{\textsf{suftesi.cls} \fileversion{} -- \filedate}
   \renewcommand{\footrulewidth}{0.4pt}
-  \fancyhead[R]{\thepage}
+  \fancyhead[R]{\color{gray}\thepage}
     \pagestyle{fancy}
 \usepackage[framemethod=TikZ]{mdframed}
-  \mdfsetup{roundcorner=3pt,linecolor=olive,linewidth=.1pt}
+  \mdfsetup{roundcorner=3pt,linecolor=olive}
 % New commands
 \def\suftesi{\textsf{suftesi}}
 \newcommand{\argstyle}{\itshape}
@@ -201,24 +169,24 @@
   \color{sufred}\sffamily\displayverbfont}
 % Table of contents
 \renewcommand\tableofcontents{%
-\setlength{\columnsep}{0cm}
+\setlength{\columnsep}{1cm}
 {\centering	    
    \section*{\contentsname}%
 	      \@mkboth{\contentsname}{\contentsname}%
-	      \vskip-1mm
 	 }	 
         \thispagestyle{empty}
-        \begin{mdframed}[
-          align=center,
-          userdefinedwidth=15.2cm
-          linewidth=0.5mm,
-          backgroundcolor=white,
-          linecolor=sufred,
-          innertopmargin=-5pt]
+%        \begin{mdframed}[
+%          nobreak=false,
+%          align=center,
+%          userdefinedwidth=15cm
+%          linewidth=0.5mm,
+%          backgroundcolor=white,
+%          linecolor=sufred,
+%          innertopmargin=-5pt]
         \begin{multicols}{2}
 	    \@starttoc{toc}%
 	    	\end{multicols}
-		\end{mdframed}
+%		\end{mdframed}
 		}
 % Correct (?) \optitem to use \meta inside #2
 \renewcommand*{\ltd@ol@optitem}[3][]{%
@@ -227,7 +195,9 @@
     {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
 \makeatother
 
+
 \setcounter{tocdepth}{3}
+\setcounter{section}{-1}
 % HYPERREF
 \usepackage{hyperref}
 \hypersetup{%
@@ -250,7 +220,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4095}
+% \CheckSum{4110}
 %
 % \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
@@ -268,6 +238,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.0}{2015/03/29}{New page layout \opt{standardaureo}. Enhanced support for \LuaLaTeX. Headers settings are now executed \cmd{AtBeginDocument}. Loaded \sty{ifluatex} and \sty{ifthen} packages. Added \opt{listparindent} to \cmd{setlist} options. Updated documentation.}
 % \changes{v1.9c}{2014/04/05}{The \opt{cbgreek} value for the \opt{greekfont} option allows now to use the full set of the CB Greek font together with the default font (Palatino).}
 %  \changes{v1.9b}{2014/02/16}{Corrected a bug in ``toc'', ``lof'' and ``lot'' commands.}
 %  \changes{v1.9a}{2014/02/11}{Maintenance release. Updated greek support. Updated documentation.}
@@ -340,13 +311,14 @@
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
 % \title{% 
-% \vspace{-1.5cm}
-% {{\Huge\color{sufred}\bfseries User's Guide to \textsf{S\kern-2pt\lower3pt\hbox{U}\kern-2.5ptF\kern-1pttesi}}\\
-% \itshape\normalsize A document class for typesetting theses, 
+% {{\fontsize{32}{40}\color{sufred}\bfseries 
+%   User's Guide to 
+% \textsf{S\kern-2pt\lower3pt\hbox{U}\kern-2.5ptF\kern-1pttesi}}\\
+% \itshape\large A document class for typesetting theses, 
 % books and articles\\[3ex]}
 % \normalsize\fileversion{} -- \filedate}
 % \author{Ivan Valbusa\\
-%  \small Dipartimento di Filosofia, Pedagogia e Psicologia\\[-0.2ex]
+%  \small Dipartimento di Filologia, Letteratura e Linguistica\\[-0.2ex]
 %  \small Università degli Studi di Verona\\
 %  \footnotesize\texttt{ivan dot valbusa at univr dot it}}
 % \date{}
@@ -367,49 +339,41 @@
 % \citetitle{Bringhurst:1992} by R.~\citeauthor{Bringhurst:1992}, \citetitle{Tschichold:1975} by J.~\citeauthor{Tschichold:1975} and
 % \citetitle{Morison:1111} by S.~\citeauthor{Morison:1111}.
 % \end{abstract}
-%
+% 
 % \tableofcontents
 %
+% \vfill
+%
+% 
 % \section*{Copyright notice}
 %
 %Copyright \copyright\ 2009-\the\year{} Ivan Valbusa. This package is author-maintained. 
 %Permission is granted to copy, distribute and/or modify this software under the 
 %terms of the LaTeX Project Public License, version 1.3c ora later (\url{http://latex-project.org/lppl}). This software is provided ''as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
 %
-%\begin{mdframed}[rightline=false,topline=false,bottomline=false,linecolor=red]
-%In addition to the terms of this license 
+% \bigskip
+%
+%\noindent In addition to the terms of this license 
 % the author requires an attribution notice (see section 
 % \ref{sec:commands}) like the following one:
 %
-% \begin{mdframed}[align=center,backgroundcolor=black!5!white,userdefinedwidth=12cm,linecolor=white]
-% ^^A \noindent Copyright \copyright\ 2009-2013 Ivan Valbusa.\\[8ex]
-%
 % \begin{center}
-% \emph{This work has been typeset with \LaTeX{}, using the
-% \textsf{suftesi} class by Ivan Valbusa.}
+%
+% \emph{This work has been typeset with \LaTeX{},
+% using the \textsf{suftesi} class by Ivan Valbusa.}
+%
 % \end{center}
-% \end{mdframed}
+%
 % \noindent The most essence of this class is the set of styles it
 % provides. For this reason 
 % \textcolor{sufred}{\scshape\lsstyle do not modify the styles of this class with packages 
-% and/or commands which change the laytout of the document. 
+% and/or commands which change the layout of the document. 
 % If you do not like these styles, use another class.}
 % If you use \sty{suftesi}{} in a document typeset with another class
 % (for example \sty{book}), remember to clean up the preamble from all
 % the layout redefinitions.
-% \end{mdframed}
-% 
-% \section*{A brief history}
 %
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for human sciences}) which I held at the Graduate School of Human Sciences and Philosophy (\textcolor{sufred}{\textbf{S}}cienze \textcolor{sufred}{\textbf{U}}mane e \textcolor{sufred}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010.\footnote{\raggedright\url{http://www.sdsuf.univr.it} --- Some informations can be found on 
-%\url{http://profs.lettere.univr.it/valbusa/2010/06/01/introduzione-a-latex-per-le-scienze-umane/}} Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona (Italy).\footnote{\url{http://www.univr.it/main?ent=catdoc&id=3727&idDest=6&serv=127\#1431}}
-%
-% \section*{Acknowledgements}
-%
-% {\itshape I would like to thank Professors Paola Di~Nicola,
-% Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
-% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
-%I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.}
+% \vfill
 %
 %\subsection*{Feedback}
 %
@@ -417,6 +381,21 @@
 %If you have any questions, feedback or requests please email me. 
 %My mail address is at the top of this document. If you need specific features not already implemented, remember to attach the example files.
 %
+% \vfill
+% \clearpage
+%
+% \section{A brief history}
+%
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{sufred}{\textbf{S}}cienze \textcolor{sufred}{\textbf{U}}mane e \textcolor{sufred}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona (Italy).
+%
+%\bigskip
+%
+% {\em\noindent I would like to thank Professors Paola Di~Nicola,
+% Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
+% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
+%I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.}
+%
+%
 % \section{Use}
 % 
 % The \sty{suftesi} class is called as usual by
@@ -447,7 +426,7 @@
 % \cmd{documentclass}\oar{documentstructure=collection,\meta{options}}\ar{suftesi}
 % \end{ttquote}
 % 
-% \subsection*{Loaded packages}
+% \paragraph*{Loaded packages}
 %
 % \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
 % It is not compatible with \sty{crop}}
@@ -455,14 +434,13 @@
 % The class loads the following packages: \sty{beramono},
 % \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{extramarks}, 
 % \sty{fancyhdr}, \sty{fixltxhyph}, \sty{fontenc}, \sty{geometry},  
-% \sty{ifxetex}, \sty{mathpazo}, 
+% \sty{ifxetex}, \sty{ifluatex}, \sty{ifthen}, \sty{mathpazo}, 
 % \sty{microtype}, \sty{multicol}, \sty{substitutefont}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}. 
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
-% \subsection*{Use with \XeLaTeX{} and \LuaLaTeX}
+% \paragraph*{Use with \XeLaTeX{} and \LuaLaTeX}
 % 
-% The class can be used, of course, with the \XeTeX{} and \LuaTeX{} engines. The only difference 
-% is that in this case the font options are turned off and the \LaTeX{} default font (Computer Modern) is loaded. 
+% 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). Whit these engines the font options are turned off and the \LaTeX{} default font (Computer Modern) is loaded. 
 %
 %
 % \section{Class features}
@@ -474,14 +452,15 @@
 %
 % The class provides six page layouts which can be selected by the \opt{pagelayout} option (see section \ref{sec:page-styles}). The \opt{standard} layout (set by default) is aimed to typeset standard A4 documents, while the other five layouts are particularly suitable to typeset compact books and articles (see table \ref{tab:layouts} for details).
 %
-% \begin{table}[h!]
+% \begin{table}[h]
 % \centering
-%\makebox[\textwidth][c]{\begin{tabular}{lcccccccc}
+% \begin{tabular}{lcccccccc}
 %\toprule
 %&\multicolumn{4}{c}{Dimensions (mm)}&\multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){6-9}
 %&\multicolumn{2}{c}{Text}&\multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}&&\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}
 %Layout         &width &	height&	width&	height&t\,/\,b&i\,/\,o&Text block& Page\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9}\cmidrule(lr){1-1}
 %\opt{standard} &	110&	220&	210&	297&$1:2$&$1:2$&$1:2$&$1:\kern-3pt\sqrt{2}$\\
+%\opt{standardaureo} &	136&	220&	210&	297&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\kern-3pt\sqrt{2}$\\
 %\opt{compact}&	110&	165&	160&	240&$2:3$&$2:3$&$2:3$&$2:3$\\
 %\opt{compactaureo}&	118&	191&	160&	240&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$2:3$\\
 %\opt{supercompact}&	100	&150&	140&	210&$2:3$&$2:3$&$2:3$&$2:3$\\
@@ -492,27 +471,26 @@
 %\opt{elements} (pt)&	251&	502&	374&	648&$1:2$&$2:5$&$1:2$&$1:\kern-3pt\sqrt{3}$\\
 % \bottomrule\\[-2ex]
 % \multicolumn{9}{r}{\footnotesize\textsuperscript{*} $5:8\approx 1:1,618$}
-%\end{tabular}}\\[-4ex]
-% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}\vskip-6ex
+%\end{tabular}\\[-4ex]
+% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
 % \end{table}
 %
 % \subsection{Font}
-%\enlargethispage{1.1\baselineskip}
 %
 % The default serif font for body text is
 % {\fontfamily{ppl}\selectfont Palatino designed by Hermann Zapf}\index{Zapf, Hermann} and loaded through the \sty{mathpazo} package, but you can simply choose {\fontfamily{lmr}\selectfont the standard Latin Modern} through the \opt{defaultfont} option (see section \ref{sec:options}). 
 % The \textsf{sans serif} font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.} and the \texttt{monospaced} typeface is Bera Mono, opportunely scaled to match Palatino. 
 % This choice has been inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}. 
-% The  Greek text is {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} (a) which is particularly suitable for Palatino, but with the \opt{greekfont} option (see section \ref{sec:options}) you can choose also Porson (b) or CB Greek (c).\footnote{%
+% The  Greek text is {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} (a) which is particularly suitable for Palatino, but with the \opt{greekfont} option (see section \ref{sec:options}) you can choose also Porson (b) or CB Greek (c). 
 % The first code for the Porson font has been written by Enrico 
 % Gregorio. Claudio Beccari successively added the code to improve the 
 % scale factor when using this greek font in combination with Palatino.
-%}
-% \begin{mdframed}[backgroundcolor=black!5!white]
+%
+% \begin{mdframed}
 %\fontfamily{ppl}\selectfont\small
 %\noindent\begin{minipage}[t]{.32\textwidth}
 % \raggedright
-%\foreignlanguage{polutonikogreek}{%
+%\foreignlanguage{greek}{%
 %\fontfamily{artemisia}\selectfont
 %T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
 % nell'ordinata disposizione delle parti.
@@ -521,7 +499,7 @@
 %\end{minipage}\hfill
 %\begin{minipage}[t]{.32\textwidth}
 % \raggedright
-%\foreignlanguage{polutonikogreek}{%
+%\foreignlanguage{greek}{%
 %\fontfamily{porson}\selectfont
 %T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
 % nell'ordinata disposizione delle parti.
@@ -530,7 +508,7 @@
 %\end{minipage}\hfill
 %\begin{minipage}[t]{.32\textwidth}
 % \raggedright
-%\foreignlanguage{polutonikogreek}{%
+%\foreignlanguage{greek}{%
 %\fontfamily{lmr}\selectfont
 %T`o g`ar kal`on >en meg'ejei ka`i t'axei >est'in.}~Il bello infatti sta nella grandezza e 
 % nell'ordinata disposizione delle parti.
@@ -553,10 +531,49 @@
 %
 %
 %
-% \begin{figure}[h!]
-% \centering
-% \fbox{\includegraphics[height=200mm]{frontespizio}}
-% \caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
+% \begin{figure}
+%\vbox to .9\textheight{
+% \vskip-1cm
+%\begin{tikzpicture}[overlay]
+% \draw[draw=none,yshift=-23.8cm,xshift=.8cm,scale=0.75,fill=gray!20] (0,0) rectangle (21cm,29.7cm);
+% \draw[draw=none,yshift=-23.5cm,xshift=.5cm,scale=0.75,fill=gray!5] (0,0) rectangle (21cm,29.7cm);
+%\draw[line width=1.5mm,fill=sufred!50,text=white,draw=sufred!60] (4.5cm,-4.25cm) circle (9mm) node {\parbox{12mm}{\centering\scriptsize * * * \\  St. Anford\\ University\\[1mm] * * * }};
+%\node[anchor=north west] at (5.95cm,-3.3cm) {%
+%  \parbox{8cm}{%
+%    \small University of St. Anford\par
+%      \normalsize Department of Typography
+%      \vskip1ex\hrule\vskip1.2ex
+%        \large Ph.D. degree in \TeX{} and \LaTeX
+%
+% \vspace{4cm}
+%
+%    {\LARGE\sffamily\color{sufred} How to prepare\par
+%      a formal frontispiece\par}
+%      \vspace{2ex}
+%      
+%      {\normalsize\sffamily Theory and practice\par}
+%
+% \vspace{3cm}
+%
+%    {\normalsize\sffamily Candidate:\par}
+%    \small Enrico Gregorio
+%      \vspace{5ex}
+%      
+%    {\normalsize\sffamily Thesis advisor:\par}
+%    \small Prof. R. J. Drofnats
+%    \vspace{2ex}
+%
+%    {\normalsize\sffamily Research supervisors:\par}
+%    \small J. H. Quick\par 
+%     B. L. User\vspace{2.5cm}
+%
+% Thesis submitted in 2010
+% }
+%      };
+%
+%\end{tikzpicture}
+%}
+%\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
 % \end{figure}
 %
 % \section{Options}\label{sec:options}
@@ -565,7 +582,7 @@
 %
 %\begin{optionlist}
 % \setlength{\labelwidth}{2.5cm}%
-%\optitem[book]{documentstructure}{\opt{book}, \opt{article}}
+%\optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{documentstructure}} 
 % \begin{valuelist}[3cm]
 % \item[book] For typesetting texts with chapters.
@@ -573,7 +590,7 @@
 % (that is  without chapter division).
 % \item[collection] For typesetting journals or collections of articles (see section \ref{sec:collection}).
 % \end{valuelist}
-%\optitem[standard]{pagelayout}{\opt{standard}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}}
+%\optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo},  \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo},  \opt{supercompact}, \opt{supercompact}, \opt{elements}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
 %\begin{valuelist}
 %\item[standard]
@@ -603,14 +620,27 @@
 % style of this book use \opt{style=elements} option instead.
 %\end{valuelist}
 % The details of this option are shown in table \ref{tab:layouts}.
+% \optitem[final]{version}{\opt{screen}, \opt{draft}, \opt{final}}
+% \begin{valuelist}
+% \item[screen] 
+% Prints the \textsc{pdf} with its real dimensions (according to the \opt{pagelayout} option) and execute the \opt{oneside} option.
+% It is provided to have a better view when you are 
+% typesetting and reading the \textsc{pdf} on the screen.
+% ^^A It simply executes the \opt{oneside} and \opt{nocrop=false} 
+% ^^A optione and redefines the \cmd{crop} command so you do not need 
+% ^^A to comment it if it is used in the document.
+% \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.
+% \end{valuelist}
 %\end{optionlist}
 %
 %\subsection{Fonts}
 %
-% The font options are available only with \LaTeX. Using \XeLaTeX{}
+% The font 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} packages. With this engine
-% I do suggest the Junicode or EB Garamond font families.
+% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. With this engine
+% I do suggest the EB Garamond or Linux Libertine font families.
 % 
 %\begin{optionlist}
 % \setlength{\labelwidth}{2.5cm}%
@@ -782,7 +812,7 @@
 % \begin{valuelist}[2cm]
 % \item[bulged] The footnote number protrudes beyond the left margin.
 % \item[hung] 
-% Indents the footnote text, so it will ?hang? 
+% Indents the footnote text, so it will hang 
 % under the first line of the text. 
 % \item[dotted] 
 % The footnote number is aligned to the left margin
@@ -822,17 +852,6 @@
 %
 %\begin{optionlist}
 % \settowidth{\labelwidth}{marginpar}
-% \optitem[print]{version}{\opt{screen}, \opt{draft}, \opt{final}}
-% \begin{valuelist}
-% \item[screen] 
-% This option is provided to have a better view when you are 
-% typesetting and reading the \textsc{pdf} on the screen.
-% It simply executes the \opt{oneside} and \opt{nocrop=false} 
-% optione and redefines the \cmd{crop} command so you do not need to comment it if it is used in the document.
-% \item[draft] 
-% Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{crop=true}.
-% \item[final] Prints the output on a A4 paper, hiding the crop marks.
-% \end{valuelist}
 % \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
 % \begin{valuelist}
@@ -893,7 +912,8 @@
 % \item[sufelements] Combines the \opt{elements}-style sections with standard small caps headers. It can be used with all the page layouts.
 % \end{valuelist}
 % \end{optionlist}
-% \begin{mdframed}[backgroundcolor=black!5,frametitle={The FSPL styles},linecolor=black!30,linewidth=1pt]
+% \begin{mdframed}[frametitle={The FSPL styles},linecolor=black!30,linewidth=1pt]
+% 
 % The following styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the Verona University  (Italy).\footnote{\url{http://www.univr.it/main?ent=catdoc&id=3727&idDest=6&serv=127\#1431}.}
 % \begin{optionlist}
 % \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
@@ -902,23 +922,23 @@
 %   \opt{pagelayout=periodical},
 %    \opt{style=roman1},\\
 %    \opt{footnotestyle=superscript},
-%    \opt{liststyle=indented}.
+%    \opt{liststyle=indented},\\
 %    \opt{tocstyle=ragged}.
 %     \item[FSPLb] Equal to:
 %    \opt{pagelayout=periodical},
-%    \opt{style=italic5},
-%    \opt{headerstyle=center},\\
+%    \opt{style=italic5},\\
+%    \opt{headerstyle=center},
 %    \opt{chapnumstyle=roman},
 %    \opt{secstyle=center},
-%    \opt{quotestyle=right},\\
+%    \opt{quotestyle=right},
 %    \opt{footnotestyle=hung},
 %    \opt{liststyle=indented}.
 %    \opt{tocstyle=dotted}.
 %     \item[FSPLc] Equal to:
 %    \opt{pagelayout=periodical},
-%    \opt{style=smallcaps5},
-%    \opt{secfont=smallcaps},\\
-%    \opt{headerstyle=center},
+%    \opt{style=smallcaps5},\\
+%    \opt{secfont=smallcaps},
+%    \opt{headerstyle=center},\\
 %    \opt{footnotestyle=dotted},
 %    \opt{liststyle=indented},\\
 %    \opt{tocstyle=leftpage}.
@@ -1124,7 +1144,7 @@
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
 % Sets the font of the chapter number of \opt{style=elements/sufelements} styles. 
-% The default is Palatino (\LaTeX) or Computer Modern  (\XeLaTeX). Using (pdf)\LaTeX{} you can change it simply giving the name of the font family. 
+% The default is Palatino (\LaTeX) or Computer Modern  (\XeLaTeX{} and \LuaLaTeX). Using (pdf)\LaTeX{} you can change it simply giving the name of the font family. 
 %
 %For example, to select the Helvetica family you will need:
 %\begin{latexcode}
@@ -1132,7 +1152,7 @@
 % \chapnumfont{phv}
 %\end{verbatim}
 %\end{latexcode}
-% With \XeLaTeX{} the \cmd{fontspec} command is required:
+% With \XeLaTeX{} and \LuaLaTeX{} the \cmd{fontspec} command is required:
 %\begin{latexcode}
 %\begin{verbatim}
 % \chapnumfont{\fontspec[Numbers=OldStyle]{Helvetica}}
@@ -1398,8 +1418,8 @@
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak 
-  * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak 
-  * THE LAYOUT OF THE DOCUMENT.\MessageBreak 
+  * WITH PACKAGES AND/OR COMMANDS WHICH\MessageBreak 
+  * MAY CHANGE THE LAYOUT OF THE DOCUMENT.\MessageBreak 
   * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
   * ANYWAY, DON'T WORRY!\MessageBreak
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
@@ -1480,7 +1500,7 @@
 %    \begin{macrocode}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,periodical,compact,compactaureo,supercompact,
+    {standard,standardaureo,periodical,compact,compactaureo,supercompact,
     supercompactaureo,elements,periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -1494,6 +1514,17 @@
     marginparwidth= 30mm,
     marginparsep=   12pt}
 \or
+  \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+  \geometry{%
+    heightrounded,
+    a4paper,
+    includeheadfoot=true,
+    textwidth=      136mm,
+    textheight=     220mm,
+    marginratio=    2:3,
+    marginparwidth= 30mm,
+    marginparsep=   12pt}
+\or
 \suftesi@periodicaltrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
@@ -1708,7 +1739,7 @@
 \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
-% \subsection{Section numbers}
+% \subsection{Sections number style}
 % \subsubsection{Part number style}
 %    \begin{macrocode}
 \define@choicekey{}{partnumstyle}[\val\nr]
@@ -1739,7 +1770,7 @@
   \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Chapter number}
+% \subsubsection{Chapter number style}
 %    \begin{macrocode}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
 dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1769,7 +1800,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@toclabelnum{\@Roman}
 \fi}
 %    \end{macrocode}
-% \subsubsection{Section number}
+% \subsubsection{Section number style}
 %    \begin{macrocode}
 \define@choicekey{}{secnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1861,7 +1892,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \RequirePackage[inline]{enumitem}
 \renewcommand\labelitemi{\color{sufgray}\textbullet}
-\setlist{itemsep=.5ex,parsep=0pt}
+\setlist{itemsep=.5ex,parsep=0pt,listparindent=\parindent}
 \setlist[description]{font=\normalfont\itshape}
 \define@choicekey{}{liststyle}[\val\nr]
     {bulged,aligned,indented}[bulged]{%
@@ -2039,7 +2070,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 %    \end{macrocode}
 % \subsection{Other options}
-% \subsubsection{\cmd{parindent}}
+% \subsubsection{Indentation}
 %    \begin{macrocode}
 \define@choicekey{}{parindent}[\val\nr]
     {compact,wide}[compact]{%
@@ -2453,12 +2484,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
-\RequirePackage[final]{microtype}
-  \SetTracking
-    [ name         = default,
-      no ligatures = {f} ]
-    { encoding     = {OT1,T1,T2A,LY1,OT4,QX,EU2} }
-    { 110 }
+\RequirePackage{ifluatex}
+\RequirePackage{ifthen}
+\RequirePackage{microtype}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
 \versionstring{Version of}
 %    \end{macrocode}
@@ -2472,21 +2500,27 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsection{Greek fonts}
 % Thanks to Claudio Beccari and Enrico Gregorio for these macros:
 %    \begin{macrocode}
-\ifxetex
-\AtBeginDocument{
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+{% if xetex or luatex
+\AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
   {\ClassError{suftesi}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}}
   }
-\else
+  }
+{% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
@@ -2555,7 +2589,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 	\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{} 
 	\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{} 
    \fi
-\fi
+}
 %    \end{macrocode}
 % \subsection{Page layout}
 %    \begin{macrocode}
@@ -2578,7 +2612,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifxetex
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {% if xetex or luatex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -2586,7 +2621,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
       \chapnumfont{\relax}%
-\else
+  }
+  {% if pdftex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -2594,7 +2630,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \newcommand{\chapnumfont}[1]{%
     \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
-\fi
+  }
 %    \end{macrocode}
 % \paragraph{The \opt{elements} style} 
 %    \begin{macrocode}
@@ -3498,7 +3534,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsection{Headings}
 %    \begin{macrocode}
 \RequirePackage{fancyhdr}
-  \pagestyle{fancy}
+\AtBeginDocument{%
+ \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt} 
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
@@ -3592,6 +3629,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
   \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
+}
 %    \end{macrocode}
 % \subsection{Text elements}
 %
@@ -4355,7 +4393,7 @@ Janusz M. Nowacki.
       \normalfont \list{}{%
       \setlength{\itemindent}{-\parindent}
       \setlength{\leftmargin}{\parindent}
-      \setlength{\labelwidth}{\leftmargin}
+      \setlength{\labelwidth}{0pt}
       \setlength{\parsep}{\parskip}
       \let\makelabel}}
   {\endlist}
@@ -4398,7 +4436,9 @@ Janusz M. Nowacki.
 % using \XeLaTeX{} with italian as main language. Anyway this is 
 % incongruous with the \LaTeX{} default.
 %    \begin{macrocode}
-\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {\let\@afterindenttrue\@afterindentfalse}
+  {\relax}
 %    \end{macrocode}
 % Just one touch of french typography:
 %    \begin{macrocode}
@@ -4497,7 +4537,7 @@ Janusz M. Nowacki.
   Edition = {new edition},
   Foreword = {Enrico Gregorio},
   Hyphenation = {italian},
-  Subtitle = {Un'in\-troduzione a \LaTeXe},
+  Subtitle = {Un'introduzione a \LaTeXe},
   Title = {L'arte di scrivere con \LaTeX},
   Url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf},
   Annote = {Questa guida Ë diventata il punto di riferimento degli utenti 
@@ -4520,679 +4560,4 @@ Janusz M. Nowacki.
   Year = {2008}}
 %</bib>
 % \fi
-% \iffalse
-%<*fakelogo>
-prologues:=3;
-outputtemplate:="%j.mps";
-input boxes;
-beginfig(1);
-draw fullcircle scaled (2.5cm + 1pt) withcolor white;
-draw fullcircle scaled 2.5cm;
-draw fullcircle scaled 2.3cm;
-draw thelabel(btex \vbox{\sevenrm\halign{\hfil#\hfil\cr University of\cr
-      Verona\cr Seal\cr}} etex, origin);
-endfig;
-end
-%</fakelogo>
-% \fi
-% \iffalse
-%<*style-roman1>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman1]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman1>
-% \fi
-% \iffalse
-%<*style-roman2>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman2]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman2>
-% \fi
-% \iffalse
-%<*style-roman3>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman3]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman3>
-% \fi
-% \iffalse
-%<*style-roman4>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman4]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman4>
-% \fi
-% \iffalse
-%<*style-roman5>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman5]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman5>
-% \fi
-% \iffalse
-%<*style-roman6>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=roman6]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-roman6>
-% \fi
-% \iffalse
-%<*style-italic1>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic1]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic1>
-% \fi
-% \iffalse
-%<*style-italic2>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic2]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic2>
-% \fi
-% \iffalse
-%<*style-italic3>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic3]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic3>
-% \fi
-% \iffalse
-%<*style-italic4>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic4]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic4>
-% \fi
-% \iffalse
-%<*style-italic5>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic5]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic5>
-% \fi
-% \iffalse
-%<*style-italic6>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic6]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic6>
-% \fi
-% \iffalse
-%<*style-italic7>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic7]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic7>
-% \fi
-% \iffalse
-%<*style-italic8>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic8]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic8>
-% \fi
-% \iffalse
-%<*style-italic9>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic9]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic9>
-% \fi
-% \iffalse
-%<*style-italic10>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic10]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic10>
-% \fi
-% \iffalse
-%<*style-italic11>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic11]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic11>
-% \fi
-% \iffalse
-%<*style-italic12>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=italic12]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-italic12>
-% \fi
-% \iffalse
-%<*style-smallcaps1>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps1]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps1>
-% \fi
-% \iffalse
-%<*style-smallcaps2>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps2]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps2>
-% \fi
-% \iffalse
-%<*style-smallcaps3>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps3]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps3>
-% \fi
-% \iffalse
-%<*style-smallcaps4>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps4]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps4>
-% \fi
-% \iffalse
-%<*style-smallcaps5>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps5]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps5>
-% \fi
-% \iffalse
-%<*style-smallcaps6>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps6]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps6>
-% \fi
-% \iffalse
-%<*style-smallcaps7>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps7]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps7>
-% \fi
-% \iffalse
-%<*style-smallcaps8>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps8]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps8>
-% \fi
-% \iffalse
-%<*style-smallcaps9>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps9]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps9>
-% \fi
-% \iffalse
-%<*style-smallcaps10>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps10]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps10>
-% \fi
-% \iffalse
-%<*style-smallcaps11>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps11]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps11>
-% \fi
-% \iffalse
-%<*style-smallcaps12>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,crop=false,
-style=smallcaps12]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-smallcaps12>
-% \fi
-% \iffalse
-%<*style-elements>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[style=elements,
-crop=false]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-elements>
-% \fi
-% \iffalse
-%<*style-sufelements>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = XeLaTeX
-\documentclass[pagelayout=periodical,
-style=sufelements,crop=false]{suftesi}
-\usepackage{lipsum,fontspec}
-\setmainfont[Numbers=OldStyle]{Junicode}
-\setcounter{chapter}{2}
-\begin{document}
-\chapter{The Title of the Chapter}
-\section{Dolor sit amet}
-\lipsum[1]
-\subsection{Peniteitiagite}
-\lipsum[9]
-\end{document}
-%</style-sufelements>
-% \fi
-% \iffalse
-%<*collect-examples>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = pdfLaTeX
-\documentclass[a4paper]{book}
-\usepackage{graphicx,xcolor}
-\usepackage[margin=1cm]{geometry}
-\parindent0pt
-\pagestyle{empty}
-\newcommand{\inputex}[2]{%
-\vbox{\centering
-  \fbox{\includegraphics[width=#1\textwidth]{#2.pdf}}\\
-    \begin{picture}(0,0)
-      \put (-185,90) {%
-        \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#2}}}}
-    \end{picture}}
-}
-\begin{document}
-\inputex{.95}{style-roman1}
-\inputex{.95}{style-roman2}
-\inputex{.95}{style-roman3}
-\inputex{.95}{style-roman4}
-\inputex{.95}{style-roman5}
-\inputex{.95}{style-roman6}
-\inputex{.95}{style-italic1}
-\inputex{.95}{style-italic2}
-\inputex{.95}{style-italic3}
-\inputex{.95}{style-italic4}
-\inputex{.95}{style-italic5}
-\inputex{.95}{style-italic6}
-\inputex{.95}{style-italic7}
-\inputex{.95}{style-italic8}
-\inputex{.95}{style-italic9}
-\inputex{.95}{style-italic10}
-\inputex{.95}{style-italic11}
-\inputex{.95}{style-italic12}
-\inputex{.95}{style-smallcaps1}
-\inputex{.95}{style-smallcaps2}
-\inputex{.95}{style-smallcaps3}
-\inputex{.95}{style-smallcaps4}
-\inputex{.95}{style-smallcaps5}
-\inputex{.95}{style-smallcaps6}
-\inputex{.95}{style-smallcaps7}
-\inputex{.95}{style-smallcaps8}
-\inputex{.95}{style-smallcaps9}
-\inputex{.95}{style-smallcaps10}
-\inputex{.95}{style-smallcaps11}
-\inputex{.95}{style-smallcaps12}
-\inputex{.8}{style-elements}
-\inputex{.95}{style-sufelements}
-\end{document}
-%</collect-examples>
-% \fi
-% \iffalse
-%<*frontespizio>
-%% !TEX encoding = UTF-8 Unicode
-%% !TEX TS-program = pdfLaTeX
-\documentclass [titlepage]{article}
-\usepackage[utf8]{inputenc}
-\usepackage [a4paper,textwidth=312pt,includehead,textheight=624pt,right=90pt,vmarginratio=1:2]{geometry}
-\usepackage {graphicx}
-\usepackage [svgnames]{xcolor}
-\usepackage[nowrite,infront,suftesi]{frontespizio}
-\nofiles 
-\fontoptionnormal 
-\Logo [1.5cm]{fakelogo}
-\Istituzione {University of St.\ Anford}
-\Divisione {Department of Typography}
-\Scuola {Ph.D. degree in \TeX {} and \LaTeX {}}
-\Titolo {How to prepare a\\ formal frontispiece}
-\Sottotitolo {Theory and practice}
-\NCandidato {Candidate}
-\Candidato {Enrico Gregorio}
-\NRelatore {Thesis advisor}{}
-\Relatore {Prof. R. J. Drofnats}
-\NCorrelatore {Research supervisor}{Research supervisors}
-\Correlatore {J. H. Quick}
-\Correlatore {B. L. User}
-\Piede {Thesis submitted in 2010}
-\begin {document}
-\preparefrontpagesuftesi
-\end {document}
-%</frontespizio>
-% \fi
 % \Finale
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index c4fad11c000..c8ed3c9c597 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-2014 by Ivan Valbusa
+%%  Copyright 2009-2015 by Ivan Valbusa
 %% 
 %%  This program is provided under the terms of the
 %%  LaTeX Project Public License distributed from CTAN
@@ -19,12 +19,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2014/04/05 v1.9c A class for typesetting theses, books and articles]
+    [2015/03/29 v2.0 A class for typesetting theses, books and articles]
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
-  * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
-  * THE LAYOUT OF THE DOCUMENT.\MessageBreak
+  * WITH PACKAGES AND/OR COMMANDS WHICH\MessageBreak
+  * MAY CHANGE THE LAYOUT OF THE DOCUMENT.\MessageBreak
   * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
   * ANYWAY, DON'T WORRY!\MessageBreak
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
@@ -96,7 +96,7 @@
 \fi}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,periodical,compact,compactaureo,supercompact,
+    {standard,standardaureo,periodical,compact,compactaureo,supercompact,
     supercompactaureo,elements,periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -110,6 +110,17 @@
     marginparwidth= 30mm,
     marginparsep=   12pt}
 \or
+  \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+  \geometry{%
+    heightrounded,
+    a4paper,
+    includeheadfoot=true,
+    textwidth=      136mm,
+    textheight=     220mm,
+    marginratio=    2:3,
+    marginparwidth= 30mm,
+    marginparsep=   12pt}
+\or
 \suftesi@periodicaltrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
@@ -442,7 +453,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 \RequirePackage[inline]{enumitem}
 \renewcommand\labelitemi{\color{sufgray}\textbullet}
-\setlist{itemsep=.5ex,parsep=0pt}
+\setlist{itemsep=.5ex,parsep=0pt,listparindent=\parindent}
 \setlist[description]{font=\normalfont\itshape}
 \define@choicekey{}{liststyle}[\val\nr]
     {bulged,aligned,indented}[bulged]{%
@@ -943,33 +954,36 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
-\RequirePackage[final]{microtype}
-  \SetTracking
-    [ name         = default,
-      no ligatures = {f} ]
-    { encoding     = {OT1,T1,T2A,LY1,OT4,QX,EU2} }
-    { 110 }
+\RequirePackage{ifluatex}
+\RequirePackage{ifthen}
+\RequirePackage{microtype}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
 \versionstring{Version of}
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
  \else
 \fi
-\ifxetex
-\AtBeginDocument{
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+{% if xetex or luatex
+\AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
   {\ClassError{suftesi}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}}
   }
-\else
+  }
+{% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
@@ -1032,7 +1046,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
 \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
    \fi
-\fi
+}
 \ifsuftesi@nocrop
   \relax
     \else
@@ -1046,7 +1060,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifxetex
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {% if xetex or luatex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1054,7 +1069,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
       \chapnumfont{\relax}%
-\else
+  }
+  {% if pdftex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1062,7 +1078,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \newcommand{\chapnumfont}[1]{%
     \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
-\fi
+  }
 \define@key[SUF]{elements}{chapsize}[90]{%
   \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}}
 \define@key[SUF]{elements}{chapposition}[-83]{%
@@ -1844,7 +1860,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
 \fi
 \RequirePackage{fancyhdr}
-  \pagestyle{fancy}
+\AtBeginDocument{%
+ \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
@@ -1916,6 +1933,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
   \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
+}
 \renewenvironment{quotation}
             {\list{}{\listparindent\parindent%
                      \itemindent    \listparindent
@@ -2546,7 +2564,7 @@ Janusz M. Nowacki.
       \normalfont \list{}{%
       \setlength{\itemindent}{-\parindent}
       \setlength{\leftmargin}{\parindent}
-      \setlength{\labelwidth}{\leftmargin}
+      \setlength{\labelwidth}{0pt}
       \setlength{\parsep}{\parskip}
       \let\makelabel}}
   {\endlist}
@@ -2565,7 +2583,9 @@ Janusz M. Nowacki.
   {\endlist}
 \AtBeginDocument{\RequirePackage{fixltxhyph}}
 \let\hemph\emph
-\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {\let\@afterindenttrue\@afterindentfalse}
+  {\relax}
 \frenchspacing
 \endinput
 %%