suftesi (23mar12)

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

1 files changed, 740 insertions, 712 deletions

diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 867b43cc3dd..b9d1caaeb80 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/02/05 v0.7 A class for typesetting theses, books and articles]
+    [2012/03/19 v0.8 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \PassOptionsToClass{a4paper}{article} % we need a4paper
@@ -47,12 +47,12 @@
 
 \usepackage{hyperref}
 \hypersetup{%
-	  pdftitle={User's Guide to \sty{suftesi}},
-	  pdfsubject={A document class for typesetting theses, books and articles},
-	  pdfauthor={Ivan Valbusa},
-	  pdfkeywords={thesis, humanities, books},
-	  citecolor=spot} 
-	  
+    pdftitle={User's Guide to \sty{suftesi}},
+    pdfsubject={A document class for typesetting theses, books and articles},
+    pdfauthor={Ivan Valbusa},
+    pdfkeywords={thesis, humanities, books},
+    citecolor=spot} 
+    
 \newcommand{\ttchar}[1]{{\normalfont\ttfamily\char`#1}}
 \newcommand{\frontoption}[1]{\subsection*{\texttt{#1}}}
 \newcommand{\includeex}[1]{\par\vfill\begin{center}
@@ -90,7 +90,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1571}
+% \CheckSum{1644}
 %
 % \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,13 +108,18 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \changes{v1.0}{2008/03/04}{First public release}
-% \changes{v1.2}{2010/06/25}{Added `noinputenc' and `nouppercase'
-%   options; added `Preambolo*' environment; various implementation changes}
-% \changes{v1.3}{2011/03/08}{Added support for memoir}
-% \changes{v1.3a}{2011/03/08}{Added info message in the \file{frn} file}
-% \changes{v1.4}{2011/07/18}{Added option `suftesi'; updated the documentation}
-% \changes{v1.4a}{2011/09/21}{Maintenance release, no changes}
+% \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}
+% \changes{v0.6b}{2011/11/07}{Improved full compatibility with \XeLaTeX. 
+% \sty{varioref} and \sty{footmisc} packages are no longer loaded}
+% \changes{v0.6a}{2011/10/24}{Maintenance release, no changes}
+% \changes{v0.6}{2011/10/21}{Added commands \cmd{bookcolophon}, \cmd{artcolophon}. Added option \opt{authortitle}. Renamed options \opt{plain} and \opt{fullplain} to \opt{centerheadings} and \opt{sufplain}. New english documentation.}
+% \changes{v0.5}{2011/10/21}{First public release. The frontispiece of \sty{suftesi}{} is now
+% included in the package \sty{frontespizio}. New command \cmd{chapnumfont}. 
+% Added options \opt{article}, \opt{fullplain}, \opt{elements}, \opt{sufelements}, 
+% \opt{supercompact}, \opt{compact}, \opt{nocrop}, \opt{nomarginpar}. 
+% Changed option \opt{sctitles}.}
 % \GetFileInfo{suftesi.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ }
@@ -216,19 +221,19 @@
 % \small\centering
 % \caption[The layout]{The layouts of \sty{suftesi}}
 % \label{tab:gabbia}
-% \begin{tabular}{lccccc}
+% \begin{tabular}{p{2cm}cccccc}
 % \toprule
-% & \multicolumn{5}{c}{Option (pt)}\\\cmidrule{2-6}
-% & (default) & \opt{11pt} & \opt{compact} & \opt{supercompact} & \opt{elements}  \\\midrule
-% Text width                & $312$ & $324$ & $312$ & $284$ & $251$\\
-% Text height        	& $624$ & $648$ & $470$ &  $430$ & $502$\\
-% Marginal notes width 	& $82$	&	$82$	 & $65$ & $50$ & $60$\\[1ex]
-% &\multicolumn{5}{c}{Proportions}\\\cmidrule{2-6}
-% \multirow{2}*{Margins\quad{\parbox{2cm}{top/bottom\\inner/outer}}}
-%         & $1/2$ & $1/2$ & $2/3$ & $2/3$& $2/5$ \\
-% &$1/2$&$1/2$ & $2/3$ & $2/3$  & $1/2$\\%\midrule
-% Text block  &   $1/2$& $1/2$ & $2/3$ & $2/3$ & $1/2$\\
-% Page & $1/\sqrt{2}$& $1/\sqrt{2}$ & $2/3$ & $2/3$ & $1/\sqrt{3}$\\
+% & \multicolumn{5}{c}{Option (pt)}\\\cmidrule{2-7}
+% & (default) 				& \opt{11pt} & \opt{compact} & \opt{supercompact} & \opt{elements} & \opt{periodical}  \\\cmidrule(lr){1-1}\cmidrule(lr){2-7}
+% Text width                & $312$ & $324$ & $312$ & $284$ & $251$ & $312$\\
+% Text height          		& $624$ & $648$ & $470$ &  $430$ & $502$& $470$\\
+% Marginal notes width & $82$  &	$82$	 & $65$ & $50$ & $60$& $70$\\[4ex]
+% Margins &\multicolumn{6}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-7}
+% \multirow{2}*{{\parbox{2cm}{top/bottom\\inner/outer}}}
+%         & $1/2$ & $1/2$ & $2/3$ & $2/3$& $2/5$& $2/3$ \\
+% &$1/2$&$1/2$ & $2/3$ & $2/3$  & $1/2$& $2/3$\\\cmidrule(lr){1-1}
+% Text block  &   $1/2$& $1/2$ & $2/3$ & $2/3$ & $1/2$& $2/3$\\
+% Page & $1/\sqrt{2}$& $1/\sqrt{2}$ & $2/3$ & $2/3$ & $1/\sqrt{3}$& $1/\sqrt{2}$\\
 % \bottomrule
 % \end{tabular}
 % \end{table}
@@ -241,6 +246,8 @@
 % The sans serif font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.}. 
 % This choice is inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}.
 %
+% \subsubsection{Using different fonts}
+%
 % If you prefer to use other fonts (such as those provided by \sty{fourier}, 
 % \sty{lmodern} or \sty{libertine} packages), remember to load the class option \opt{defaultfont}, 
 % which turns off the \sty{suftesi}{} font settings. Moreover pay particular attention 
@@ -293,12 +300,6 @@
 % \begin{ttquote}
 % \cmd{usepackage}[suftesi]\ar{frontespizio}
 % \end{ttquote}
-% For use this frontispiece with the  \opt{compact}, \opt{supercompact} and \opt{elements} 
-% options you will need to manually change the default margins with the command:
-% \begin{ttquote}
-% \cmd{Margini}\ar{\meta{left}}\ar{\meta{bottom}}\ar{\meta{right}}\ar{\meta{top}}
-%\end{ttquote}
-%
 %
 %\section{Options}\label{sec:options}
 %
@@ -308,11 +309,13 @@
 %
 % \begin{ltxsyntax}
 % \optitem{compact} 
-% Prints a typeblock  of $14 \si{cm} \times 21 \si{cm}$ on a A4 paper, 
+% 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). 
 % The \cmd{crop[off]} command turns off the crop marks. 
 % \optitem{supercompact} The same as \opt{compact} but with a  typeblock 
-% of  $16 \si{cm} \times 24   \si{cm}$  (see table \ref{tab:gabbia} for details).
+% of  $14 \si{cm} \times 21   \si{cm}$  (see table \ref{tab:gabbia} for details).
+% \optitem{periodical} 
+% The same as \opt{compact} but with a typeblock  of $17 \si{cm} \times 24 \si{cm}$ (see table \ref{tab:gabbia} for details). This style is expecially thought for theses.
 % \optitem{elements} 
 % Reproduces the layout of \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} 
 % (see table \ref{tab:gabbia} for details).
@@ -320,7 +323,7 @@
 % Prints a \textsc{pdf} with page dimensions according to the \opt{compact}, 
 % \opt{supercompact} and \opt{elements} options.
 % \optitem{nomarginpar} Disables the \cmd{marginpar} command. 
-% This option is useful for the two ``compact'' layouts.
+% This option is useful for the three ``compact'' layouts.
 % \optitem{11pt} 
 % Sets the font size at  $11\si{pt}$ and resizes the text block dimensions. 
 % \end{ltxsyntax}
@@ -375,32 +378,41 @@
 %
 % \begin{ltxsyntax}
 %
+% \cmditem{title}[short title for headings]{complete title for titlepage}
+% 
+% This command is for use with option \opt{authortitle} if the title is too long
+% or has some breaks. 
+% 
+% 
 % \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. 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:
+% 
+% If you don't like the copyright notice leave the second argument of 
+% the command empty:
 % \begin{ttquote}
 % \cmd{colophon\oarm{OS}\{\}\arm{additional info}}
 % \end{ttquote}
 %
-% With the \opt{article} option, you can use the \cmd{artcolophon} command (see below) 
+% With the \opt{article} option, you can use the \cmd{artcolophon} command 
+% (see below) 
 % or  the \cmd{thanks} command:
 % \begin{ttquote}
 % \cmd{author}\{\meta{Name Surname}\cmd{thanks}\{This work has been typeset with \LaTeX{},\\
 % using the  \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\}
 % \end{ttquote}
 %
-% \cmditem{bookcolophon}{copyright notice}{attribution notice and other informations}
+% \cmditem{bookcolophon}{copyright notice}{attribution notice and 
+% other informations}
 %
 % 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:
+% The second argument prints its content at the bottom. For example:
 %
 % \begin{verbatim}
-% \colophon{Copyright © 2007 by Ivan Valbusa}{This work has been 
+% \bookcolophon{Copyright © 2007 by Ivan Valbusa}{This work has been 
 % typeset with \LaTeX,  using the \sty{suftesi} class by Ivan 
 % Valbusa\index{Valbusa, Ivan}. The normal font  is Palatino by Hermann 
 % Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.}
@@ -408,7 +420,8 @@
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
 %
-% This command has only one argument. It simply prints its content at the bottom of the page. Here is an example:
+% This command has only one argument. It simply prints its content at the 
+% bottom of the page. Here is an example:
 %
 % \begin{verbatim}
 % \artcolophon{This work is licensed under the Creative Commons 
@@ -425,7 +438,9 @@
 %
 % \cmditem{finalcolophon}{colophon content}
 %
-% The same as \cmd{artcolophon}, but centering its content at the top of the page. It is aimed to typeset a classical \emph{colophon} at the end of the work.
+% The same as \cmd{artcolophon}, but centering its content at the 
+% top of the page. It is aimed to typeset a classical \emph{colophon} 
+% at the end of the work.
 %
 % \cmditem{chapterintro}
 %
@@ -454,6 +469,11 @@
 % The default is ``\texttt{pplj}'' (\LaTeX) or ``Palatino''  (\XeLaTeX). 
 % \end{ltxsyntax}
 %
+% \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=note]
+%
 % \StopEventually{\PrintChanges\PrintIndex}
 %
 % \section{The Code}
@@ -472,6 +492,7 @@
 \newif\ifsuftesi@article
 \newif\ifsuftesi@authortitle
 \newif\ifsuftesi@nofront
+\newif\ifsuftesi@periodical
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
 \newif\ifsuftesi@elements
@@ -491,6 +512,7 @@
 \DeclareOption{centerheadings}{\suftesi@centerheadingstrue} 
 \DeclareOption{sufplain}{\suftesi@sufplaintrue} 
 \DeclareOption{bozza}{\suftesi@bozzatrue} 
+\DeclareOption{periodical}{\suftesi@periodicaltrue\suftesi@compacttrue} 
 \DeclareOption{compact}{\suftesi@compacttrue} 
 \DeclareOption{supercompact}{\suftesi@supercompacttrue} 
 \DeclareOption{elements}{\suftesi@elementstrue\suftesi@sufelementstrue
@@ -504,18 +526,17 @@
 \ExecuteOptions{artemisia} 
 \ProcessOptions
 \relax
+\LoadClass[a4paper]{book}
 %    \end{macrocode}
-% 	\subsection{Package Loading}
+% Some basic packages:
 %    \begin{macrocode}
-\LoadClass[a4paper]{book}
 \RequirePackage{color}
-	\definecolor{sufred}{rgb}{0.5,0,0}
-	\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+    \definecolor{sufred}{rgb}{0.5,0,0}
+    \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{ifxetex,ifluatex,metalogo}
 \ifxetex\relax
   \else
-    \RequirePackage[letterspace=110]{microtype}
-      \microtypesetup{expansion=false}%
+    \RequirePackage{microtype}
     \fi
 \RequirePackage{textcase}
 \RequirePackage{multicol}
@@ -569,7 +590,7 @@
     \def\encodingdefault{LGR}}}
 \fi
 %    \end{macrocode}
-% \subsection{The layout}
+% \subsection{Page layout}
 %    \begin{macrocode}
 \RequirePackage{geometry}
   \parindent1em
@@ -597,7 +618,24 @@
           \RequirePackage[a4,cam,center]{crop}
 \fi
 %    \end{macrocode}
-%\subsubsection{The \opt{compact} layout}
+%\subsubsection{\opt{compact} layout}
+%    \begin{macrocode}
+\ifsuftesi@periodical
+    \geometry{
+    textheight=16.5cm,
+    textwidth=11cm,
+    paperwidth=17cm,
+    paperheight=24cm,
+    hmarginratio=2:3,
+    vmarginratio=2:3,
+    includefoot,
+    includehead,
+    heightrounded,
+    marginparwidth=70pt,
+    marginparsep=10pt}
+\else
+%    \end{macrocode}
+%\subsubsection{\opt{compact} layout}
 %    \begin{macrocode}
 \ifsuftesi@compact
     \geometry{
@@ -612,9 +650,9 @@
     heightrounded,
     marginparwidth=65pt,
     marginparsep=10pt}
-   \else
+\else
 %    \end{macrocode}
-%\subsubsection{The \opt{supercompact} layout}
+%\subsubsection{\opt{supercompact} layout}
 %    \begin{macrocode}
 \ifsuftesi@supercompact
     \geometry{
@@ -629,25 +667,26 @@
     heightrounded,
     marginparwidth=50pt,
     marginparsep=9pt}
-   \else
+\else
 %    \end{macrocode}
-%\subsubsection{The \opt{elements} layout}
+%\subsubsection{\opt{elements} layout}
 %    \begin{macrocode}
 \ifsuftesi@elements
-\geometry{%
-	textwidth=251pt,
-	textheight=502pt,
-	marginparwidth=60pt,
-	marginparsep=18pt,
-	paperwidth=378pt,
-	paperheight=654pt,
+    \geometry{%
+    textwidth=251pt,
+    textheight=502pt,
+    marginparwidth=60pt,
+    marginparsep=18pt,
+    paperwidth=378pt,
+    paperheight=654pt,
     heightrounded,
-	outer=91.2pt,
-	top=64pt}
-\else
-	   \fi
-    \fi 
- \fi
+    outer=91.2pt,
+    top=64pt}
+   \else
+  \fi
+ \fi 
+\fi
+\fi
 %    \end{macrocode}
 % And now a macro to produce oneside documents:
 %    \begin{macrocode}
@@ -657,92 +696,101 @@
    \geometry{hmarginratio=1:1}
 \fi
 %    \end{macrocode}
-% \subsubsection{Titles}
+% \subsection{Titles}
 %    \begin{macrocode}
 \RequirePackage{titlesec}
-\newlength{\sectionsep}
-\setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
+    \newlength{\sectionsep}
+    \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \ifsuftesi@supercompact
-	\DeclareRobustCommand{\sufchaptersize}{\large}
-		\else
-			\ifsuftesi@compact
-			   \DeclareRobustCommand{\sufchaptersize}{\Large}
-		\else
-	\DeclareRobustCommand{\sufchaptersize}{\Large}
-	\fi
+  \DeclareRobustCommand{\sufchaptersize}{\large}
+    \else
+      \ifsuftesi@compact
+       \DeclareRobustCommand{\sufchaptersize}{\Large}
+         \else
+           \DeclareRobustCommand{\sufchaptersize}{\Large}
+     \fi
 \fi
 \ifxetex
-	\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
-	     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
-	\DeclareRobustCommand{\sectitle}[1]{%
-		\addfontfeature{LetterSpace=6}\scshape\MakeTextUppercase{#1}}%
-	\newcommand{\chapnumfont}[1]{%
-		  \def\@chapnumfont{\fontspec{#1}}}
-	\chapnumfont{Palatino}
+  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+    \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
+  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+    \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
+    \newcommand{\chapnumfont}[1]{%
+      \def\@chapnumfont{\fontspec{#1}}}
+      \chapnumfont{Palatino}
 \else
-	\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
-	         \scshape\lsstyle\MakeTextLowercase{#1}}%
-	\DeclareRobustCommand{\sectitle}[1]{%
-			\textls[110]{\MakeTextUppercase{#1}}}%
-	\newcommand{\chapnumfont}[1]{%
-	       \def\@chapnumfont{\fontfamily{#1}}}
-	\chapnumfont{pplj}
+  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+    \scshape\MakeTextLowercase{\textls[110]{#1}}}%
+  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+    \scshape\MakeTextLowercase{\textls[110]{#1}}}%
+  \newcommand{\chapnumfont}[1]{%
+    \def\@chapnumfont{\fontfamily{#1}}}
+    \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}
+  \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| command for \opt{article} mode:
+% Defining |\part| for \opt{article} mode:
 %    \begin{macrocode}
-\renewcommand\part{%
-   \if@noskipsec \leavevmode \fi
-   \par
-   \addvspace{4ex}%
-   \@afterindentfalse
-   \secdef\@part\@spart}
-\def\@part[#1]#2{%
-    \ifnum \c@secnumdepth >\m@ne
-      \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
-    \else
-      \addcontentsline{toc}{part}{#1}%
-    \fi
-    {\parindent \z@ \raggedright
-     \interlinepenalty \@M
-     \normalfont
-     \ifnum \c@secnumdepth >\m@ne
-       \normalsize \partname\nobreakspace\thepart
-       \par\nobreak
-     \fi
-     \large  #2%
-     \markboth{}{}\par}%
-    \nobreak
-    \vskip 3ex
-    \@afterheading}
-\def\@spart#1{%
-    {\parindent \z@ \raggedright
-     \interlinepenalty \@M
-     \normalfont
-     \huge \bfseries #1\par}%
-     \nobreak
-     \vskip 3ex
-     \@afterheading}
+\titleclass{\part}{straight}
+\titleformat{\part}[hang]
+  {\large}
+  {\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
+  {.5em}
+  {\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+  \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
 \else
 %    \end{macrocode}
-% Defining |\part| command for default style:
+% Defining |\part| for default style:
 %    \begin{macrocode}
 \titleformat{\part}[display]
-	  {\LARGE\filcenter}
-	  {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\Roman{part}}
-	  {3ex}
-	  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
+  {\LARGE\filcenter}
+  {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
+  {3ex}
+  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
 \fi
 %    \end{macrocode}
 % \subsubsection{Chapter}
@@ -750,40 +798,40 @@
 %    \begin{macrocode}
 \ifsuftesi@sufelements
    \titleformat{\chapter}[block]
-  {}%
-  {\begin{picture}(0,0)
-\setlength{\unitlength}{1pt}
-  \@chapnumfont%
-   \ifsuftesi@elements
-	 \fontsize{64}{64}\selectfont%
-    	  \put(0,-73){%
-    		\hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}%
-          \else
-            \fontsize{95}{95}\selectfont%
-              \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)%
-              \textcolor{sufgray}{\thechapter}}%
-              \fi
-    \end{picture}}%
+     {}%
+     {\begin{picture}(0,0)
+     \setlength{\unitlength}{1pt}
+     \@chapnumfont%
+     \ifsuftesi@elements
+       \fontsize{64}{64}\selectfont%
+       \put(0,-73){%
+       \hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}%
+     \else
+       \fontsize{95}{95}\selectfont%
+       \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)%
+       \textcolor{sufgray}{\thechapter}}%
+     \fi
+   \end{picture}}%
   {0pt}
-  {\sectitle}
+  {\suftesi@titlesmallcaps}
   [\rule{\textwidth}{.1pt}]
 \else
 %    \end{macrocode}
 % \paragraph{The default styles}
 %    \begin{macrocode}
 \ifsuftesi@centertitle
-	\titleformat{\chapter}[display]
-		  {\filcenter}
-		  {\sufchaptersize\thechapter}
-		  {3ex}
-		  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
-    \else
-	\titleformat{\chapter}[hang]
-		  {\filright}
-		  {\sufchaptersize\thechapter.}
-		  {3ex}
-		  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\fi}
-   \fi
+  \titleformat{\chapter}[display]
+    {\filcenter}
+    {\sufchaptersize\thechapter}
+    {3ex}
+    {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+\else
+  \titleformat{\chapter}[hang]
+    {\filright}
+    {\sufchaptersize\thechapter.}
+    {3ex}
+    {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+  \fi
 \fi
 \ifsuftesi@compact
   \titlespacing*{\chapter}{0em}{0ex}{18ex}
@@ -795,12 +843,12 @@
              \titlespacing*{\chapter}{0em}{-45pt}{10pt}[0em]
                \else
                  \ifsuftesi@sufelements
-                    \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em]
-                \else
-              \titlespacing*{\chapter}{0em}{6ex}{18ex}
-           \fi
-        \fi
-    \fi
+                \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em]
+              \else
+            \titlespacing*{\chapter}{0em}{6ex}{18ex}
+         \fi
+      \fi
+   \fi
 \fi
 %    \end{macrocode}
 % \subsubsection{Section, subsection, subsubsection, \dots}
@@ -811,7 +859,7 @@
 	  {\raggedright}
 	  {\textnormal\thesection}
 	  {1em}
-	  {\small\suftesi@smallcaps}
+	  {\small\suftesi@titlesmallcaps}
 	\titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em] 
 \titleformat{\subsection}[block]
 	  {\filright\normalsize\itshape}
@@ -833,7 +881,7 @@
 	  {\filright}
 	  {\thesection}
 	  {.5em}
-	  {\unskip\ifsuftesi@sctitles\expandafter\suftesi@smallcaps\else\itshape\fi}
+	  {\unskip\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\itshape\fi}
 	\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]	  
 \titleformat{\subsection}[hang]
 	  {}
@@ -849,10 +897,10 @@
 	\titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex]  
 \fi
 \titleformat{\paragraph}[runin]
-	  {\itshape}
 	  {}
 	  {}
 	  {}
+	  {\itshape}
 	  [.\hspace*{1em}]
 	\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \titleformat{\subparagraph}[runin]
@@ -888,191 +936,58 @@
     }
  \fi
 \titlecontents{part}                                                  
-	[0em]                                                                    
-	{\addvspace{3ex}\partname~}                                                 
-	{\thecontentslabel\hspace*{1em}}                                                    
-	{}                                                                      
-	{}
-	[\addvspace{1ex}]
-\titlecontents{chapter}                                                  
-	[0em]                                                                    
-	{\addvspace{2ex}}                                                 
-	{\thecontentslabel\hspace*{1em}}                                                    
-	{}                                                                       
-	{\titlerule*{}\contentspage}
-	[\addvspace{1ex}]
-  \titlecontents{section}
-	[1.5em]
-	{} 
-	{\thecontentslabel\hspace*{1em}}
-	{} 
-	{\titlerule*{}\contentspage}
+  [0em]                                                                    
+  {\addvspace{3ex}\partname~}                                                 
+  {\thecontentslabel\hspace*{1em}}                                                    
+  {}                                                                      
+  {}
+  [\addvspace{1ex}]
+\titlecontents{chapter}
+  [0em]                                                                    
+  {\addvspace{2ex}}                                                 
+  {\thecontentslabel\hspace*{1em}}                                                    
+  {}                                                                       
+  {\titlerule*{\footnotesize .\ }\contentspage}
+  [\addvspace{1ex}]
+\titlecontents{section}
+  [1.5em]
+  {} 
+  {\thecontentslabel\hspace*{1em}}
+  {} 
+  {\titlerule*{\footnotesize .\ }\contentspage}
 \titlecontents{subsection}
-	[3em]
-	{} 
-	{\thecontentslabel\hspace*{1em}}
-	{} 
-	{\titlerule*{}\contentspage}
+  [3em]
+  {} 
+  {\thecontentslabel\hspace*{1em}}
+  {} 
+  {\titlerule*{\footnotesize .\ }\contentspage}
 \titlecontents{subsubsection}
-	[4.5em]
-	{} 
-	{\thecontentslabel\hspace*{1em}}
-	{} 
-	{\titlerule*{}\contentspage}	
+  [4.5em]
+  {} 
+  {\thecontentslabel\hspace*{1em}}
+  {} 
+  {\titlerule*{\footnotesize .\ }\contentspage}
 \titlecontents{figure}
-	[1.5em]
-	{} 
-	{\thecontentslabel\hspace*{1em}}
-	{} 
-	{\titlerule*{}\contentspage}
+  [1.5em]
+  {} 
+  {\thecontentslabel\hspace*{1em}}
+  {} 
+  {\titlerule*{\footnotesize .\ }\contentspage}
 \titlecontents{table}
-	[1.5em]
-	{} 
-	{\thecontentslabel\hspace*{1em}}
-	{} 
-	{\titlerule*{}\contentspage}
-%    \end{macrocode}
-% \subsubsection{Headings}
-%    \begin{macrocode}
-\RequirePackage{fancyhdr}
-\pagestyle{fancy}
-\renewcommand{\headrulewidth}{0pt} 
-\renewcommand{\footnoterule}{}
-%    \end{macrocode}
-% \paragraph{The \opt{elements} headings}
-%    \begin{macrocode}
-\ifsuftesi@elements	% 
-	\renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
-	\renewcommand{\sectionmark}[1]{\markright{#1}}
-\fancypagestyle{elements}{%
-	\fancyhf{}
-	\fancyfoot[LE,RO]{\thepage} 
-	\fancyhead[RO]{%
-		\begin{picture}(0,0)
-		   \setlength{\unitlength}{1pt}
-		      \put(0,-104){%
-		\hskip\marginparsep
-		\parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
-		\end{picture}} 
-	\fancyhead[LE]{%
-		\begin{picture}(0,0)
-		   \setlength{\unitlength}{1pt}
-		      \put(0,-104){%
-		\hskip-\marginparwidth
-		\hskip-\marginparsep
-		      \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
-		\end{picture}}	
-		}		
-\else
-%    \end{macrocode}
-% \paragraph{The \opt{default} headings}
-%    \begin{macrocode}
-	\renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
-	\renewcommand{\sectionmark}[1]{}
-\fi
-%    \end{macrocode}
-% \subparagraph{The \opt{plain} style}
-%    \begin{macrocode}
-\fancypagestyle{plain}{%
-	\fancyhf{}
-	\fancyfoot[C]{}
-	\renewcommand{\headrulewidth}{0pt}
-	\renewcommand{\footrulewidth}{0pt}}	
-%    \end{macrocode}
-% \subparagraph{The \opt{sufplain} style}
-%    \begin{macrocode}
-\fancypagestyle{sufplain}{%
-	\fancyhf{}%
-	\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
-	\fancyfoot[C]{\footnotesize\sufthepage}}
-%    \end{macrocode}
-% \subparagraph{The \opt{centerheadings} style}
-%    \begin{macrocode}
-\fancypagestyle{centerheadings}{%
-		\fancyhf{}%
-		\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}%
-		}
-%    \end{macrocode}
-% \subparagraph{The \opt{sufdefault} style}
-%    \begin{macrocode}
-\fancypagestyle{sufdefault}{%
-		\fancyhf{}%
-		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
-		\fancyhead[LE,RO]{\footnotesize\sufthepage} 
-		\fancyhead[LO]{\footnotesize\xheadbreakfalse\suf@rightmark}
-		\fancyhead[RE]{\footnotesize\xheadbreakfalse%
-			\ifsuftesi@article
-			  \ifsuftesi@authortitle
-			    \suf@leftmark
-			      \else
-			        \suf@rightmark
-			       \fi
-			  \else
-			    \suf@leftmark
-			  \fi}
-		}
-%    \end{macrocode}
-% \subparagraph{The \opt{article} and \opt{sctitles} styles}
-%    \begin{macrocode}
-\ifsuftesi@article	
-    	  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
-  \else\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} 
-%    \end{macrocode}
-% Setting the default page style:
-%    \begin{macrocode}
-\pagestyle{sufdefault}
-\ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
-\ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
-\ifsuftesi@elements\pagestyle{elements}\else\fi
+  [1.5em]
+  {} 
+  {\thecontentslabel\hspace*{1em}}
+  {} 
+  {\titlerule*{\footnotesize .\ }\contentspage}
 %    \end{macrocode}
 % \subsubsection{Title page}
+% \begin{macro}{\standardtitle} Reproduces the standard |\maketitle| style:
 %    \begin{macrocode}
 \let\standardtitle\maketitle
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\maketitle} for |titlepage| (default) option:
+%    \begin{macrocode}
 \if@titlepage% titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -1083,7 +998,7 @@
   \vskip 60\p@
   \begin{center}%
     {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-    \suftesi@smallcaps{\@title}\else\@title\fi \par}%
+    \suftesi@titlesmallcaps{\@title}\else\@title\fi \par}%
     \vskip 3em%
     {\small\lineskip .75em%
       \begin{tabular}[t]{c}%
@@ -1107,142 +1022,321 @@
   \global\let\date\relax
   \global\let\and\relax
 }
-\else% notitlepage
+\else
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\maketitle} for |notitlepage| option:
+%    \begin{macrocode}
 \renewcommand\maketitle{\par
-	  \begingroup
-	    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-	    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-	    \long\def\@makefntext##1{\parindent 1em\noindent
-	            \hb@xt@1.8em{%
-	                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-	    \if@twocolumn
-	      \ifnum \col@number=\@ne
-	        \@maketitle
-	      \else
-	        \twocolumn[\@maketitle]%
-	      \fi
-	    \else
-	      \newpage
-	      \global\@topnum\z@   % Prevents figures from going at top of page.
-	      \@maketitle
-	    \fi
-	    \thispagestyle{plain}\@thanks
-	  \endgroup
-	  \setcounter{footnote}{0}%
-	  \global\let\thanks\relax
-	  \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}
+   \begingroup
+     \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+     \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+     \long\def\@makefntext##1{\parindent 1em\noindent
+             \hb@xt@1.8em{%
+                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+     \if@twocolumn
+       \ifnum \col@number=\@ne
+         \@maketitle
+       \else
+         \twocolumn[\@maketitle]%
+       \fi
+     \else
+       \newpage
+       \global\@topnum\z@   % Prevents figures from going at top of page.
+       \@maketitle
+     \fi
+     \thispagestyle{plain}\@thanks
+   \endgroup
+   \setcounter{footnote}{0}%
+   \global\let\thanks\relax
+   \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{%
-	  \newpage
-	  \null
-	  \vskip 2em%
-	  \begin{center}%
-	  \let \footnote \thanks
-	    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-	    \suftesi@smallcaps{\@title}\else\@title\fi\par}%
-	    \vskip 1.5em%
-	    {\small\lineskip .5em%
-	      \begin{tabular}[t]{c}%
+   \newpage
+   \null
+   \vskip 2em%
+   \begin{center}%
+   \let \footnote \thanks
+     {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
+     \suftesi@titlesmallcaps{\@title}\else\@title\fi\par}%
+     \vskip 1.5em%
+     {\small\lineskip .5em%
+       \begin{tabular}[t]{c}%
         \@author\par
-	      \end{tabular}\par}%
-	    \vskip 1em%
-	    {\small\@date\par}%
-	  \end{center}%
-	  \par
-	  \vskip 1.5em}
+       \end{tabular}\par}%
+     \vskip 1em%
+     {\small\@date\par}%
+   \end{center}%
+   \par
+   \vskip 1.5em}
 \fi
 %    \end{macrocode}
-% \subsubsection{Index}
+% \end{macro}
+% \subsubsection{The frontispiece}
+%    \begin{macrocode}
+\AtBeginDocument{%
+\@ifpackageloaded{frontespizio}{%
+      \ifsuftesi@periodical
+          \Margini{1cm}{7cm}{5cm}{1cm}%
+          \Rientro{1cm}%
+        \else
+      \ifsuftesi@compact
+          \Margini{1cm}{7cm}{6cm}{1cm}%
+          \Rientro{1cm}%
+        \else
+          \ifsuftesi@supercompact
+          \Margini{1cm}{10cm}{8cm}{1cm}%
+          \Rientro{1cm}%
+        \else
+     \fi
+  \fi
+\fi
+  }%
+{\relax}}
+%    \end{macrocode}
+% \begin{environment}{theindex}
 %    \begin{macrocode}
 \renewenvironment{theindex}
-	{\setlength\columnseprule{0pt}
-	      \setlength\columnsep{35pt}%
-	        \cleardoublepage
-		  \@makeschapterhead{\indexname}%
-	\begin{multicols}{2}
-	     \markboth{\indexname}{\indexname}%
-	        \raggedright\small
-	         \setlength\parindent{0pt}%
-	         \setlength\parskip{0pt plus 0.3pt}%
-	      \thispagestyle{plain}\let\item\@idxitem}
-	{\end{multicols}}
+    {\setlength\columnseprule{0pt}
+    \setlength\columnsep{35pt}%
+    \cleardoublepage
+    \@makeschapterhead{\indexname}%
+      \begin{multicols}{2}
+        \markboth{\indexname}{\indexname}%
+        \raggedright\small
+        \setlength\parindent{0pt}%
+        \setlength\parskip{0pt plus 0.3pt}%
+        \thispagestyle{plain}\let\item\@idxitem}
+   {\end{multicols}}
 \renewcommand\@idxitem{\par\hangindent 15\p@}
 %    \end{macrocode}
-% \subsubsection{Appendices}
+% \end{environment}
+% \subsubsection{Appendix}
 %    \begin{macrocode}
 \newcommand{\appendicesname}[1]{\def\suff@appendices{#1}}
-\appendicesname{Appendici}
-\newcommand{\appendixpage}{\@appendixpage}
+    \appendicesname{Appendici}
+    \newcommand{\appendixpage}{\@appendixpage}
 \def\@appendixpage{%
-\@mainmattertrue
-\titlecontents{part}                                                  
-	[0em]                                                                    
-	{\addvspace{3ex}}                                                 
-	{}                                                    
-	{}                                                                      
-	{}
-	[\addvspace{1ex}]
+  \@mainmattertrue
+    \titlecontents{part}                                                  
+      [0em]                                                                    
+      {\addvspace{3ex}}
+      {}
+      {}
+      {}
+      [\addvspace{1ex}]
 \let\contentspage\relax
     \cleardoublepage
        \thispagestyle{empty}
          \addcontentsline{toc}{part}{\suff@appendices}
-	  \begingroup
-	    \centering
-	       \null\vfil
-		  {\LARGE\suff@appendices\par}
-	       \vfil
-	\endgroup
+     \begingroup
+       \centering
+          \null\vfil
+        {\LARGE\suff@appendices\par}
+          \vfil
+   \endgroup
     \cleardoublepage
 \titlecontents{part}                                                  
-	[0em]                                                                    
-	{\addvspace{3ex}\partname~}                                                 
-	{\thecontentslabel\hspace*{1em}}                                                    
-	{}                                                                      
-	{}
-	[\addvspace{1ex}]
+   [0em]                                                                    
+  {\addvspace{3ex}\partname~}                                                 
+  {\thecontentslabel\hspace*{1em}}                                                    
+  {}                                                                      
+  {}
+  [\addvspace{1ex}]
 }
 \ifsuftesi@sufelements
 \renewcommand\appendix{\par
-	  \setcounter{chapter}{0}%
-	  \setcounter{section}{0}%
-	  \gdef\@chapapp{\appendixname}%
-	  \gdef\thechapter{\@Alph\c@chapter}
-	  \titleformat{\chapter}[block]
-		  {\vskip-22pt}%
-		  {\small\sectitle{\appendixname}~\Alph{chapter}:\hskip.5em}
-		  {0pt}
-		  {\small\sectitle}
-		  [\rule{\textwidth}{.4pt}]
-	\titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
-	\titlecontents{chapter}[1em]                                                                  
-	  {\filright\hskip.5em}                                   
-	  {\suftesi@smallcaps{\appendixname~\thecontentslabel:}\hskip1em}                                                                   
-	  {}                                                       
-	  {\contentspage\vspace{5pt}}}
-	  \else
+    \setcounter{chapter}{0}%
+    \setcounter{section}{0}%
+    \gdef\@chapapp{\appendixname}%
+    \gdef\thechapter{\@Alph\c@chapter}
+    \titleformat{\chapter}[block]
+      {\vskip-22pt}%
+      {\small\suftesi@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+      {0pt}
+      {\small\suftesi@titlesmallcaps}
+      [\rule{\textwidth}{.4pt}]
+  \titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
+  \titlecontents{chapter}[1em]                                                                  
+    {\filright\hskip.5em}                                   
+    {\suftesi@titlesmallcaps{\appendixname~\thecontentslabel:}\hskip1em}                                                                   
+    {}                                                       
+    {\contentspage\vspace{5pt}}}
+    \else
 \renewcommand\appendix{\par
-	  \setcounter{chapter}{0}%
-	  \setcounter{section}{0}%
-	  \gdef\@chapapp{\appendixname}%
-	  \gdef\thechapter{\@Alph\c@chapter}}
+    \setcounter{chapter}{0}%
+    \setcounter{section}{0}%
+    \gdef\@chapapp{\appendixname}%
+    \gdef\thechapter{\@Alph\c@chapter}}
+\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}{}
+%    \end{macrocode}
+% \paragraph{The \opt{elements} headings}
+%    \begin{macrocode}
+\ifsuftesi@elements% 
+   \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
+   \renewcommand{\sectionmark}[1]{\markright{#1}}
+ \fancypagestyle{elements}{%
+   \fancyhf{}
+   \fancyfoot[LE,RO]{\thepage} 
+   \fancyhead[RO]{%
+    \begin{picture}(0,0)
+      \setlength{\unitlength}{1pt}
+        \put(0,-104){%
+          \hskip\marginparsep
+          \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
+    \end{picture}}
+   \fancyhead[LE]{%
+     \begin{picture}(0,0)
+       \setlength{\unitlength}{1pt}
+         \put(0,-104){%
+          \hskip-\dimexpr(\marginparwidth+\marginparsep)
+          \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
+     \end{picture}}%
+  }%
+\else
+%    \end{macrocode}
+% \paragraph{The \opt{default} headings}
+%    \begin{macrocode}
+ \renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
+ \renewcommand{\sectionmark}[1]{}
 \fi
 %    \end{macrocode}
+% \subparagraph{The \opt{plain} style}
+%    \begin{macrocode}
+\fancypagestyle{plain}{%
+ \fancyhf{}
+ \fancyfoot[C]{}
+ \renewcommand{\headrulewidth}{0pt}
+ \renewcommand{\footrulewidth}{0pt}}
+%    \end{macrocode}
+% \subparagraph{The \opt{sufplain} style}
+%    \begin{macrocode}
+\fancypagestyle{sufplain}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
+ \fancyfoot[C]{\footnotesize\sufthepage}}
+%    \end{macrocode}
+% \subparagraph{The \opt{centerheadings} style}
+%    \begin{macrocode}
+\fancypagestyle{centerheadings}{%
+  \fancyhf{}%
+  \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}%
+  }%
+%    \end{macrocode}
+% \subparagraph{The \opt{sufdefault} style}
+%    \begin{macrocode}
+\fancypagestyle{sufdefault}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
+  \fancyhead[LE,RO]{\footnotesize\sufthepage} 
+  \fancyhead[LO]{\footnotesize\xheadbreakfalse\suf@rightmark}
+  \fancyhead[RE]{\footnotesize\xheadbreakfalse%
+   \ifsuftesi@article
+     \ifsuftesi@authortitle
+       \suf@leftmark
+         \else
+           \suf@rightmark
+          \fi
+     \else
+       \suf@leftmark
+     \fi}
+  }%
+%    \end{macrocode}
+% \subparagraph{The \opt{article} and \opt{sctitles} styles}
+%    \begin{macrocode}
+\ifsuftesi@article
+    \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+      \else
+    \fi
+\ifsuftesi@sctitles
+  \ifsuftesi@authortitle
+    \def\suf@rightmark{\suftesi@headingsmallcaps{\@headtitle}}
+      \else
+    \def\suf@rightmark{\suftesi@headingsmallcaps{\rightmark}}
+  \fi
+\else
+  \ifsuftesi@authortitle
+    \def\suf@rightmark{\nouppercase{\@headtitle}}
+      \else
+        \def\suf@rightmark{\nouppercase{\rightmark}}
+     \fi
+\fi
+\ifsuftesi@sctitles
+  \ifsuftesi@authortitle
+    \def\suf@leftmark{\suftesi@headingsmallcaps{\@author}}
+      \else
+        \def\suf@leftmark{\suftesi@headingsmallcaps{\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@headingsmallcaps{\thepage}}
+    \else
+      \def\sufthepage{\thepage}
+\fi
+\def\suf@leftrightmark{%
+ \if@mainmatter\leftmark\else\rightmark\fi} 
+%    \end{macrocode}
+% Setting the default page style:
+%    \begin{macrocode}
+\pagestyle{sufdefault}
+  \ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
+  \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
+  \ifsuftesi@elements\pagestyle{elements}\else\fi
+%    \end{macrocode}
 % \subsection{Text elements}
 % \subsubsection{Captions}
 %    \begin{macrocode}
 \RequirePackage{caption}
 \ifsuftesi@elements
-\captionsetup{labelsep=period,font={small,sf},singlelinecheck=false}
+  \captionsetup{labelsep=period,font={small,sf},singlelinecheck=false}
 \else
-	\captionsetup{labelsep=period,font=small,singlelinecheck=false}
+  \captionsetup{labelsep=period,font=small,singlelinecheck=false}
 \fi
 %    \end{macrocode}
 % \subsubsection{Epigraphs}
@@ -1254,42 +1348,42 @@
       \ifsuftesi@sufelements
         \relax
       \else
-		\setlength{\beforeepigraphskip}{-3\baselineskip}
-		\setlength{\afterepigraphskip}{2\baselineskip}
-		\setlength{\epigraphrule}{0pt}
-		\renewcommand{\textflush}{flushepinormal}
-		\renewcommand{\sourceflush}{flushepinormal}
-		\renewcommand{\epigraphsize}{\footnotesize}
-	\fi
+    \setlength{\beforeepigraphskip}{-3\baselineskip}
+    \setlength{\afterepigraphskip}{2\baselineskip}
+    \setlength{\epigraphrule}{0pt}
+    \renewcommand{\textflush}{flushepinormal}
+    \renewcommand{\sourceflush}{flushepinormal}
+    \renewcommand{\epigraphsize}{\footnotesize}
+  \fi
 \fi
 %    \end{macrocode}
 % \subsubsection{Lists}
 %    \begin{macrocode}
 \RequirePackage{enumitem}
-	\setlist{labelsep=0.6em,noitemsep,font=\normalfont}
-	\setdescription{font=\normalfont\itshape,noitemsep}
+    \setlist{labelsep=0.6em,noitemsep,font=\normalfont}
+    \setdescription{font=\normalfont\itshape,noitemsep}
 \ifsuftesi@compact
-		\setenumerate[1]{leftmargin=1em,label=\arabic*}
-		\setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
-		\setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
-		\setitemize[1]{leftmargin=1em}
-		\setitemize[2]{leftmargin=1.5em}
-		\setitemize[3]{leftmargin=1.5em} 
+    \setenumerate[1]{leftmargin=1em,label=\arabic*}
+    \setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
+    \setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
+    \setitemize[1]{leftmargin=1em}
+    \setitemize[2]{leftmargin=1.5em}
+    \setitemize[3]{leftmargin=1.5em} 
  \else
     \ifsuftesi@supercompact
-		\setenumerate[1]{leftmargin=1em,label=\arabic*}
-		\setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
-		\setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
-		\setitemize[1]{leftmargin=1em}
-		\setitemize[2]{leftmargin=1.5em}
-		\setitemize[3]{leftmargin=1.5em}
+    \setenumerate[1]{leftmargin=1em,label=\arabic*}
+    \setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
+    \setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
+    \setitemize[1]{leftmargin=1em}
+    \setitemize[2]{leftmargin=1.5em}
+    \setitemize[3]{leftmargin=1.5em}
  \else
-		\setenumerate[1]{leftmargin=0pt,label=\arabic*}
-		\setenumerate[2]{leftmargin= 1.3em,label=\arabic*}
-		\setenumerate[3]{leftmargin= 1.3em,label=\arabic*}
-		\setitemize[1]{leftmargin=0pt}
-		\setitemize[2]{leftmargin=1.3em}
-		\setitemize[3]{leftmargin=1.3em}
+    \setenumerate[1]{leftmargin=0pt,label=\arabic*}
+    \setenumerate[2]{leftmargin= 1.3em,label=\arabic*}
+    \setenumerate[3]{leftmargin= 1.3em,label=\arabic*}
+    \setitemize[1]{leftmargin=0pt}
+    \setitemize[2]{leftmargin=1.3em}
+    \setitemize[3]{leftmargin=1.3em}
    \fi
 \fi
 %    \end{macrocode}
@@ -1323,13 +1417,13 @@
 \renewenvironment{verse}
                {\let\\\@centercr
                 \list{}{\footnotesize%
-                		\itemsep      \z@
+                    \itemsep      \z@
                         \itemindent   -1.5em%
                         \listparindent\itemindent
                         \rightmargin  \leftmargin
                         \advance\leftmargin 1.5em}%
                 \item\relax}
-               {\endlist}	
+               {\endlist}  
 %    \end{macrocode}
 % \end{environment}
 % \subsubsection{Notes}
@@ -1337,29 +1431,29 @@
 % Renew the |\@makefntext| command according to the look \emph{The Elements of Typographic Styles} by R. Bringhurst:
 %    \begin{macrocode}
 \renewcommand\@makefntext{%
-	\hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+  \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
 %    \end{macrocode}
 %\end{macro}
 % \begin{macro}{\marginpar}
-% Renew the |\marginpar| command according to the look of \emph{L'arte di scrivere con \LaTeX} by L.~Pantieri e T.~Gordini:
+% 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
-   \itshape\footnotesize%
-   \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
-   \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
-   \doublehyphendemerits=100000%
-   \finalhyphendemerits=\doublehyphendemerits}
+    \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}
+    [\graffito@setup\raggedleft\hspace{0pt}{#1}]%
+    {\graffito@setup\raggedright\hspace{0pt}{#1}}}
+    \let\marginnote\marginpar
+    \def\marginpar{% thanks to Antonio Macrì
+    \@ifnextchar[\marginnote\graffito}
 \ifsuftesi@nomarginpar
-	\let\graffito\@gobble
-	\renewcommand\marginpar[2][]{}
-	  \else
-	\fi
+  \let\graffito\@gobble
+    \renewcommand\marginpar[2][]{}
+     \else
+  \fi
 %    \end{macrocode}
 % \end{macro}
 % \subsubsection{Abstract}
@@ -1407,58 +1501,56 @@
 % \begin{macro}{\colophon}
 %    \begin{macrocode}
 \newcommand{\colophon}[3][]{%
-	\thispagestyle{empty}
-	\null
-	  \vfill
-	   \def\next{#2}
-	       \ifx\next\@empty\else
-	          \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-	        All rights reserved
-	      \fi
-	\vfill	
-    \section*{Colophon}
-	{\small This work has been typeset with \sufengine{}%
-	   \def\next{#1}
-	      \ifx\next\@empty\else su #1 
-	    \fi using the \textsf{suftesi} class by 
-	    Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
-	    \cleardoublepage}
+  \thispagestyle{empty}
+  \null
+    \vfill
+     \def\next{#2}
+         \ifx\next\@empty\else
+            \noindent Copyright \copyright{} \the\year~#2\\[1ex]
+          All rights reserved
+        \fi
+  \vfill  
+  {\small\noindent This work has been typeset with \sufengine{}%
+     \def\next{#1}
+        \ifx\next\@empty\else on #1 
+      \fi using the \textsf{suftesi} class by 
+      Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
+      \cleardoublepage}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\bookcolophon}
 %    \begin{macrocode}
 \newcommand{\bookcolophon}[2]{%
-	\thispagestyle{empty}
-	\null
-	  \vfill
-	          \noindent #1
-	\vfill	
-    \section*{Colophon}
-	{\small #2\par}
-	    \cleardoublepage}
+  \thispagestyle{empty}
+  \null
+    \vfill
+            \noindent #1
+  \vfill  
+  {\small\noindent #2\par}
+      \cleardoublepage}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\artcolophon}
 %    \begin{macrocode}
 \newcommand{\artcolophon}[1]{%
 \thispagestyle{empty}
-	\null
-	  \vfill
-	{\small #1\par}}
+  \null
+    \vfill
+  {\small\noindent #1\par}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\finalcolophon}
 %    \begin{macrocode}
 \newcommand{\finalcolophon}[1]{%
 \thispagestyle{empty}
-	\null\vspace*{\stretch{1}}
-	\begin{center}
+  \null\vspace*{\stretch{1}}
+  \begin{center}
   \begin{minipage}{.5\textwidth}
   \centering\small #1
   \end{minipage}
   \end{center}
-	  \vspace*{\stretch{6}}	
-	}
+    \vspace*{\stretch{6}}  
+  }
 %    \end{macrocode}
 % \end{macro}
 % \subsection{Commands}
@@ -1474,36 +1566,28 @@
 \chapterintroname{Introduzione}
 %    \end{macrocode}
 % \end{macro}
-%\begin{macro}{\itshape} 
-% Renew |\itshape| to allow hyphenation in some italian epressions, such as ``l'\emph{Enciclopedia}'':
-%    \begin{macrocode}
-\DeclareRobustCommand\itshape
-	{\penalty\@M\hskip\z@skip\not@math@alphabet\itshape
-	\mathit\fontshape\itdefault\selectfont}
-%    \end{macrocode}
-% \end{macro}
 % \begin{macro}{\headbreak}
 %Active in the table of contents but not in the text or in the headings
 %    \begin{macrocode}
 \newif\ifheadbreak\headbreakfalse
-	\DeclareRobustCommand{\headbreak}  
-		{\ifheadbreak\\\else\fi}
+  \DeclareRobustCommand{\headbreak}  
+    {\ifheadbreak\\\else\fi}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\xheadbreak}
 % Active in the text and in the headings but not in the table of contents.
 %    \begin{macrocode}
 \newif\ifxheadbreak\xheadbreaktrue
-	\DeclareRobustCommand{\xheadbreak} 
-		{\ifxheadbreak\\\else\fi}
+  \DeclareRobustCommand{\xheadbreak} 
+    {\ifxheadbreak\\\else\fi}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tableofcontents}
 %    \begin{macrocode}
 \let\origtableofcontents\tableofcontents
-	\renewcommand{\tableofcontents}{%
-		\begingroup\headbreaktrue\xheadbreakfalse%
-	\origtableofcontents\endgroup}
+  \renewcommand{\tableofcontents}{%
+    \begingroup\headbreaktrue\xheadbreakfalse%
+  \origtableofcontents\endgroup}
 %    \end{macrocode}
 % \end{macro}
 % Renew  |\frontmatter| to have arabic page numbering:
@@ -1520,15 +1604,15 @@
     \section*{\refname}
      \addcontentsline{toc}{section}{\refname}
   \else
-	\chapter{\bibname}%
+  \chapter{\bibname}%
   \fi
-  		\normalfont \list{}{%
-			\setlength{\itemindent}{-\parindent}
-			\setlength{\leftmargin}{\parindent}
-			\setlength{\labelwidth}{\leftmargin}
-			\setlength{\parsep}{\parskip}
-			\let\makelabel}}
-	{\endlist}
+      \normalfont \list{}{%
+      \setlength{\itemindent}{-\parindent}
+      \setlength{\leftmargin}{\parindent}
+      \setlength{\labelwidth}{\leftmargin}
+      \setlength{\parsep}{\parskip}
+      \let\makelabel}}
+  {\endlist}
 %    \end{macrocode}
 % \end{environment}
 % \begin{environment}{sigle}
@@ -1537,195 +1621,139 @@
 \newcommand{\losname}{Sigle}
 \newcommand{\itlabel}[1]{\itshape\hbox to 6em{#1}}
 \newenvironment{sigle}{%
-	\chapter{\losname}
-		\normalfont \list{}{%
-			\setlength{\labelsep}{0.5em}
-			\setlength{\itemindent}{0pt}
-			\setlength{\leftmargin}{6em}
-			\setlength{\labelwidth}{\leftmargin}
-			\setlength{\listparindent}{\parindent}
-			\setlength{\parsep}{\parskip}
-			\let\makelabel\itlabel}}
-	{\endlist}
+  \chapter{\losname}
+    \normalfont \list{}{%
+      \setlength{\labelsep}{0.5em}
+      \setlength{\itemindent}{0pt}
+      \setlength{\leftmargin}{6em}
+      \setlength{\labelwidth}{\leftmargin}
+      \setlength{\listparindent}{\parindent}
+      \setlength{\parsep}{\parskip}
+      \let\makelabel\itlabel}}
+  {\endlist}
 %    \end{macrocode}
 % \end{environment}
 %    \begin{macrocode}
 \let\hemph\emph
 %    \end{macrocode}
-% \subsection{Final settings}
+% \paragraph{Final settings}
 % Just one touch of french typography:
 %    \begin{macrocode}
 \frenchspacing
 %</class>
 %    \end{macrocode}
 %
-% \section{The bibliography file}
+% \subsection{The bibliography file}
 %
 %<*bib>
 % \begin{verbatim}
 @book{Morison:1111,
-	Author = {Stanley Morison},
-	Booktitle = {First Principles of Typography},
-	Date = {1936},
-	Location = {Cambridge},
-	Origdate = {2008},
-	Origlocation = {Pisa-Roma},
-	Origpublisher = {Fabrizio Serra editore},
-	Origtitle = {I principi fondamentali della tipografia},
-	Publisher = {Cambridge University Press},
-	Title = {First Principles of Typography}}
+  Author = {Stanley Morison},
+  Booktitle = {First Principles of Typography},
+  Date = {1936},
+  Location = {Cambridge},
+  Origdate = {2008},
+  Origlocation = {Pisa-Roma},
+  Origpublisher = {Fabrizio Serra editore},
+  Origtitle = {I principi fondamentali della tipografia},
+  Publisher = {Cambridge University Press},
+  Title = {First Principles of Typography}}
 
 @book{Eco:1980,
-	Author = {Umberto Eco},
-	Booktitle = {Il nome della rosa},
-	Keywords = {secondaria},
-	Location = {Milano},
-	Publisher = {Bompiani},
-	Title = {Il nome della rosa},
-	Year = {1980}}
+  Author = {Umberto Eco},
+  Booktitle = {Il nome della rosa},
+  Location = {Milano},
+  Publisher = {Bompiani},
+  Title = {Il nome della rosa},
+  Year = {1980}}
 
 @online{Gregorio:frontespizio,
-	Author = {Enrico Gregorio},
-	Keywords = {primaria},
-	Note = {version 1.1},
-	Title = {Il pacchetto \textsf{frontespizio}},
-	Url = {http://www.guit.sssup.it/phpbb/index.php},
-	Year = {2009}}
+  Author = {Enrico Gregorio},
+  Note = {version 1.1},
+  Title = {Il pacchetto \textsf{frontespizio}},
+  Url = {http://www.guit.sssup.it/phpbb/index.php},
+  Year = {2009}}
 
 @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 = {\Ars},
-	Keywords = {secondaria},
-	Month = {10},
-	Number = {9},
-	Title = {Creare stili bibliografici con \textsf{biblatex}: 
-	l'esperienza del pacchetto {biblatex-philosophy}},
-	Year = {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},
+  Title = {Creare stili bibliografici con \textsf{biblatex}: 
+  l'esperienza del pacchetto {biblatex-philosophy}},
+  Year = {2010}}
 
 @book{Bringhurst:1996,
-	Author = {Robert Bringhurst},
-	Booktitle = {The Elements of Typographic Style},
-	Date = {1996},
-	Edition = {2},
-	Keywords = {primaria},
-	Location = {Vancouver},
-	Publisher = {Hurtley \& Marks Publisher},
-	Title = {The Elements of Typographyc Style},
-	Annote = {In questa voce sono state date le indicazioni complete 
-	dell'edizione originale, ed è stato indicato solo il luogo e la data della 
-	traduzione italiana}}
+  Author = {Robert Bringhurst},
+  Booktitle = {The Elements of Typographic Style},
+  Date = {1996},
+  Edition = {2},
+  Location = {Vancouver},
+  Publisher = {Hurtley \& Marks Publisher},
+  Title = {The Elements of Typographyc Style},
+  Annote = {In questa voce sono state date le indicazioni complete 
+  dell'edizione originale, ed è stato indicato solo il luogo e la data della 
+  traduzione italiana}}
 
 @book{Tschichold:1975,
-	Author = {Jan Tschichold},
-	Booktitle = {Ausgewählte Aufsätze über Fragen der Gestalt des 
-	Buches und der Typographie},
-	Keywords = {primaria},
-	Location = {Basel},
-	Origdate = {2003},
-	Origlocation = {Milano},
-	Origpublisher = {Sylvestre Bonnard},
-	Origtitle = {La forma del libro},
-	Publisher = {Birkhäuser Verlag},
-	Title = {Ausgewählte Aufsätze über Fragen der Gestalt des Buches 
-	und der Typographie},
-	Year = {1975}}
+  Author = {Jan Tschichold},
+  Booktitle = {Ausgewählte Aufsätze über Fragen der Gestalt des 
+  Buches und der Typographie},
+  Location = {Basel},
+  Origdate = {2003},
+  Origlocation = {Milano},
+  Origpublisher = {Sylvestre Bonnard},
+  Origtitle = {La forma del libro},
+  Publisher = {Birkhäuser Verlag},
+  Title = {Ausgewählte Aufsätze über Fragen der Gestalt des Buches 
+  und der Typographie},
+  Year = {1975}}
 
 @online{Lehman:2010,
-	Author = {Philipp Lehman},
-	Keywords = {secondaria},
-	Note = {Versione 0.9a},
-	Title = {The \textsf{biblatex} package},
-	Url = {http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/},
-	Year = {2010}}
+  Author = {Philipp Lehman},
+  Note = {Versione 0.9a},
+  Title = {The \textsf{biblatex} package},
+  Url = {http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/},
+  Year = {2010}}
+
+@online{Miede:2011,
+  Author = {André Miede},
+  Title = {A Classic Thesis style},
+  Url = {http://www.ctan.org/tex- archive/macros/
+  latex/contrib/classicthesis/ClassicThesis. pdf},
+  Date = {2011}}
 
 @book{Pantieri:2011,
-	Author = {Lorenzo Pantieri and Tommaso Gordini},
-	Booktitle = {L'arte di scrivere con LATEX},
-	Date = {2011},
-	Edition = {new edition},
-	Foreword = {Enrico Gregorio},
-	Hyphenation = {italian},
-	Keywords = {primaria},
-	Subtitle = {Un'in\-troduzione 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 
-	italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la 
-	completezza dei contenuti}}
+  Author = {Lorenzo Pantieri and Tommaso Gordini},
+  Booktitle = {L'arte di scrivere con LATEX},
+  Date = {2011},
+  Edition = {new edition},
+  Foreword = {Enrico Gregorio},
+  Hyphenation = {italian},
+  Subtitle = {Un'in\-troduzione 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 
+  italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la 
+  completezza dei contenuti}}
 
 @article{Pantieri:2009,
-	Author = {Lorenzo Pantieri},
-	Keywords = {secondaria},
-	Title = {L'arte di gestire la bibliografia con \pack{biblatex}},
-	Url = {http://www.lorenzopantieri.net/LaTeX_files/Bibliografia.pdf},
-	Year = {2009}}
+  Author = {Lorenzo Pantieri},
+  Title = {L'arte di gestire la bibliografia con \pack{biblatex}},
+  Url = {http://www.lorenzopantieri.net/LaTeX_files/Bibliografia.pdf},
+  Year = {2009}}
 
 @article{Mori:2008,
-	Author = {Lapo F. Mori},
-	Journal = {\Ars},
-	Keywords = {secondaria},
-	Month = {10},
-	Pages = {37-51},
-	Title = {Gestire la bibliografia con {\LaTeX}},
-	Volume = {6},
-	Year = {2008}}
+  Author = {Lapo F. Mori},
+  Journal = {ArsTeXnica},
+  Month = {10},
+  Pages = {37-51},
+  Title = {Gestire la bibliografia con {\LaTeX}},
+  Volume = {6},
+  Year = {2008}}
 % \end{verbatim}
 %</bib>
 %
-% \section*{Changes}
-%
-% \begin{changelog}
-% \begin{release}{0.7}{\filedate}
-% \item Corrected some bugs
-% \item Provided a thesis template (in italian)
-% \item Files generated with \file{docstrip} utility 
-% \end{release}
-%
-% \begin{release}{0.6c}{2011-11-16}
-% \item Corrected some bugs
-% \item Updated documentation
-% \end{release}
-%
-% \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}
-%
-% \begin{release}{0.6}{2011-10-21}
-% \item New command \cmd{bookcolophon} \see{sec:commands}
-% \item New command \cmd{artcolophon} \see{sec:commands}
-% \item New option \opt{authortitle} \see{sec:options}
-% \item Renamed option \opt{plain} to \opt{centerheadings} \see{sec:options}
-% \item Renamed option \opt{fullplain} to \opt{sufplain} \see{sec:options}
-% \item New english documentation
-% \end{release}
-%
-% \begin{release}{0.5}{2011-07-29}
-% \item The frontispiece of \sty{suftesi}{} is now included in the package \sty{frontespizio}
-% \item New command \cmd{chapnumfont}
-% \item changed option \opt{sctitles} \see{sec:options}
-% \item New option \opt{article} \see{sec:options}
-% \item New option \opt{fullplain} \see{sec:options}
-% \item New option \opt{elements} \see{sec:options}
-% \item New option \opt{sufelements} \see{sec:options}
-% \item New option \opt{supercompact} \see{sec:options}
-% \item New option \opt{compact} \see{sec:options}
-% \item New option \opt{nocrop} \see{sec:options}
-% \item New option \opt{nomarginpar} \see{sec:options}
-% \end{release}
-%
-% \end{changelog}
-%
-% \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=note]
-%
 % \Finale