suftesi (8nov11)

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

6 files changed, 211 insertions, 165 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README
index e0bef6ea125..7889896598c 100644
--- a/Master/texmf-dist/doc/latex/suftesi/README
+++ b/Master/texmf-dist/doc/latex/suftesi/README
@@ -21,7 +21,7 @@ USAGE:
 \documentclass[<options>]{suftesi}
 
 WARNING:
-Follow these steps to get the documentatioN:
+Follow these steps to get the documentation:
 - pdflatex suftesi
 - pdflatex suftesi-frn
 - bibtex suftesi
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf b/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
index 9f93d73b601..9b8f46b4e1c 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
index 85f5045d28e..60ce1613116 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
@@ -4,8 +4,8 @@
 %	Questo file è distribuito assieme alla classe suftesi nella cartella suftesi.zip
 
 \documentclass[
-%article,
 %authortitle,
+%article,
 %compact,
 %supercompact,
 %elements,
@@ -26,16 +26,16 @@
 \usepackage[T1]{fontenc}                
 \usepackage[utf8]{inputenc}% Pay attention to the input encoding!
 \usepackage[polutonikogreek,german,english,italian]{babel}
-\usepackage{graphicx}% to manage images
+\usepackage{graphicx}
    \graphicspath{{Immagini/}}
-\usepackage{booktabs}% for tables
-\usepackage[italian]{varioref}% special cross references
-\usepackage{lipsum}% Produce testo fittizio
-% index of names
+\usepackage{booktabs}
+\usepackage[italian]{varioref}
+\usepackage{lipsum}
+% index
 \usepackage{makeidx}
      \addto\captionsitalian{\renewcommand{\indexname}{Indice dei nomi}}
        \makeindex
-% bibliography settings
+% bibliography
 \usepackage[italian=guillemets]{csquotes}
 \usepackage[
 	style=philosophy-classic,%philosophy-modern, philosophy-verbose
@@ -46,8 +46,12 @@
 % Cross refereces
 \usepackage{hyperref}% needed to use the \chapterintro command
 \hypersetup{colorlinks=true,citecolor=blue,draft=false}
+
+\author{The author}
+\title{The title}
+
 \begin{document}
-% uncomment the following lines if you use the ''french'' option in the babel package
+% uncomment the following lines if you use the babel package with the ''french'' option:
 %\selectlanguage{italian}
 %\frenchspacing
 
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 6aa29eb6b5d..21a76236ea8 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/suftesi.tex b/Master/texmf-dist/doc/latex/suftesi/suftesi.tex
index 79d4b57eded..8aa1f715775 100644
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.tex
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.tex
@@ -7,6 +7,7 @@
 \usepackage[polutonikogreek,italian,english]{babel}
 \usepackage[babel,italian=guillemets]{csquotes}
 \usepackage[%
+	backend=biber,
 	style=philosophy-classic,
 	library=true,
 	natbib=true,
@@ -15,10 +16,8 @@
 \usepackage{guit}
 \usepackage{booktabs,multirow}
 \usepackage{siunitx}
-\usepackage{epigraph}
 \usepackage{microtype}
 \usepackage{metalogo}
-\usepackage{mdframed}
 \usepackage[suftesi]{frontespizio}
 \usepackage{sectsty}
 	\sectionfont{\spotcolor}
@@ -26,6 +25,8 @@
 	\subsubsectionfont{\spotcolor} 
 	\paragraphfont{\spotcolor}
 	\subparagraphfont{\spotcolor} 
+
+
 \hypersetup{%
 	  pdftitle={User's Guide to \sty{suftesi}},
 	  pdfsubject={A document class for typesetting theses, books and articles},
@@ -33,7 +34,7 @@
 	  pdfkeywords={thesis, humanities, books},
 	  citecolor=spot} 
 %******************************************************************
-\rcsid{$Id: suftesi.tex,v 0.6a 2011/10/24 17:00:00 valbusa beta $}
+\rcsid{$Id: suftesi.tex,v 0.6b 2011/11/07 17:00:00 valbusa beta $}
 \titlepage{%
 	  title= {User's Guide to \sty{suftesi}},
 	  subtitle={A document class for typesetting theses, books and articles},
@@ -69,7 +70,6 @@
 \frenchspacing
 
 \begin{document}
-\raggedright
 
 \printtitlepage
 \tableofcontents
@@ -114,7 +114,7 @@ If you use  \sty{suftesi}{} in a document typeset with another class (for exampl
 %*********************************************
 
 The class loads the following packages: \sty{beramono}, 
-\sty{calc}, \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{epigraph}, \sty{fancyhdr}, \sty{fontenc},  \sty{footmisc}, \sty{geometry}, \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, \sty{metalogo}, \sty{microtype}, \sty{mparhack}, \sty{multicol},  \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{varioref}.
+\sty{calc}, \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{epigraph}, \sty{fancyhdr}, \sty{fontenc}, \sty{geometry}, \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, \sty{metalogo}, \sty{microtype}, \sty{mparhack}, \sty{multicol},  \sty{textcase}, \sty{titlesec}, \sty{titletoc}.
 
 
 
@@ -229,6 +229,13 @@ For use this frontispiece with the  \opt{compact}, \opt{supercompact} and \opt{e
 %%			frontespizio
 %***************************************************************************
 \clearpage
+\begin{picture}(0,0)
+\unitlength=1cm
+\put(-3.5,-25){The \sty{suftesi} frontispiece.}
+\color{black!50}
+\put(-3.5,-24){\framebox(18.4,26){\color{blue}}}
+\end{picture}
+
 \thispagestyle{empty}
 
 \begin{frontespizio} 
@@ -248,7 +255,6 @@ difficilissimi e complicatissimi}
 \Correlatore{Ubaldo Kutuzu} 
 \end{frontespizio}
 
-
 %*********************************************
 \section{Options}\label{sec:options}
 %*********************************************
@@ -292,7 +298,7 @@ This option is aimed to typeset articles or short theses (that is to say without
 \optitem{bozza} 
 Prints the following note in the footer:  
 \begin{quote} 
-Version of \meta{data documento}
+Version of \meta{date}
 \end{quote}
 \optitem{plain}
 An older name of the \opt{centerheadings} option. Disabled since version 0.6.
@@ -320,11 +326,11 @@ The class defines the following new commands.
 
 \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.
+This command is provided only for italian documents. It prints a page with a copyright notice and the colophon in the bottom. For different languages use the \cmd{bookcolophon} instead (see below).
 
 If you don't like the copyright notice leave the second argument of the command empty:
 \begin{ttquote}
-\cmd{colophon\oarm{OS}\{\}\arm{info aggiuntive}}
+\cmd{colophon\oarm{OS}\{\}\arm{additional info}}
 \end{ttquote}
 
 With the \opt{article} option, you can use the \cmd{artcolophon} command (see below) or  the \cmd{thanks} command:
@@ -335,7 +341,7 @@ using the  \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\}
 
 \cmditem{bookcolophon}{copyright notice}{attribution notice and other informations}
 
-This command is similar to \cmd{colophon} but more customizable. The first argument prints its content (usually the copyright notice) in the center of the page. The second argument prints its content at the bottom, preceded by the title ``Colophon''. For example:
+This command is similar to \cmd{colophon} but it is completely customizable. The first argument prints its content (usually the copyright notice) in the center of the page. The second argument prints its content at the bottom, preceded by the title ``Colophon''. For example:
 
 {\begin{verbatim}
 \colophon{Copyright © 2007 by Ivan Valbusa}{This work has been 
@@ -349,33 +355,30 @@ Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.}
 This command has only one argument. It simply prints its content at the bottom of the page. Here is an example:
 
 \begin{verbatim}
-\artcolophon{Quest'opera è stata rilasciata sotto la licenza Creative 
-Commons Attribuzione 2.5 Italia. Per leggere una copia della licenza 
-visita il sito web
+\artcolophon{This work is licensed under the Creative Commons 
+Attribution-NonCommercial-NoDerivs 3.0 Unported License. To view
+a copy of this license, visit 
 \begin{center}
-http://creativecommons.org/licenses/publicdomain/
+\texttt{http://creativecommons.org/licenses/by-nc-nd/3.0/}
 \end{center}
-o spedisci una lettera a Creative Commons, 559 Nathan Abbott Way, 
-Stanford, California 94305, USA.\\[1ex]
+or send a letter to Creative Commons, 444 Castro Street, Suite 900, 
+Mountain View, California, 94041, USA.\\[1ex]
 
-Questo lavoro è stato composto con \LaTeX, usando la classe 
-\texttt{suftesi}  di Ivan Valbusa. 
+Typeset with \LaTeX,  using the \sty{suftesi} class by Ivan 
+Valbusa.}
 \end{verbatim}
 
 \cmditem{chapterintro}
 
 Prints an unnumbered introduction at the beginning of the chapters, with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
 
-\cmditem{chapterintroname}{name}
+\cmditem{chapterintroname}{name}\hfill(default:=\texttt{Introduzione})
 
 Changes in \meta{name} the title printed by the \cmd{chapterintro} command.
 
-\cmditem{hemph}{testo}
+\cmditem{appendicesname}{name}\hfill(default:=\texttt{Appendici})
 
-Just like \cmd{emph} but for particular cases of the italian language:
-\begin{verbatim}
-dell'\hemph{encyclopædia}
-\end{verbatim}
+Changes in \meta{name} the title printed by the \cmd{appendix} command.
 
 \cmditem{headbreak}
 
@@ -385,9 +388,6 @@ A manual break which is active for the table of contents but not in the text or
 
 A manual break which is active in the text and in the headings but not in the table of contents.
 
-\cmditem{appendicesname}{name}
-
-Changes in \meta{name} the title printed by the \cmd{appendix} command.
 
 \cmditem{chapnumfont}{name}
 
@@ -396,13 +396,25 @@ Sets the font for the chapter number with the \opt{sufelements} option. The defa
 \chapnumfont{}
 \end{ltxcode}
 
+\cmditem{hemph}{testo}
 
+Just like \cmd{emph} but for particular cases of the italian language:
+\begin{verbatim}
+dell'\hemph{encyclopædia}
+\end{verbatim}
 \end{ltxsyntax}
 
 
 \section*{Changes}
 
 \begin{changelog}
+
+\begin{release}{0.6b}{2011-11-07}
+\item Improved full compatibility with \XeLaTeX
+\item \sty{varioref} and \sty{footmisc} packages are no longer loaded
+\item Updated documentation
+\end{release}
+
 \begin{release}{0.6a}{2011-10-24}
 \item Updated documentation
 \end{release}
@@ -436,9 +448,9 @@ Sets the font for the chapter number with the \opt{sufelements} option. The defa
 %*********************************************
 %		sufbibliography
 %*********************************************
-\defbibnote{nota}{\sffamily This bibliography has been typeset with the style \texttt{philosophy-modern} provided by the \sty{biblatex-philosophy}, created by the same author of this class.}
+\defbibnote{note}{\sffamily This bibliography has been typeset with the \sty{biblatex-philosophy} styles, created by the same author of this class.}
 \addcontentsline{toc}{section}{\refname}
-\printbibliography[prenote=nota]
+\printbibliography[prenote=note]
 
 
 
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 0cadd0d87aa..0c971346cfb 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-		[2011/10/24 v. 0.6a
+		[2011/11/07 v. 0.6b
 		A class for typesetting theses, books and articles]
 %****************************************
 %  declare options
@@ -61,7 +61,11 @@
 \ExecuteOptions{artemisia} 
 \ProcessOptions
 \relax
+\ifsuftesi@article
+\LoadClass[a4paper,notitlepage]{book}
+\else
 \LoadClass[a4paper]{book}
+\fi
 %****************************************
 % 		PACKAGES
 %****************************************
@@ -69,11 +73,14 @@
 	\definecolor{sufred}{rgb}{0.5,0,0}
 	\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{ifxetex,ifluatex,metalogo}
-\RequirePackage[letterspace=110]{microtype}
+\ifxetex\relax
+  \else
+    \RequirePackage[letterspace=110]{microtype}
+      \microtypesetup{expansion=false}%
+    \fi
 \RequirePackage{textcase}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage[bottom]{footmisc}
 \RequirePackage{mparhack}
 \RequirePackage{caption}
 	\captionsetup{labelsep=period,font=small}
@@ -231,15 +238,16 @@
 %		SECTION TITLES
 %****************************************
 \RequirePackage{titlesec}
-\microtypesetup{expansion=false}%
-    \DeclareRobustCommand{\sufsc}[1]%
-    {\textls{\MakeTextLowercase{\textsc{#1}}}}%
-\DeclareRobustCommand{\sufsmallcaps}%
-    {\ifxetex\scshape\addfontfeature{LetterSpace=6}\else\lsstyle\scshape\fi\expandafter
-    \MakeLowercase}%
+\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
+   \ifxetex
+     \addfontfeature{LetterSpace=6}\MakeTextLowercase{\textsc{#1}}
+       \else
+         \textls{\MakeTextLowercase{\textsc{#1}}}
+       \fi
+       }%
 \DeclareRobustCommand{\sufchaptersize}{%
 	\ifsuftesi@supercompact\large\else\ifsuftesi@compact\Large\else\LARGE\fi\fi}
-\ifsuftesi@article% article
+\ifsuftesi@article% article mode
 	\renewcommand \thesection {\@arabic\c@section}
 	\renewcommand\thesubsection   {\thesection.\@arabic\c@subsection} 
 	\renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}
@@ -278,26 +286,26 @@
      \nobreak
      \vskip 3ex
      \@afterheading}
-\else% book
+\else% book mode
 \titleformat{\part}[display]
 	  {\LARGE\filcenter}
 	  {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\Roman{part}}
 	  {3ex}
-	  {\sufchaptersize\ifsuftesi@sctitles\sufsmallcaps\else\fi}
+	  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
 \fi
-% COMMON SETTINGS
+% common settings
 \ifsuftesi@centertitle
 	\titleformat{\chapter}[display]
 		  {\filcenter}
 		  {\sufchaptersize\thechapter}
 		  {3ex}
-		  {\sufchaptersize\ifsuftesi@sctitles\sufsmallcaps\else\fi}
+		  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
     \else
 	\titleformat{\chapter}[hang]
 		  {\filright}
 		  {\sufchaptersize\thechapter.}
 		  {3ex}
-		  {\sufchaptersize\ifsuftesi@sctitles\sufsmallcaps\else\fi}
+		  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
 \fi
 \ifsuftesi@compact
   \titlespacing*{\chapter}{0em}{0ex}{18ex}
@@ -308,7 +316,7 @@
       \titlespacing*{\chapter}{0em}{6ex}{18ex}
    \fi
 \fi
-% ELEMENTS
+% Elements
 \newcommand{\chapnumfont}[1]{%
 	\ifxetex
 	  \def\@chapnumfont{#1}
@@ -319,7 +327,7 @@
 
 \xechapnumfont{Palatino}
 \chapnumfont{pplj}
-\DeclareRobustCommand{\sectitle}[1]{\textls[160]{\MakeUppercase{#1}}}%
+\DeclareRobustCommand{\sectitle}[1]{\textls{\MakeUppercase{#1}}}%
 
 \ifsuftesi@sufelements
    \titleformat{\chapter}[block]
@@ -327,7 +335,7 @@
 		  {\begin{picture}(0,0)
 	\setlength{\unitlength}{1pt}
 	\ifxetex
-	  \fontspec{\@chapnumfont}% Palatino
+	  \fontspec{\@chapnumfont}%
 	\else
 	  \@chapnumfont
 	  \fi
@@ -351,7 +359,7 @@
 	  {\raggedright}
 	  {\textnormal\thesection}
 	  {1em}
-	  {\small\sufsmallcaps}
+	  {\small\suftesi@smallcaps}
 	\titlespacing*{\section}{0em}{10pt}{10pt}[0em] 
 \titleformat{\subsection}[block]
 	  {\filright\normalsize\itshape}
@@ -370,7 +378,7 @@
 	  {\filright}
 	  {\thesection}
 	  {.5em}
-	  {\unskip\ifsuftesi@sctitles\sufsmallcaps\else\itshape\fi}
+	  {\unskip\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\itshape\fi}
 	\titlespacing*{\section}{0ex}{\baselineskip}{\baselineskip}[0ex]	  
 \fi
 \titleformat{\subsection}[hang]
@@ -403,17 +411,16 @@
 %		TOC, LOF, LOT
 %****************************************
 \RequirePackage{titletoc}
-\ifsuftesi@article % ARTICLE MODE
-\renewcommand\tableofcontents{%
+\ifsuftesi@article 
+\renewcommand\tableofcontents{% article mode
 	\thispagestyle{empty}
 	    \section*{\contentsname
-	        \@mkboth{%
-	           \contentsname}{\contentsname}}%
+	        \@mkboth{\contentsname}{\contentsname}}%
 	    \@starttoc{toc}%
 	      \vspace*{2ex}
 	    }
 \else
-\renewcommand\tableofcontents{%
+\renewcommand\tableofcontents{% book mode
     \if@twocolumn
       \@restonecoltrue\onecolumn
     \else
@@ -457,14 +464,12 @@
 	{\thecontentslabel\hspace*{1em}}
 	{} 
 	{\titlerule*{}\contentspage}	
-% list of figures
 \titlecontents{figure}
 	[1.5em]
 	{} 
 	{\thecontentslabel\hspace*{1em}}
 	{} 
 	{\titlerule*{}\contentspage}
-% list of tables
 \titlecontents{table}
 	[1.5em]
 	{} 
@@ -520,7 +525,7 @@
 	\titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
 	\titlecontents{chapter}[1em]                                                                  
 	  {\filright\hskip.5em}                                   
-	  {\sufsmallcaps\appendixname~\thecontentslabel:\hskip1em}                                                                   
+	  {\suftesi@smallcaps{\appendixname~\thecontentslabel:}\hskip1em}                                                                   
 	  {}                                                       
 	  {\contentspage\vspace{5pt}}}
 	  \else
@@ -537,25 +542,49 @@
 \pagestyle{fancy}
 \renewcommand{\headrulewidth}{0pt} 
 \renewcommand{\footnoterule}{}
-\ifsuftesi@elements
-	\renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} 
-\else
-	\renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename~\thechapter}{#1}}
+\ifsuftesi@elements	% Elements
+	\renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
+	\renewcommand{\sectionmark}[1]{\markright{#1}}
+\else							% book
+	\renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
+	\renewcommand{\sectionmark}[1]{}
 \fi
-\ifsuftesi@article
-    	  \renewcommand{\sectionmark}[1]{\markright{\thesection.~#1}}
+\ifsuftesi@article		% article
+    	  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
   \else\fi
-    \ifsuftesi@elements
-      \renewcommand{\sectionmark}[1]{\markright{#1}}
-	\else\fi 
-	
-\def\sufrightmark{\ifsuftesi@sctitles\sufsc{\ifsuftesi@authortitle\@title\else\rightmark\fi}% article mode
-	\else\ifsuftesi@authortitle\nouppercase\@title\else\nouppercase\rightmark\fi\fi}
-\def\sufleftmark{\ifsuftesi@sctitles\sufsc{\ifsuftesi@authortitle\@author\else\ivanleftmark\fi}% book mode
-	\else\ifsuftesi@authortitle\nouppercase\@author\else\nouppercase\ivanleftmark\fi\fi}
-\def\sufthepage{\ifsuftesi@sctitles\sufsc{\thepage}\else\thepage\fi}
-\def\ivanleftmark{\if@mainmatter\leftmark\else\rightmark\fi} 
-    
+\ifsuftesi@sctitles
+  \ifsuftesi@authortitle
+    \def\suf@rightmark{\suftesi@smallcaps{\@title}}
+  \else
+    \def\suf@rightmark{\suftesi@smallcaps{\rightmark}}
+  \fi
+\else
+  \ifsuftesi@authortitle
+    \def\suf@rightmark{\nouppercase{\@title}}
+  \else
+    \def\suf@rightmark{\nouppercase{\rightmark}}
+  \fi
+\fi
+\ifsuftesi@sctitles
+  \ifsuftesi@authortitle
+    \def\suf@leftmark{\suftesi@smallcaps{\@author}}
+  \else
+    \def\suf@leftmark{\suftesi@smallcaps{\suf@leftrightmark}}
+  \fi
+\else
+  \ifsuftesi@authortitle
+    \def\suf@leftmark{\nouppercase{\@author}}
+  \else
+    \def\suf@leftmark{\nouppercase{\suf@leftrightmark}}
+  \fi
+\fi
+\ifsuftesi@sctitles
+  \def\sufthepage{\suftesi@smallcaps{\thepage}}
+\else
+  \def\sufthepage{\thepage}
+\fi
+\def\suf@leftrightmark{%
+	\if@mainmatter\leftmark\else\rightmark\fi} 
 \fancypagestyle{plain}{%
 	\fancyhf{}
 	\fancyfoot[C]{}
@@ -563,28 +592,44 @@
 	\renewcommand{\footrulewidth}{0pt}}	
 \fancypagestyle{sufplain}{%
 	\fancyhf{}%
-	\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
+	\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
 	\fancyfoot[C]{\footnotesize\sufthepage}}
 \fancypagestyle{centerheadings}{%
 		\fancyhf{}%
-		\fancyhead[CO]{\footnotesize%
-		\xheadbreakfalse\sufrightmark} 
-		\fancyhead[CE]{\footnotesize%
-		\xheadbreakfalse\ifsuftesi@article\ifsuftesi@authortitle\sufleftmark\else\sufrightmark\fi\else\sufleftmark\fi} 
-		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
+		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
+		\fancyhead[CO]{\footnotesize\xheadbreakfalse\suf@rightmark} 
+		\fancyhead[CE]{\footnotesize\xheadbreakfalse%
+			\ifsuftesi@article
+			  \ifsuftesi@authortitle
+			    \suf@leftmark
+			      \else
+			        \suf@rightmark
+			      \fi
+			  \else
+			    \suf@leftmark
+			  \fi} 
 		\fancyfoot[C]{\footnotesize\sufthepage}%
 		}
 \fancypagestyle{sufdefault}{%
 		\fancyhf{}%
-		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
+		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
 		\fancyhead[LE,RO]{\footnotesize\sufthepage} 
-		\fancyhead[LO]{\footnotesize\xheadbreakfalse\sufrightmark}
-		\fancyhead[RE]{\footnotesize\ifsuftesi@article\ifsuftesi@authortitle\sufleftmark\else\sufrightmark\fi\else\sufleftmark\fi}%
-			}
-\fancypagestyle{elements}{% elements
+		\fancyhead[LO]{\footnotesize\xheadbreakfalse\suf@rightmark}
+		\fancyhead[RE]{\footnotesize\xheadbreakfalse%
+			\ifsuftesi@article
+			  \ifsuftesi@authortitle
+			    \suf@leftmark
+			      \else
+			        \suf@rightmark
+			       \fi
+			  \else
+			    \suf@leftmark
+			  \fi}
+		}
+\fancypagestyle{elements}{%
 	\fancyhf{}
 	\fancyfoot[LE,RO]{\thepage} 
-	\fancyhead[RO]{%pari
+	\fancyhead[RO]{%
 		\begin{picture}(0,0)
 		   \setlength{\unitlength}{1pt}
 		      \put(0,-104){%
@@ -600,7 +645,6 @@
 		      \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
 		\end{picture}}	
 		}		
-
 %\renewcommand{\author}[1]{\gdef\@sufauthor{#1}}
 %\def\@sufauthor{--missing author--% 
 %  \ClassWarningNoLine{suftesi} 
@@ -612,19 +656,50 @@
 %  \ClassWarningNoLine{suftesi} 
 %    {Missing \protect\title}% 
 %    \gdef\univrart@author{--missing title--}}
-
 \pagestyle{sufdefault}
 \ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
 \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
 \ifsuftesi@elements\pagestyle{elements}\else\fi
+
 %****************************************
-%	TITLE PAGE FOR "ARTICLE"
+%	TITLE PAGE 
 %****************************************
-\newcommand{\standardtitle}{}
 \let\standardtitle\maketitle
-\ifsuftesi@article
-    \@titlepagefalse
-	\renewcommand\maketitle{\par
+\if@titlepage% titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles\suftesi@smallcaps{\@title}\else\@title\fi \par}%
+    \vskip 3em%
+    {\small\lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\small\@date\par}%       
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+%  \global\let\@author\@empty
+     \global\let\@date\@empty
+%  \global\let\@title\@empty
+%  \global\let\title\relax
+%  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\else% notitlepage
+\renewcommand\maketitle{\par
 	  \begingroup
 	    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
 	    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
@@ -655,62 +730,29 @@
 %	  \global\let\title\relax
 %	  \global\let\author\relax
 	  \global\let\date\relax
-	  \global\let\and\relax
-	}
-	\def\@maketitle{%
+	  \global\let\and\relax}
+     \def\@maketitle{%
 	  \newpage
 	  \null
 	  \vskip 2em%
 	  \begin{center}%
 	  \let \footnote \thanks
-	    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles\sufsmallcaps\@title\else\@title\fi\par}%
+	    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles\suftesi@smallcaps{\@title}\else\@title\fi\par}%
 	    \vskip 1.5em%
-	    {\lineskip .5em%
+	    {\small\lineskip .5em%
 	      \begin{tabular}[t]{c}%
-        {\small\@author\par}
+        \@author\par
 	      \end{tabular}\par}%
 	    \vskip 1em%
 	    {\small\@date\par}%
 	  \end{center}%
 	  \par
 	  \vskip 1.5em}
-  \else
-\renewcommand\maketitle{\begin{titlepage}%
-  \let\footnotesize\small
-  \let\footnoterule\relax
-  \let \footnote \thanks
-  \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-  \null\vfil
-  \vskip 60\p@
-  \begin{center}%
-    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles\sufsmallcaps\@title\else\@title\fi \par}%
-    \vskip 3em%
-    {\lineskip .75em%
-      \begin{tabular}[t]{c}%
-        {\small\@author\par}
-      \end{tabular}\par}%
-      \vskip 1.5em%
-    {\small\@date\par}%       % Set date in \large size.
-  \end{center}\par
-  \@thanks
-  \vfil\null
-  \end{titlepage}%
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@thanks\@empty
-%  \global\let\@author\@empty
-  \global\let\@date\@empty
-%  \global\let\@title\@empty
- % \global\let\title\relax
-%  \global\let\author\relax
-  \global\let\date\relax
-  \global\let\and\relax
-}
 \fi
 %****************************************
 %		NOTES
 %****************************************
+\RequirePackage{ltxcmds}
 \renewcommand\@makefntext{\hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
 % thanks to Lorenzo Pantieri and Enrico Gregorio
 \def\graffito@setup{%
@@ -719,16 +761,17 @@
    \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
    \doublehyphendemerits=100000%
    \finalhyphendemerits=\doublehyphendemerits}
- \DeclareRobustCommand{\marginnote}{}
- \let\marginnote\marginpar
-  \DeclareRobustCommand{\graffito}[1]{\marginnote%
+\newcommand{\graffito}[1]{\marginnote%
  [\graffito@setup\raggedleft\hspace{0pt}{#1}]%
  {\graffito@setup\raggedright\hspace{0pt}{#1}}}
-\let\marginpar\graffito
+ \let\marginnote\marginpar
+ \def\marginpar{% thanks to Antonio Macrì
+   \@ifnextchar[\marginnote\graffito}
 \ifsuftesi@nomarginpar
-   \renewcommand{\marginpar}[1]{}
-   \renewcommand{\graffito}[1]{}
-\else\fi
+	\let\graffito\@gobble
+	\renewcommand\marginpar[2][]{}
+	  \else
+	\fi
 %***************************************
 %		COLOPHON
 %****************************************
@@ -759,7 +802,6 @@
 	    \fi usando la classe \textsf{suftesi} di 
 	    Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
 	    \cleardoublepage}
-
 \newcommand{\bookcolophon}[2]{%
 	\thispagestyle{empty}
 	\null
@@ -769,14 +811,11 @@
     \section*{Colophon}
 	{\small #2\par}
 	    \cleardoublepage}
-
 \newcommand{\artcolophon}[1]{%
 \thispagestyle{empty}
 	\null
 	  \vfill
 	{\small #1\par}}
-
-
 %****************************************
 %		INDEX
 %****************************************
@@ -805,14 +844,10 @@
 	\chapter{\bibname}%
   \fi
   		\normalfont \list{}{%
-			%\setlength{\labelsep}{0.5em}
 			\setlength{\itemindent}{-\parindent}
 			\setlength{\leftmargin}{\parindent}
 			\setlength{\labelwidth}{\leftmargin}
-			%\addtolength{\labelwidth}{-\labelsep}
-			%\setlength{\listparindent}{\parindent}
 			\setlength{\parsep}{\parskip}
-			%\setlength{\itemsep}{0em}
 			\let\makelabel}}
 	{\endlist}
 \newcommand{\losname}{Sigle}
@@ -824,16 +859,14 @@
 			\setlength{\itemindent}{0pt}
 			\setlength{\leftmargin}{6em}
 			\setlength{\labelwidth}{\leftmargin}
-			%\addtolength{\labelwidth}{-\labelsep}
 			\setlength{\listparindent}{\parindent}
 			\setlength{\parsep}{\parskip}
-			%\setlength{\itemsep}{0em}
 			\let\makelabel\itlabel}}
 	{\endlist}
 %*************************************************************
 % 		ENVIRONMENTS
 %*************************************************************
-% QUOTATIONS
+% quotations
 \renewcommand\labelitemii{\normalfont \textendash}
 \renewenvironment{quotation}
                {\list{}{\listparindent\parindent%
@@ -858,8 +891,7 @@
                         \advance\leftmargin 1.5em}%
                 \item\relax}
                {\endlist}	
-% ABSTRACT
-\ifsuftesi@article
+% abstract
 \if@titlepage
   \newenvironment{abstract}{%
       \titlepage
@@ -883,8 +915,6 @@
       \fi}
       {\if@twocolumn\else\endquotation\fi}
 \fi
-    \else
-\fi
 %*************************************************************
 % 		 COMMANDS
 %*************************************************************
@@ -896,11 +926,11 @@
 \newcommand{\chapterintroname}[1]{\def\suffchapterintroname{#1}}
 \chapterintroname{Introduzione}
 \newcommand{\hemph}[1]{\penalty10000\hskip0pt\emph{#1}}
-%	spezza nel toc ma non nel testo e testatina
+%	breaks in toc but not in headings and text 
 \newif\ifheadbreak\headbreakfalse  
 	\DeclareRobustCommand{\headbreak}  
 		{\ifheadbreak\\\else\fi}
-%	spezza nel testo e testatina ma non nel toc
+%	breaks in text and headings but not in toc
 \newif\ifxheadbreak\xheadbreaktrue
 	\DeclareRobustCommand{\xheadbreak} 
 		{\ifxheadbreak\\\else\fi}