suftesi (23apr12)

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

1 files changed, 203 insertions, 125 deletions

diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index b9d1caaeb80..1a2afe0ef90 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,7 +23,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2012/03/19 v0.8 A class for typesetting theses, books and articles]
+    [2012/04/22 v0.9 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \PassOptionsToClass{a4paper}{article} % we need a4paper
@@ -43,7 +43,7 @@
 \usepackage{metalogo}
 \usepackage[suftesi]{frontespizio}
 \usepackage[style=philosophy-classic]{biblatex}
-\bibliography{suftesi}
+\addbibresource{suftesi.bib}
 
 \usepackage{hyperref}
 \hypersetup{%
@@ -90,7 +90,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1644}
+% \CheckSum{1730}
 %
 % \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
@@ -108,6 +108,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v0.9}{2012/04/22}{Added \opt{dottedtoc} and \opt{raggedtoc} options. Improved compatibility with \sty{mathspec}}
 % \changes{v0.8}{2012/03/19}{Added macro for using \sty{frontespizio} package with \opt{compact} and \opt{supercompact} options. Added option \opt{periodical}. Renewed \cmd{title} command}
 % \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template}
 % \changes{v0.6c}{2011/11/16}{Maintenance release, no changes}
@@ -185,7 +186,7 @@
 % provides. For this reason:
 %
 % \begin{center}
-% \textbf{\textsc{please do not modify the styles of this class\\
+% \textbf{\textsc{do not modify the styles of this class\\
 % if you do not like these styles, use another class.}}
 % \end{center}
 %
@@ -200,8 +201,8 @@
 % 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{geometry},
-% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo},
-% \sty{metalogo}, \sty{microtype}, \sty{mparhack}, \sty{multicol},
+% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, \sty{microtype}, 
+% \sty{mparhack}, \sty{multicol},
 % \sty{textcase}, \sty{titlesec}, \sty{titletoc}.
 %
 % \section{Class features}
@@ -308,6 +309,8 @@
 %\subsection{Page layout}
 %
 % \begin{ltxsyntax}
+% \optitem{dottedtoc} Prints a standard table of contents with dotted lines.
+% \optitem{raggedtoc} Aligns the table of contents on the left as \textcite{Bringhurst:1996} suggests.
 % \optitem{compact} 
 % Prints a typeblock  of $16 \si{cm} \times 24 \si{cm}$ on a A4 paper, 
 % showing the crop marks  (see table \ref{tab:gabbia} for details). 
@@ -477,7 +480,6 @@
 % \StopEventually{\PrintChanges\PrintIndex}
 %
 % \section{The Code}
-% \subsection{Declaration and Execution of Options}
 %<*class>
 %    \begin{macrocode}		
 \newif\ifsuftesi@centertitle
@@ -499,6 +501,8 @@
 \newif\ifsuftesi@sufelements
 \newif\ifsuftesi@nocrop
 \newif\ifsuftesi@nomarginpar
+\newif\ifsuftesi@dottedtoc
+\newif\ifsuftesi@raggedtoc
 \DeclareOption{centertitle}{\suftesi@centertitletrue}
 \DeclareOption{sctitles}{\suftesi@sctitlestrue}
 \DeclareOption{disablefront}{\suftesi@nofronttrue}
@@ -522,18 +526,20 @@
 \DeclareOption{nomarginpar}{\suftesi@nomarginpartrue} 
 \DeclareOption{article}{\suftesi@articletrue}
 \DeclareOption{authortitle}{\suftesi@authortitletrue}
+\DeclareOption{dottedtoc}{\suftesi@dottedtoctrue}
+\DeclareOption{raggedtoc}{\suftesi@raggedtoctrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ExecuteOptions{artemisia} 
 \ProcessOptions
 \relax
 \LoadClass[a4paper]{book}
 %    \end{macrocode}
-% Some basic packages:
+% \subsubsection{Basic packages}
 %    \begin{macrocode}
 \RequirePackage{color}
     \definecolor{sufred}{rgb}{0.5,0,0}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
-\RequirePackage{ifxetex,ifluatex,metalogo}
+\RequirePackage{ifxetex,ifluatex}
 \ifxetex\relax
   \else
     \RequirePackage{microtype}
@@ -544,7 +550,7 @@
 \RequirePackage{mparhack}
 %    \end{macrocode}
 % \subsection{The greek font}
-% Thanks to Enrico Gregorio for the following macros:
+% Thanks to Enrico Gregorio for these macros:
 %    \begin{macrocode}
 \ifxetex
    \relax
@@ -618,7 +624,7 @@
           \RequirePackage[a4,cam,center]{crop}
 \fi
 %    \end{macrocode}
-%\subsubsection{\opt{compact} layout}
+%\subsubsection{\opt{periodical}}
 %    \begin{macrocode}
 \ifsuftesi@periodical
     \geometry{
@@ -635,7 +641,7 @@
     marginparsep=10pt}
 \else
 %    \end{macrocode}
-%\subsubsection{\opt{compact} layout}
+%\subsubsection{\opt{compact}}
 %    \begin{macrocode}
 \ifsuftesi@compact
     \geometry{
@@ -652,7 +658,7 @@
     marginparsep=10pt}
 \else
 %    \end{macrocode}
-%\subsubsection{\opt{supercompact} layout}
+%\subsubsection{\opt{supercompact}}
 %    \begin{macrocode}
 \ifsuftesi@supercompact
     \geometry{
@@ -669,7 +675,7 @@
     marginparsep=9pt}
 \else
 %    \end{macrocode}
-%\subsubsection{\opt{elements} layout}
+%\subsubsection{\opt{elements}}
 %    \begin{macrocode}
 \ifsuftesi@elements
     \geometry{%
@@ -696,7 +702,7 @@
    \geometry{hmarginratio=1:1}
 \fi
 %    \end{macrocode}
-% \subsection{Titles}
+% \subsection{Section titles}
 %    \begin{macrocode}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
@@ -728,53 +734,9 @@
     \chapnumfont{pplj}
 \fi
 %    \end{macrocode}
-% Some basic settings for \opt{article} mode:
-%    \begin{macrocode}
-\ifsuftesi@article
-  \renewcommand\thesection      {\@arabic\c@section}
-  \renewcommand\thesubsection   {\thesection.\@arabic\c@subsection} 
-  \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}
-  \renewcommand\theparagraph    {\thesubsubsection.\@arabic\c@paragraph}
-  \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}
-%    \end{macrocode}
-% \paragraph{Some \sty{biblatex} settings}
-% Automatic title style switching for \opt{article} mode.
-%    \begin{macrocode}
-\AtBeginDocument{%
-\@ifpackageloaded{biblatex}{%
-  \defbibheading{bibliography}[\refname]{%
-    \section*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
-  \defbibheading{shorthands}[\losname]{%
-    \section*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
-  \defbibheading{bibintoc}[\refname]{%
-    \section*{#1}%
-    \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
-  \defbibheading{losintoc}[\losname]{%
-    \section*{#1}%
-    \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
-  \defbibheading{bibnumbered}[\refname]{%
-    \section{#1}%
-    \if@twoside\markright{\MakeUppercase{#1}}\fi}
-  \defbibheading{losnumbered}[\losname]{%
-    \section{#1}%
-    \if@twoside\markright{\MakeUppercase{#1}}\fi}
-  \defbibheading{subbibliography}[\refname]{%
-    \subsection*{#1}}
-  \defbibheading{subbibintoc}[\refname]{%
-    \subsection*{#1}%
-    \addcontentsline{toc}{subsection}{#1}}
-  \defbibheading{subbibnumbered}[\refname]{%
-    \subsection{#1}}}%
-    {\relax}%
-}%
-%    \end{macrocode}
 % \subsubsection{Part}
-% Defining |\part| for \opt{article} mode:
 %    \begin{macrocode}
+\ifsuftesi@article
 \titleclass{\part}{straight}
 \titleformat{\part}[hang]
   {\large}
@@ -783,9 +745,6 @@
   {\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
   \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
 \else
-%    \end{macrocode}
-% Defining |\part| for default style:
-%    \begin{macrocode}
 \titleformat{\part}[display]
   {\LARGE\filcenter}
   {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
@@ -877,6 +836,14 @@
 %    \end{macrocode}
 % \paragraph{\opt{default}}
 %    \begin{macrocode}
+\ifsuftesi@article
+  \renewcommand\thesection      {\@arabic\c@section}
+  \renewcommand\thesubsection   {\thesection.\@arabic\c@subsection} 
+  \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}
+  \renewcommand\theparagraph    {\thesubsubsection.\@arabic\c@paragraph}
+  \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}
+\else
+\fi
 \titleformat{\section}[hang]
 	  {\filright}
 	  {\thesection}
@@ -911,19 +878,125 @@
 	  [.\hspace*{1em}]
 	\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 %    \end{macrocode}
-% \subsubsection{List of contents}
+% \paragraph{\sty{biblatex} settings}
+%    \begin{macrocode}
+\ifsuftesi@article				%ARTICLE
+\AtBeginDocument{%
+\@ifpackageloaded{biblatex}{%
+  \defbibheading{bibliography}[\refname]{%
+    \section*{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{shorthands}[\losname]{%
+    \section*{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{bibintoc}[\refname]{%
+    \section*{#1}%
+    \addcontentsline{toc}{section}{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{losintoc}[\losname]{%
+    \section*{#1}%
+    \addcontentsline{toc}{section}{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{bibnumbered}[\refname]{%
+    \section{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{losnumbered}[\losname]{%
+    \section{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{subbibliography}[\refname]{%
+    \subsection*{#1}}
+  \defbibheading{subbibintoc}[\refname]{%
+    \subsection*{#1}%
+    \addcontentsline{toc}{subsection}{#1}}
+  \defbibheading{subbibnumbered}[\refname]{%
+    \subsection{#1}}}%
+    {\relax}%
+}%
+\else								%BOOK
+\AtBeginDocument{%
+\@ifpackageloaded{biblatex}{%
+  \defbibheading{bibliography}[\bibname]{%
+    \chapter*{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{shorthands}[\losname]{%
+    \chapter*{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{bibintoc}[\bibname]{%
+    \chapter*{#1}%
+    \addcontentsline{toc}{chapter}{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{losintoc}[\losname]{%
+    \chapter*{#1}%
+    \addcontentsline{toc}{chapter}{#1}%
+    \markboth{#1}{#1}}
+  \defbibheading{bibnumbered}[\bibname]{%
+    \chapter{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{losnumbered}[\losname]{%
+    \chapter{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{subbibliography}[\refname]{%
+    \section*{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{subbibintoc}[\refname]{%
+    \section*{#1}%
+    \addcontentsline{toc}{section}{#1}%
+    \if@twoside\markright{#1}\fi}
+  \defbibheading{subbibnumbered}[\refname]{%
+    \section{#1}}}
+    {\relax}%
+}%
+\fi
+%    \end{macrocode}
+% \subsubsection{TOC, LOF, LOT}
 %    \begin{macrocode}
 \RequirePackage{titletoc}
+%    \end{macrocode}
+% Settings for \opt{dottedtoc} and \opt{raggedtoc} options:
+%    \begin{macrocode}
+\ifsuftesi@dottedtoc
+   \newcommand{\suftesi@titlerule}{\titlerule*{\footnotesize .\ }}
+    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
+      \else
+\ifsuftesi@raggedtoc
+    \newcommand{\suftesi@titlerule}{\hspace{1.5em}}
+    \newcommand{\suftesi@chaptitlerule}{\hspace{1.5em}}
+    \else
+    \newcommand{\suftesi@titlerule}{\titlerule*{}}
+    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
+    \fi
+\fi
+%    \end{macrocode}
+% \opt{article} mode:
+%    \begin{macrocode}
 \ifsuftesi@article 
-\renewcommand\tableofcontents{% article mode
+\renewcommand\tableofcontents{%
 	\thispagestyle{empty}
 	    \section*{\contentsname
 	        \@mkboth{\contentsname}{\contentsname}}%
 	    \@starttoc{toc}%
-	      \vspace*{2ex}
+    \vspace{2ex}%
 	    }
+\renewcommand\listoffigures{%
+    \section*{\listfigurename}%
+      \@mkboth{\listfigurename}%
+              {\listfigurename}%
+    \@starttoc{lof}%
+    \vspace{2ex}%
+    }
+\renewcommand\listoftables{%
+    \section*{\listtablename}%
+      \@mkboth{%
+          \listtablename}%
+         {\listtablename}%
+    \@starttoc{lot}%
+    \vspace{2ex}%
+    }
 \else
-\renewcommand\tableofcontents{% book mode
+%    \end{macrocode}
+% \opt{book} mode:
+%    \begin{macrocode}
+\renewcommand\tableofcontents{%
     \if@twocolumn
       \@restonecoltrue\onecolumn
     \else
@@ -947,46 +1020,66 @@
   {\addvspace{2ex}}                                                 
   {\thecontentslabel\hspace*{1em}}                                                    
   {}                                                                       
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\suftesi@chaptitlerule\contentspage}
   [\addvspace{1ex}]
 \titlecontents{section}
   [1.5em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\ifsuftesi@article\suftesi@chaptitlerule%
+       \else\suftesi@titlerule\fi\contentspage}
 \titlecontents{subsection}
   [3em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\suftesi@titlerule\contentspage}
 \titlecontents{subsubsection}
   [4.5em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\suftesi@titlerule\contentspage}
 \titlecontents{figure}
   [1.5em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\suftesi@titlerule\contentspage}
 \titlecontents{table}
   [1.5em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
-  {\titlerule*{\footnotesize .\ }\contentspage}
+  {\suftesi@titlerule\contentspage}
 %    \end{macrocode}
 % \subsubsection{Title page}
-% \begin{macro}{\standardtitle} Reproduces the standard |\maketitle| style:
+% \DescribeMacro{\title}
+% New \cmd{title} command with an optional argument for headings.
+%    \begin{macrocode}
+    \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+    \edef\title{\noexpand\@dblarg
+  \expandafter\noexpand\csname\string\title\endcsname}
+    \def\@headtitle{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given \MessageBreak%
+            See the class documentation for explanation}}
+    \def\@title{--missing title--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\title\space given\MessageBreak%
+            See the class documentation for explanation}}
+    \def\@author{--missing author--%
+        \protect\ClassWarningNoLine{suftesi}{%
+            No \string\author\space given\MessageBreak%
+            See the class documentation for explanation}}
+%    \end{macrocode}
+% \DescribeMacro{\standardtitle} Reproduces the standard |\maketitle| style:
 %    \begin{macrocode}
 \let\standardtitle\maketitle
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\maketitle} for |titlepage| (default) option:
+% \DescribeMacro{\maketitle} 
+% For |titlepage| (default) option:
 %    \begin{macrocode}
 \if@titlepage% titlepage
   \renewcommand\maketitle{\begin{titlepage}%
@@ -1014,19 +1107,11 @@
   \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
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\maketitle} for |notitlepage| option:
-%    \begin{macrocode}
 \renewcommand\maketitle{\par
    \begingroup
      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
@@ -1052,11 +1137,7 @@
    \global\let\maketitle\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}
      \def\@maketitle{%
@@ -1079,7 +1160,6 @@
    \vskip 1.5em}
 \fi
 %    \end{macrocode}
-% \end{macro}
 % \subsubsection{The frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
@@ -1120,10 +1200,16 @@
 %    \end{macrocode}
 % \end{environment}
 % \subsubsection{Appendix}
+% \begin{macro}{\appendicesname}
+% \begin{macro}{\appendixpage}
 %    \begin{macrocode}
 \newcommand{\appendicesname}[1]{\def\suff@appendices{#1}}
     \appendicesname{Appendici}
     \newcommand{\appendixpage}{\@appendixpage}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%    \begin{macrocode}
 \def\@appendixpage{%
   \@mainmattertrue
     \titlecontents{part}                                                  
@@ -1152,6 +1238,9 @@
   {}
   [\addvspace{1ex}]
 }
+%    \end{macrocode}
+% \DescribeMacro{\appendix}
+%    \begin{macrocode}
 \ifsuftesi@sufelements
 \renewcommand\appendix{\par
     \setcounter{chapter}{0}%
@@ -1171,29 +1260,23 @@
     {}                                                       
     {\contentspage\vspace{5pt}}}
     \else
-\renewcommand\appendix{\par
-    \setcounter{chapter}{0}%
-    \setcounter{section}{0}%
-    \gdef\@chapapp{\appendixname}%
-    \gdef\thechapter{\@Alph\c@chapter}}
+      \ifsuftesi@article
+          \renewcommand\appendix{\par
+              \setcounter{section}{0}%
+              \setcounter{subsection}{0}%
+              \gdef\thesection{\@Alph\c@section}}
+   \else
+         \renewcommand\appendix{\par
+             \setcounter{chapter}{0}%
+             \setcounter{section}{0}%
+             \gdef\@chapapp{\appendixname}%
+             \gdef\thechapter{\@Alph\c@chapter}}
+    \fi
 \fi
 %    \end{macrocode}
 % \subsection{Headings}
 %    \begin{macrocode}
 \RequirePackage{fancyhdr}
-    \renewcommand{\title}[2][\@title]{\gdef\@title{#2}\gdef\@headtitle{#1}}
-    \def\@headtitle{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given \MessageBreak%
-            See the class documentation for explanation}}
-    \def\@title{--missing title--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\title\space given\MessageBreak%
-            See the class documentation for explanation}}
-    \def\@author{--missing author--%
-        \protect\ClassWarningNoLine{suftesi}{%
-            No \string\author\space given\MessageBreak%
-            See the class documentation for explanation}}
   \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt} 
   \renewcommand{\footnoterule}{}
@@ -1386,12 +1469,12 @@
     \setitemize[3]{leftmargin=1.3em}
    \fi
 \fi
-%    \end{macrocode}
-% \subsubsection{Block Quotations}
-%    \begin{macrocode}
 \renewcommand\labelitemii{\normalfont \textendash}
 %    \end{macrocode}
+% \subsubsection{Block Quotations}
 % \begin{environment}{quotation}
+% \begin{environment}{quote}
+% New \env{quotation} and \env{quote} environments according to a popular italian style. The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
 %    \begin{macrocode}
 \renewenvironment{quotation}
                {\list{}{\listparindent\parindent%
@@ -1401,10 +1484,6 @@
                         \parsep        \z@ \@plus\p@}%
                \item\relax\footnotesize\noindent\ignorespaces}
                {\endlist}
-%    \end{macrocode}
-% \end{environment}
-% \begin{environment}{quote}
-%    \begin{macrocode}
 \renewenvironment{quote}
                {\list{}{\rightmargin \parindent
                          \leftmargin    \parindent}%
@@ -1412,6 +1491,7 @@
                {\endlist}
 %    \end{macrocode}
 % \end{environment}
+% \end{environment}
 % \begin{environment}{verse}
 %    \begin{macrocode}
 \renewenvironment{verse}
@@ -1437,20 +1517,20 @@
 % \begin{macro}{\marginpar}
 % Renew the |\marginpar| command according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
 %    \begin{macrocode}
-\def\graffito@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio
+\def\sufmpsetup@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio
     \itshape\footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
-\newcommand{\graffito}[1]{\marginnote%
-    [\graffito@setup\raggedleft\hspace{0pt}{#1}]%
-    {\graffito@setup\raggedright\hspace{0pt}{#1}}}
-    \let\marginnote\marginpar
-    \def\marginpar{% thanks to Antonio Macrì
-    \@ifnextchar[\marginnote\graffito}
+\long\def\@xmpar[#1]#2{% 
+    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% 
+    \@savemarbox\@currbox{\sufmpsetup@setup\raggedright\hspace{0pt}#2}% 
+    \@xympar}
+\long\def\@ympar#1{% 
+    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% 
+    \global\setbox\@currbox\copy\@marbox \@xympar}
 \ifsuftesi@nomarginpar
-  \let\graffito\@gobble
     \renewcommand\marginpar[2][]{}
      \else
   \fi
@@ -1485,7 +1565,7 @@
 \newcommand\abstractname{Abstract}
 %    \end{macrocode}
 % \subsubsection{Colophon} 
-% Some useful commands to print a colophon or a coyright notice:
+% Some useful commands to print a colophon or a coyright notice.
 %    \begin{macrocode}
 \edef\sufengine{% 
   \ifxetex 
@@ -1676,8 +1756,6 @@
 
 @article{Valbusa:2010,
   Author = {Ivan Valbusa},
-  Date-Added = {2010-08-24 11:46:14 +0200},
-  Date-Modified = {2011-07-02 15:52:06 +0200},
   Journal = {ArsTeXnica},
   Month = {10},
   Number = {9},