suftesi (15oct12)

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

2 files changed, 461 insertions, 272 deletions

diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 6cdb88542ec..a08d9a37312 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,18 +23,41 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2012/09/25 v0.9c A class for typesetting theses, books and articles]
+    [2012/10/14 v1.0 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\PassOptionsToClass{a4paper}{article}
 \documentclass{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[polutonikogreek,english]{babel}
 \let\cs\relax
 \let\cmd\relax
-%\usepackage[paperwidth=17cm,paperheight=24cm,right=1cm,left=3cm]{geometry}
 \usepackage{ltxdockit}
+\makeatletter
+\renewenvironment*{optionlist}
+  {\list{}{%
+     \setlength{\labelwidth}{\marglistwidth}%
+     \setlength{\labelsep}{\z@}%
+     \setlength{\leftmargin}{2cm}%
+     \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
+   \ltd@optionlist}
+  {\endlist}
+\renewenvironment*{ltxsyntax}
+  {\list{}{%
+     \setlength{\labelwidth}{\marglistwidth}%
+     \setlength{\labelsep}{0pt}%
+     \setlength{\leftmargin}{1cm}%
+     \renewcommand*{\makelabel}[1]{%
+       \hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}%
+   \let\csitem\ltd@csitem
+   \let\cmditem\ltd@cmditem
+   \let\envitem\ltd@envitem
+   \let\lenitem\ltd@csitem
+   \let\boolitem\ltd@boolitem
+   \let\cntitem\ltd@item
+   \let\optitem\ltd@item}
+  {\endlist}
+\makeatother
 \renewcommand*{\optionlistfont}{\spotcolor\sffamily\displayverbfont}
 \renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont}
 
@@ -43,11 +66,13 @@
 \usepackage{siunitx}
 \usepackage{pdfpages}
 \usepackage{metalogo}
+\usepackage{tikz}
 \usepackage[style=philosophy-classic]{biblatex}
   \addbibresource{suftesi.bib}
-\usepackage[suftesi]{frontespizio}
 \usepackage{xcolor}
-
+\usepackage{geometry}
+ \geometry{margin=1cm,bottom=1.5cm,paperwidth=8in,paperheight=6.25in}
+ % \newgeometry{margin=1cm,bottom=1.5cm}
 \usepackage{fourier}
 \renewcommand{\sfdefault}{lmss}
 \usepackage{sectsty}
@@ -57,8 +82,6 @@
 	\paragraphfont{\spotcolor}
 	\subparagraphfont{\spotcolor} 
 
-
-
 \usepackage{hyperref}
 \hypersetup{%
     pdftitle={User's Guide to \textsf{suftesi}},
@@ -95,8 +118,15 @@
   {
   %\endgenquote
   \end{mdframed}}
-  
 \usepackage{mdframed}
+\newcommand{\specialsection}[1]{%
+ \clearpage
+ \bgroup\centering
+ \null\vspace{\stretch{1}}
+ {\Huge\bfseries\color{spot}\section{#1}}
+ \thispagestyle{empty}
+ \vspace{\stretch{2}}\egroup\clearpage}
+
   
 \EnableCrossrefs         
 \CodelineIndex
@@ -109,7 +139,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3016}
+% \CheckSum{3294}
 %
 % \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
@@ -176,79 +206,90 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
-% \title{\color{spot}\bfseries User's Guide to \textsf{suftesi}\thanks{This
-% document corresponds to \textsf{suftesi}~\fileversion{} dated \filedate}\\
+% \title{\color{spot}\bfseries User's Guide to \textsf{suftesi}\\
 % \large\itshape A document class for typesetting theses, books and articles}
 % \author{Ivan Valbusa \\
 %   \texttt{ivan dot valbusa at univr dot it}}
-% \date{\filedate}
+% \date{\fileversion{} -- \filedate}
+%
+% \newgeometry{margin=4cm,top=2cm}
+%
 % \maketitle
+%
+% \thispagestyle{empty}
+%
 % \begin{abstract}
-% The \sty{suftesi}
-% class
-% provides a set of page layouts, title styles and heading styles to 
-% typeset theses, books and articles. It is based on the standard
-% \sty{book} class and inspired by the works of
+% The standard document classes allow you to typeset beautiful
+% documents but their layout is quite far from the stylistic requests
+% of some humanists (mainly Italian). The \sty{suftesi} class
+% provides a set of ``humanistic'' page layouts, title styles and heading styles to typeset theses, books and articles. 
+% The styles are very simple and sober and also have the aim of
+% finding an aesthetic harmony in its formal simplicity. They are
+% largely inspired by some interesting readings, particularly
 % \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
-% \textcite{Morison:1111}. See the template file \file{tesi.tex} in the \file{example} folder.
+% \textcite{Morison:1111}.
 % \end{abstract}
 %
-% \tableofcontents
+% \newgeometry{margin=3cm}
 %
-% \section*{Note on copyright}
+% \noindent Copyright \copyright\ 2009-2010 Ivan Valbusa.\\[2ex]
 %
-% Copyright \copyright\ 2009-2010 Ivan Valbusa. This package is
+% \noindent This package is
 % author-maintained.  Permission is granted to copy, distribute and/or
 % modify this software under the terms of the LaTeX Project Public
-% License, version
-% 1.3c.\footnote{\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}.}
+% License, version 1.3c (\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}).\\[4ex]
 %
-% In addition to the terms of this license the author requires an
-% attribution notice like the following one:
+% {\small\noindent In addition to the terms of this license the author 
+% requires an attribution notice like the following one:
 % \begin{center}
 % \emph{This work has been typeset with \LaTeX{}, using the
-% \textsf{suftesi} class by Ivan Valbusa.}\footnote{You can use the \cmd{colophon}, \cmd{bookcolophon} or
-% \cmd{artcolophon} commands explained in section \ref{sec:commands}.}
+% \textsf{suftesi} class by Ivan Valbusa.}
 % \end{center}
+% \noindent You can use the \cmd{\meta{}colophon} commands explained 
+% in section \ref{sec:commands}.}
 %
-% The most important feature of this class is the set of styles it
-% provides. For this reason:
+% \vskip6ex
 %
+% \noindent The most important feature of this class is the set of styles it
+% provides. For this reason:
 % \begin{center}
 % \textbf{\textsc{do not modify the styles of this class\\
 % if you do not like these styles, use another class.}}
 % \end{center}
-%
 % If you use \sty{suftesi}{} in a document typeset with another class
 % (for example \sty{book}), remember to clean up the preamble from all
 % the layout redefinitions.
 %
+% \null\vfill
+% \newgeometry{margin=2cm,bottom=1.5cm,top=1cm}
+%
+% \begin{multicols}{2}
+% \fontsize{9.5}{11}\selectfont
+% \tableofcontents
+% \end{multicols}
+%
+% \newgeometry{margin=3cm,bottom=1.5cm,top=1cm}
+%
+% \section{Class features}
 %
 % \subsection*{Loaded packages}
 % \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
 % It is not compatible with \sty{crop}}
 %
 % The class loads the following packages: \sty{beramono},
-% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, 
-% \sty{fancyhdr}, \sty{fontenc}, \sty{geometry},
-% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, 
-% \sty{microtype}, \sty{multicol}, \sty{titlesec}, \sty{titletoc}.
+% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, \sty{extramarks}, 
+% \sty{fancyhdr}, \sty{fontenc}, \sty{geometry},  
+% \sty{ifxetex}, \sty{mathpazo}, 
+% \sty{microtype} (pdf\LaTeX{} olnly), \sty{multicol}, \sty{textcase}, \sty{titlesec}, \sty{titletoc}, \sty{xkeyval}.
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
-% \section{Class features}
 %
-% \subsection{Layout}
+
+% \subsection{Page layouts}
 %
-% The standard document classes allow you to typeset beautiful
-% documents but their layout is quite far from the stylistic requests
-% of some humanists (mainly Italian). The styles provided by
-% \sty{suftesi} are very simple and sober and also have the aim of
-% finding an aesthetic harmony in its formal simplicity. They are
-% largely inspired by some interesting readings, particularly
-% \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
-% \textcite{Morison:1111}. Table~\ref{tab:gabbia} summarizes the main
-% features of the styles provided by \sty{suftesi}.
-% \begin{table*}[t]
+% The class provides five page layouts. The \opt{standard} layout (set by default) is aimed to typeset standard A4 documents, while the other four layouts are particularly suitable to typeset books and article.  See table \ref{tab:layouts} for details.
+% \begin{table*}[h!]
 % \footnotesize\centering
+% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
 % \begin{tabular}{p{3cm}ccccc}
 % \toprule
 %                      & \multicolumn{5}{c}{Options}\\\cmidrule{2-6}
@@ -270,7 +311,6 @@
 % Page               & $1/\sqrt{2}$& $2/3$ & $2/3$ & $2/3$& $1/\sqrt{3}$\\
 % \bottomrule
 % \end{tabular}
-% \caption{The layouts of \sty{suftesi}}
 % \label{tab:gabbia}
 
 % \end{table*}
@@ -278,7 +318,7 @@
 % \subsection{Font}
 %
 % The default font for body text is
-% Palatino designed by Hermann Zapf\index{Zapf, Hermann}.Using  
+% Palatino designed by Hermann Zapf\index{Zapf, Hermann}. Using  
 %  \XeLaTeX{}, 
 % the \LaTeX{} default font is loaded and the font options are turned off.
 % The sans serif font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.}. 
@@ -286,112 +326,98 @@
 %
 % \subsubsection{Using different fonts}
 %
-% If you prefer to use other fonts (such as those provided by \sty{fourier} or \sty{libertine} packages), remember to load the \opt{defaultfont=cmodern} class option 
+% If you prefer to use other fonts (such as those provided by \sty{fourier} or \sty{libertine} packages), remember to load the \opt{defaultfont=standard} class option 
 % which turns off the default font settings. 
 % Moreover pay particular attention in choosing the Greek font.
 %
 % \subsubsection{Greek alphabet}
 %
-% The default font for the Greek text is Artemisia by the Greek Font Society  
-% which is particularly suitable for Palatino:
-% \begin{quotation}
-% \fontfamily{ppl}\selectfont
-% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
-% \begin{otherlanguage*}{polutonikogreek}%
-% \fontfamily{artemisia}\selectfont
-% Pr`epei na skeftoume mia
-% sunarthsh ths opoias
-% gnwrizoume oti uparqei
-% to oloklhrwma.
-% \end{otherlanguage*}
-% \end{quotation}
-% With the \opt{porson} option you can use the Porson font by the Greek Font Society:
-% \begin{quotation}
-% \fontfamily{ppl}\selectfont
-% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
-% \begin{otherlanguage*}{greek}%
-% \fontfamily{porson}\selectfont
-% Prepei na skeftoume mia
-% sunarthsh ths opoias
-% gnwrizoume oti uparqei
-% to oloklhrwma.
-% \end{otherlanguage*}
-% \end{quotation}
-% The \opt{defaultgreek} option allows you to use the standard CB Greek 
-% font:\footnote{This option is also activated by the \opt{defaultfont} option 
-% (see section \ref{sec:options}).}
-% \begin{quotation}
-% \fontfamily{ppl}\selectfont
-% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
-% \begin{otherlanguage*}{greek}%
-% \fontfamily{lmr}\selectfont
-% Prepei na skeftoume mia
-% sunarthsh ths opoias
-% gnwrizoume oti uparqei
-% to oloklhrwma.
-% \end{otherlanguage*}
-% \end{quotation}
-% 
+% The default font for the Greek text is Artemisia by the Greek Font Society which is particularly suitable for Palatino. 
+% With the \opt{porson} option you can use the Porson font by 
+% the Greek Font Society. The \opt{greekfont=cbgreek} option 
+% allows you to use the standard CB Greek 
+% font (see figure \ref{fig:greek-font}) This option is also activated by the 
+% \opt{defaultfont=standard} option (see section \ref{sec:options}).
+% \vskip2ex
+% \begin{figure}
+%\fontfamily{ppl}\selectfont
+%\noindent\begin{minipage}[t]{.3\textwidth}
+%\begin{otherlanguage*}{polutonikogreek}%
+%\fontfamily{artemisia}\selectfont
+%T`o g`ar kal`on >en meg'ejei ka`i t´azei >est'in.\,
+%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
+% nell'ordinata disposizione delle parti.
+%
+% {\centering (a) Artemisia\\}
+%\end{minipage}\hfill
+%\begin{minipage}[t]{.3\textwidth}
+%\begin{otherlanguage*}{greek}%
+%\fontfamily{porson}\selectfont
+%T`o g`ar kal`on >en meg'ejei ka`i t´azei >est'in.\,
+%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
+% nell'ordinata disposizione delle parti.
+%
+% {\centering (b) Porson\\}
+%\end{minipage}\hfill
+%\begin{minipage}[t]{.3\textwidth}
+%\begin{otherlanguage*}{greek}%
+%\fontfamily{lmr}\selectfont
+%T`o g`ar kal`on >en meg'ejei ka`i t´azei >est'in.\,
+%\end{otherlanguage*}~Il bello infatti sta nella grandezza e 
+% nell'ordinata disposizione delle parti. 
+%
+% {\centering (c) CBGreek\\}
+%\end{minipage}
+% \caption{Comparison between Artemisia, Porson and CBGreek greek font.}\label{fig:greek-font}
+% \end{figure}
+% The first code for the Porson font has been written by Enrico 
+% Gregorio. Claudio Beccari successively added the code to improve the 
+% scale factor when using this greek font in combination with Palatino.
+%
 % \subsection{Frontispiece} 
 %
+% \begin{minipage}{\textwidth}
 % The class has an original frontispiece now directly available 
 % loading the \sty{frontespizio} package 
-% \parencite{Gregorio:frontespizio}\footnote{Version 1.4 or later.} 
-% with the \opt{suftesi} option (see the \file{tesi.tex} template 
-% file in the \file{example} folder):
+% \parencite[version 1.4 or later]{Gregorio:frontespizio} 
+% with the \opt{suftesi} option (see figure \ref{fig:frontispiece}):
+%
+% \vskip2ex
+%
 % \begin{ttquote}
 % \cmd{usepackage}[suftesi]\ar{frontespizio}
 % \end{ttquote}
-%
-%\clearpage
-% \vbox{
-% \begin{frontespizio} 
-%\Logo{fakelogo}
-%\Istituzione{University of St.\ Anford}
-%\Divisione{Department of Typography}
-%\Scuola{Ph.D. degree in \TeX{} and \LaTeX{}}
-%\Titolo{How to prepare a\\
-%  formal frontispiece}
-%\Sottotitolo{Theory and practice}
-%\NCandidato{Candidate}
-%\Candidato{Enrico Gregorio}
-%\NRelatore{Thesis advisor}{}
-%\Relatore{Prof. R. J. Drofnats}
-%\NCorrelatore{Research supervisor}{Research supervisors}
-%\Correlatore{J. H. Quick}
-%\Correlatore{B. L. User}
-%\Piede{Thesis submitted in 2010}
-% \end{frontespizio}
-% }
-% \begin{picture}(0,0)
-% \setlength{\unitlength}{1cm}
-% \put (-3,-23) {The frontispiece of \sty{suftesi} is available loading the \sty{frontespizio} package with \opt{suftesi} option}
-% \put (-3.5,3) {\line(0,-24){25}}
-% \put (-3.5,3) {\line(10,0){16}}
-% \put (12.5,3) {\line(0,-24){25}}
-% \put (-3.5,-22) {\line(10,0){16}}
-% \end{picture}
-% \clearpage
+% \end{minipage}\hfill
+% \begin{figure}
+% \centering
+% \fbox{\includegraphics[width=9cm]{frontespizio}}
+% \caption{The frontispiece of \sty{suftesi}.}\label{fig:frontispiece}
+% \end{figure}
 %
 % \section{Options}\label{sec:options}
 %
-%In addition to the options defined by the \sty{book} document class, \sty{suftesi} accepts the following new options.
+% The \sty{suftesi} class defines new options to customize the style of page, titles, headings and other
+% text elements. You can also use all the options difined by \sty{book} class except those modifying 
+% the page layout (\opt{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper} 
+% and \opt{landscape}).
 %
 % \subsection{Page Styles}
 %
 %\begin{optionlist}
-% \optitem[book]{documentstructure}{\opt{book}, \opt{article}}
+% \setlength{\labelwidth}{2.5cm}%
+%\optitem[book]{documentstructure}{\opt{book}, \opt{article}}
+% \changes{v0.9b}{2012/09/23}{New option \opt{documentstructure}} 
 % \begin{valuelist}
-% \item[book] For typesetting texts with chapters
+% \item[book] For typesetting texts with chapters.
 % \item[article] This option is particularly suitable 
 % to typeset articles or short theses (that is  without 
 % chapter division).
 % \end{valuelist}
-%\optitem[default]{pagelayout}{\opt{default}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}}
+%\optitem[standard]{pagelayout}{\opt{standard}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
 %\begin{valuelist}
 %\item[standard]
-% Prints an A4 typeblock (see \ref{tab:gabbia} for details).
+% Prints an A4 typeblock (see table \ref{tab:gabbia} for details).
 %\item[periodical]
 % Prints a typeblock  of $17 \si{cm} \times 24 \si{cm}$ on an A4 paper, 
 % showing the crop marks  (see table \ref{tab:gabbia} for details). 
@@ -403,9 +429,10 @@
 % The same as \opt{compact} but with 
 % a  typeblock of  $14 \si{cm} \times 21   \si{cm}$  
 % (see table \ref{tab:gabbia} for details).
-% \item[elements] Prints a typeblock with the layout of 
+% \item[elements] Prints a typeblock with the dimensions of 
 % \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} 
-% (see table \ref{tab:gabbia} for details).. 
+% (see table \ref{tab:gabbia} for details). To reproduce the whole 
+% style of \textcite{Bringhurst:1996} use \opt{style=elements} option.
 %\end{valuelist}
 %\boolitem[true]{crop}
 % \begin{valuelist}
@@ -418,6 +445,7 @@
 % 	\subsection{Titles}
 %
 % \begin{optionlist}
+% \setlength{\labelwidth}{2.5cm}%
 % \optitem[roman]{<level>font}{\opt{roman}, \opt{italic}, 
 % \opt{smallcaps}}
 %   \begin{valuelist}
@@ -474,9 +502,11 @@
 %     on the left margin.
 %	\end{valuelist}
 % \end{optionlist}
+%
 % \subsection{Headings}
 %
 % \begin{optionlist}
+% \setlength{\labelwidth}{2.5cm}%
 % \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
 % \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
 %   \begin{valuelist}
@@ -504,34 +534,35 @@
 % \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, 
 % \opt{smallcaps}}
 %   \begin{valuelist}
-%     \item[roman] Prints the headers in roman
-%     \item[italic] Prints the headers in \emph{italic}
-%     \item[smallcaps] Prints the headers in \textsc{small caps}
+%     \item[roman] Prints the headers in roman.
+%     \item[italic] Prints the headers in \emph{italic}.
+%     \item[smallcaps] Prints the headers in \textsc{small caps}.
 %   \end{valuelist}
 % \end{optionlist}
 %
 % \subsection{Footnotes, lists, quotations}
 %
 % \begin{optionlist}
+% \setlength{\labelwidth}{2.5cm}%
 % \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} 
 % \begin{valuelist}
 % \item[center] 
 % Indents the block quotations
-% on both the left and right margins
+% on both the left and right margins.
 % \item[right] 
 % Indents the block quotations
-% only on the left margin
+% only on the left margin.
 % \end{valuelist}
 % \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}}
 %  \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
 % \begin{valuelist}
 % \item[footnotesize] 
 % Prints the block quotations 
-% in \cmd{footnotesize} size
+% in \cmd{footnotesize} size.
 % \item[small] 
 % Prints the block quotations 
-% in \cmd{small} size
+% in \cmd{small} size.
 % \end{valuelist}
 % \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung}, 
 % \opt{dotted}, \opt{superscript}}
@@ -560,9 +591,9 @@
 % \item[bulged]
 % The item number or symbol protrudes beyond the left margin.
 % \item[aligned]
-%  Aligns the lists to the left margin
+%  Aligns the lists to the left margin.
 % \item[indented]
-%  Prints standard indented lists
+%  Prints standard indented lists.
 % \end{valuelist}
 % \optitem[standard]{captionstyle}{\opt{standard}, \opt{elements}}
 % \begin{valuelist}
@@ -574,14 +605,14 @@
 %\subsection{Fonts}
 %
 %\begin{optionlist}
-% \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{lmodern}, 
-% \opt{cmodern}}
+% \setlength{\labelwidth}{2.5cm}%
+% \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{standard}}
 %   \begin{valuelist}
-%     \item[palatino] Loads the Palatino font.
-%     \item[cmodern] Loads the \LaTeX{} standard Computer Modern.
+%     \item[palatino] Loads the Palatino font family.
+%     \item[standard] Loads the Latin Modern font family.
 %   \end{valuelist}
 % \optitem[artemisia]{greekfont}{\opt{artemisia}, \opt{porson}, 
-% \opt{cbgreek}, \opt{cbgreeklmr}}
+% \opt{cbgreek}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
 %     \item[artemisia] Loads the Artemisia font.
@@ -593,6 +624,7 @@
 % \subsection{Other options}
 %
 %\begin{optionlist}
+% \settowidth{\labelwidth}{marginpar}
 %\boolitem[true]{marginpar}
 % \begin{valuelist}
 % \item[true] Prints the marginal notes.
@@ -614,12 +646,10 @@
 % \item[wide] 
 % Sets |\parindent| to 1.5\,em.
 % \end{valuelist}
-%\end{optionlist}
-%
-% \begin{ltxsyntax}
-% \optitem{bozza} 
-% Prints ``Version of \meta{date}'' in the footer.
-% \end{ltxsyntax}
+% \optitem[false]{draftdate}{\opt{true}, \opt{false}}
+%  \changes{v1.0}{2012/10/14}{First stable release. Renamed option \opt{bozza} to \opt{draftdate}} 
+% If \opt{true} it prints the string ``Version of \meta{date}'' in the footer.
+% \end{optionlist}
 %
 % \subsection{Pre-defined styles}
 %
@@ -645,7 +675,7 @@
 % There are three position for the title and two positions for the chapter as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
 % \item[elements] Reproduces the style of \textcite{Bringhurst:1996}
 % \item[sufelements] Loads \opt{headerstyle=smallcaps}, 
-% \opt{chapfont=smallcaps}, \opt{secfont=smallcaps} 
+% \opt{chapfont=smallcaps},\\ \opt{secfont=smallcaps}, 
 % \opt{subsecfont=italic} and \opt{chaptstyle=elements} options.
 % \end{valuelist}% \end{optionlist}
 %
@@ -668,7 +698,7 @@
 % 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 
+% If you don't need the copyright notice, leave the second argument of 
 % the command empty:
 % \begin{ttquote}
 % \cmd{colophon\oarm{OS}\{\}\arm{additional info}}
@@ -680,7 +710,7 @@
 % \begin{ttquote}
 % \cmd{author}\{\meta{Name Surname}\\
 % \cmd{thanks}\{This work has been typeset with \cmd{LaTeX},\\
-% using the  \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\}
+% using the  \cmd{textsf}\{suftesi\} class by Ivan Valbusa\}.\}
 % \end{ttquote}
 %
 % \cmditem{bookcolophon}{copyright notice}{attribution notice and 
@@ -694,7 +724,7 @@
 % \begin{ttquote}
 % \cmd{bookcolophon}\{Copyright © 2007 by Ivan Valbusa\}\{%\\
 % This work has been typeset with \cmd{LaTeX},  using the 
-% \cmd{sty}\{suftesi\} class by Ivan Valbusa\cmd{index}\{Valbusa, 
+% \cmd{sty}\{suftesi\} class\\ by Ivan Valbusa\cmd{index}\{Valbusa, 
 % Ivan\}. The normal font  is Palatino by \\
 % Hermann Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.\}
 % \end{ttquote}
@@ -707,9 +737,9 @@
 %
 % \begin{ttquote}
 % \cmd{artcolophon}\{\\
-% This work is licensed under the Creative Commons\\ 
-% Attribution-NonCommercial-NoDerivs 3.0 Unported License. To view
-% a copy of this license, visit\\
+% This work is licensed under the Creative Commons \\
+% Attribution-NonCommercial-NoDerivs 3.0 Unported License. \\
+% To view a copy of this license, visit\\
 %
 % \cmd{begin}\{center\}\\
 % \cmd{texttt}{http://creativecommons.org/licenses/by-nc-nd/3.0/}\\
@@ -753,7 +783,7 @@
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
 % Sets the font of the chapter number of \opt{style=elements} 
 % and  \opt{style=sufelements} styles. 
-% The default is ``\texttt{pplj}'' (\LaTeX) or ``Junicode''  (\XeLaTeX). 
+% The default is ``\texttt{pplj}'' (\LaTeX) or ``Junicode''  (\XeLaTeX):
 % \begin{ttquote}
 % \cmd{chapnumfont}\{pplj\}\\
 % \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Junicode\}\}
@@ -778,27 +808,23 @@
 % symbols instead of numbers to mark footnotes. It does not
 % increment the footnote counter.
 % \begin{ttquote}
-% \cmd{xfootnote}\{\cmd{dagger}\}\{The text of the footnote.\}
+% \cmd{xfootnote}\{\cmd{dagger}\}\{Footnote text.\}
 % \end{ttquote}
 % \end{ltxsyntax}
 %
-% \subsection{Obsolete options}
-%
+% \section*{Obsolete options}\nobreak
 % \begin{multicols}{2}
 % \footnotesize
 % \begin{ltxsyntax}
 % \optitem{defaultparindent}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{defaultparindent}} 
-% $\rightarrow$ \opt{parindent=compact}.
+% $\rightarrow$ \opt{parindent=compact}
 % \optitem{ralignquotation}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{ralignquotation}}
-% $\rightarrow$ \opt{quotestyle=right}
+%$\rightarrow$ \opt{quotestyle=right}
 % \optitem{smallquotation}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{smallquotation}} 
 % $\rightarrow$ \opt{quotesize=small}
-% \optitem{standardfootnote} 
-% \changes{v0.9a}{2012/08/31}{New option \opt{standardfootnote}}
-% $\rightarrow$ \opt{footnotes=superscript}
 % \optitem{dottedfootnote}
 % \changes{v0.9a}{2012/08/31}{New option \opt{dottedfootnote}}
 % $\rightarrow$ \opt{footnotes=dot}
@@ -808,71 +834,68 @@
 % \optitem{alignlist} 
 %  \changes{v0.9a}{2012/08/31}{New option \opt{alignlist}} 
 % $\rightarrow$ \opt{liststyle=aligned}
-% \optitem{artemisia} $\rightarrow$ \opt{greekfont=artemisia}.
-% \optitem{porson} $\rightarrow$ \opt{greekfont=porson}.
-% \optitem{defaultgreek} $\rightarrow$ \opt{greekfont=cbgreek}.
+% \optitem{artemisia} $\rightarrow$ \opt{greekfont=artemisia}
+% \optitem{porson} $\rightarrow$ \opt{greekfont=porson}
+% \optitem{defaultgreek} $\rightarrow$ \opt{greekfont=cbgreek}
 % \optitem{defaultfont} 
-% $\rightarrow$ \opt{defaultfont=cm}.
+% $\rightarrow$ \opt{defaultfont=standard}
 % \optitem{centerpart}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{centerpart}} 
-% $\rightarrow$ \opt{partstyle=center}.
+% $\rightarrow$ \opt{partstyle=center}
 % \optitem{centerchap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{centerchap}} 
-% $\rightarrow$ \opt{chapstyle=center}.
+% $\rightarrow$ \opt{chapstyle=center}
 % \optitem{centersec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{centersec}} 
-% $\rightarrow$ \opt{secstyle=center}.
+% $\rightarrow$ \opt{secstyle=center}
 % \optitem{rightpart}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{rightpart}} 
-% $\rightarrow$ \opt{partstyle=right}.
+% $\rightarrow$ \opt{partstyle=right}
 % \optitem{rightchap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{rightchap}} 
-% $\rightarrow$ \opt{chapstyle=right}.
+% $\rightarrow$ \opt{chapstyle=right}
 % \optitem{rightsec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{rightsec}} 
-% $\rightarrow$ \opt{secstyle=right}.
+% $\rightarrow$ \opt{secstyle=right}
 % \optitem{numparpart}
 % \changes{v0.9a}{2012/08/31}{New option \opt{numparpart}} 
-% $\rightarrow$ \opt{partnumposition=above}.
+% $\rightarrow$ \opt{partnumposition=above}
 % \optitem{numparchap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{numparchap}} 
-% $\rightarrow$ \opt{chapnumposition=above}.
+% $\rightarrow$ \opt{chapnumposition=above}
 % \optitem{numparsec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{numparsec}} 
-% $\rightarrow$ \opt{secnumposition=above}.
+% $\rightarrow$ \opt{secnumposition=above}
 % \optitem{smallcapspart}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapspart}} 
-% $\rightarrow$ \opt{partstyle=smallcaps}.
+% $\rightarrow$ \opt{partstyle=smallcaps}
 % \optitem{smallcapschap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapschap}} 
-% $\rightarrow$ \opt{chapstyle=smallcaps}.
+% $\rightarrow$ \opt{chapstyle=smallcaps}
 % \optitem{smallcapssec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapssec}} 
-% $\rightarrow$ \opt{subsecstyle=smallcaps}.
+% $\rightarrow$ \opt{subsecstyle=smallcaps}
 % \optitem{italicpart}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{italicpart}} 
-% $\rightarrow$ \opt{partstyle=italic}.
+% $\rightarrow$ \opt{partstyle=italic}
 % \optitem{italicchap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{italicchap}} 
-% $\rightarrow$ \opt{chapsecstyle=italic}.
+% $\rightarrow$ \opt{chapsecstyle=italic}
 % \optitem{italicsec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{italicsec}} 
-% $\rightarrow$ \opt{secstyle=italic}.
+% $\rightarrow$ \opt{secstyle=italic}
 % \optitem{italicsubsec}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{italicsubsec}}
-% $\rightarrow$ \opt{subsecstyle=italic}.
+% $\rightarrow$ \opt{subsecstyle=italic}
 % \optitem{romanchapnum}
 % \changes{v0.9a}{2012/08/31}{New option \opt{romanchap}} 
-% $\rightarrow$ \opt{chapnumstyle=roman}.
+% $\rightarrow$ \opt{chapnumstyle=roman}
 % \optitem{dottedchap}
 %  \changes{v0.9a}{2012/08/31}{New option \opt{dottedchap}}
-% $\rightarrow$ \opt{chapnumstyle}.
+% $\rightarrow$ \opt{chapnumstyle}
 % \optitem{italicheader} 
 %  \changes{v0.9a}{2012/08/31}{New option \opt{italicheader}} 
-% $\rightarrow$ \opt{headerfont=italic}.
-% \optitem{smallcapsheader}
-%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapsheader}} 
-% $\rightarrow$ \opt{headerfont=smallcaps}.
+% $\rightarrow$ \opt{headerfont=italic}
 % \optitem{centerheader}
 % $\rightarrow$ \opt{headerstyle=center}
 % \optitem{sufplain}
@@ -903,10 +926,10 @@
 % $\rightarrow$ \opt{partnumstyle=dotarabic}
 % \optitem{elements} 
 % \changes{v0.5}{2011/10/21}{New option \opt{elements}}
-% $\rightarrow$ \opt{documentstructure=elements}
+% $\rightarrow$ \opt{style=elements}
 % \optitem{nomarginpar}
 % \changes{v0.5}{2011/10/21}{New option \opt{nomarginpar}}
-% $\rightarrow$ \opt{marginpar=false}.
+% $\rightarrow$ \opt{marginpar=false}
 % \optitem{nocrop} 
 % \changes{v0.5}{2011/10/21}{New option \opt{nocrop}}
 % $\rightarrow$ \opt{crop=false}
@@ -922,9 +945,17 @@
 % \optitem{sufelements} 
 % \changes{v0.5}{2011/10/21}{New option \opt{sufelements}}
 % An old name for \opt{style=sufelements}
+% \optitem{standardfootnote} 
+% \changes{v0.9a}{2012/08/31}{New option \opt{standardfootnote}}
+% $\rightarrow$ \opt{footnotes=superscript}
+% \optitem{smallcapsheader}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapsheader}} 
+% $\rightarrow$ \opt{headerfont=smallcaps}
 % \end{ltxsyntax}
 % \end{multicols}
-% \appendix
+%
+% \specialsection{Pre-defined styles}
+%
 % \label{predefined-styles}
 % \includepdf[pages=1-]{collect-examples}
 % \defbibnote{note}{\sffamily This bibliography has been typeset with 
@@ -933,11 +964,12 @@
 % \printbibliography[prenote=note]
 %
 % \StopEventually{\PrintChanges\PrintIndex}
+% \newgeometry{margin=1.5cm,left=4.7cm,top=1cm}
 % \section{The Code}
 %<*class>
 %    \begin{macrocode}
 \RequirePackage{xkeyval}
-\newif\ifsuftesi@cmfont 
+\newif\ifsuftesi@standardfont 
 \newif\ifsuftesi@porson 
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
@@ -963,18 +995,25 @@
 \newif\ifsuftesi@elementsheader
 \newif\ifsuftesi@elementsstructure
 \newif\ifsuftesi@elementspagelayout
-\newif\ifsuftesi@bozza
+\newif\ifsuftesi@draftdate
 \newif\ifsuftesi@fewfootnotes
 \newif\ifsuftesi@partpage
+\DeclareOption{a5paper}{%
+  \ClassWarningNoLine{suftesi}{Option 'a5paper' not available}}
+\DeclareOption{b5paper}{%
+  \ClassWarningNoLine{suftesi}{Option 'b5paper' not available}}
+\DeclareOption{legalpaper}{%
+  \ClassWarningNoLine{suftesi}{Option 'legalpaper' not available}}
+\DeclareOption{executivepaper}{%
+  \ClassWarningNoLine{suftesi}{Option 'executivepaper' not available}}
+\DeclareOption{landscape}{%
+  \ClassWarningNoLine{suftesi}{Option 'landscape' not available}}
 %    \end{macrocode}
-% Execute options:
+% \sty{suftesi} is based on the standard \sty{book} class!
 %    \begin{macrocode}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}   
 \ProcessOptions
 \relax
-%    \end{macrocode}
-% \sty{suftesi} is based on the standard \sty{book} class!
-%    \begin{macrocode}
 \LoadClass{book} 
 %    \end{macrocode}
 % \subsection{Document srtucture}
@@ -1138,11 +1177,7 @@
 % \subsection{Sections font}
 % These macros control the style of part, chapter, section,
 % subsection and subsubsection levels.
-% \DescribeMacro{\SUF@PART@StyleSwitch}
-% \DescribeMacro{\SUF@CHAP@StyleSwitch}
-% \DescribeMacro{\SUF@SEC@StyleSwitch}
-% \DescribeMacro{\SUF@SUBSEC@StyleSwitch}
-% \DescribeMacro{\SUF@SUBSUBSEC@StyleSwitch}
+% \DescribeMacro{\SUF@<level>@StyleSwitch}
 %    \begin{macrocode}
 \define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1212,7 +1247,8 @@
 %    \end{macrocode}
 % \subsubsection{Chapter number style}
 %    \begin{macrocode}
-\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
+dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
@@ -1400,7 +1436,6 @@
 \define@choicekey{}{marginpar}[\val\nr]
     {true,false}[true]{%
 \ifcase\nr\relax
-  \relax
 \or   
   \renewcommand\marginpar[2][]{}
 \fi}
@@ -1433,7 +1468,7 @@
     palatino,standard}[palatino]{%
 \ifcase\nr\relax
 \or
-  \suftesi@cmfonttrue
+  \suftesi@standardfonttrue
   \setkeys{suftesi.cls}{greekfont=cbgreek}
 \fi}
 %    \end{macrocode}
@@ -1445,6 +1480,7 @@
 	\def\SUF@greekfamily{artemisiaeuler}
 \or
 	\def\SUF@greekfamily{porson}
+	\suftesi@porsontrue
 \or
 	\def\SUF@greekfamily{lmr}
 \fi}
@@ -1478,23 +1514,23 @@
   \suftesi@nocroptrue
 \fi}
 %    \end{macrocode}
-% \subsubsection{Titlepage}
+% \subsubsection{Draftdate}
 %    \begin{macrocode}
-\define@choicekey{}{titlepage}[\val\nr]
+\define@choicekey{}{draftdate}[\val\nr]
     {true,false}[true]{%
 \ifcase\nr\relax
-  \@titlepagetrue
+  \suftesi@draftdatetrue
 \or
-  \@titlepagetrue
 \fi}
 %    \end{macrocode}
-% \subsubsection{Bozza}
+% \subsubsection{Titlepage}
 %    \begin{macrocode}
-\define@choicekey{}{bozza}[\val\nr]
+\define@choicekey{}{titlepage}[\val\nr]
     {true,false}[true]{%
 \ifcase\nr\relax
-  \suftesi@bozzatrue
+  \@titlepagetrue
 \or
+  \@titlepagefalse
 \fi}
 %    \end{macrocode}
 % \subsubsection{Pre-defined styles}
@@ -1605,8 +1641,8 @@
 % Execute and process options:
 %    \begin{macrocode}
 \ExecuteOptionsX<>{
-  marginpar=true,
   captionstyle=standard,
+  marginpar=true,
   parindent=compact,
   tocstyle=standard,
   greekfont=artemisia,
@@ -1632,6 +1668,44 @@
   chapnumstyle=arabic}
 \ProcessOptionsX<>\relax
 %    \end{macrocode}
+% Some \meta{key}=\meta{value} options defined using \sty{xkeyval}
+% produce the message of ``Unused global options''. So we use the 
+% \cmd{XKV@useoption} command which delete the option given as 
+% argument from the list stored in \cmd{@unusedoptionlist}:
+%    \begin{macrocode}
+\XKV@useoption{style=roman1}         \XKV@useoption{style=roman2}
+\XKV@useoption{style=roman3}         \XKV@useoption{style=roman4}
+\XKV@useoption{style=roman5}         \XKV@useoption{style=roman6}
+\XKV@useoption{style=italic1}        \XKV@useoption{style=italic2}
+\XKV@useoption{style=italic3}        \XKV@useoption{style=italic4}
+\XKV@useoption{style=italic5}        \XKV@useoption{style=italic6}
+\XKV@useoption{style=italic7}        \XKV@useoption{style=italic8}
+\XKV@useoption{style=italic9}        \XKV@useoption{style=italic10}
+\XKV@useoption{style=italic11}       \XKV@useoption{style=italic12}
+\XKV@useoption{style=smallcaps1}     \XKV@useoption{style=smallcaps2}
+\XKV@useoption{style=smallcaps3}     \XKV@useoption{style=smallcaps4}
+\XKV@useoption{style=smallcaps5}     \XKV@useoption{style=smallcaps6}
+\XKV@useoption{style=smallcaps7}     \XKV@useoption{style=smallcaps8}
+\XKV@useoption{style=smallcaps9}     \XKV@useoption{style=smallcaps10}
+\XKV@useoption{style=smallcaps11}    \XKV@useoption{style=smallcaps12}
+\XKV@useoption{style=elements}       \XKV@useoption{style=sufelements}
+\XKV@useoption{captionstyle=standard}\XKV@useoption{captionstyle=elements}
+\XKV@useoption{pagelayout=standard}  \XKV@useoption{pagelayout=periodical}  
+\XKV@useoption{pagelayout=compact}   \XKV@useoption{pagelayout=supercompact}
+\XKV@useoption{pagelayout=elements}
+\XKV@useoption{liststyle=bulged}     \XKV@useoption{liststyle=indented}
+\XKV@useoption{liststyle=aligned}
+\XKV@useoption{10pt}                 \XKV@useoption{11pt}
+\XKV@useoption{12pt}
+\XKV@useoption{oneside}              \XKV@useoption{twoside}
+\XKV@useoption{onecolumn}            \XKV@useoption{twocolumn}
+\XKV@useoption{titlepage}            \XKV@useoption{notitlepage}
+\XKV@useoption{openright}            \XKV@useoption{openany}
+\XKV@useoption{leqno}                \XKV@useoption{fleqn}
+\XKV@useoption{a5paper}              \XKV@useoption{b5paper}
+\XKV@useoption{legalpaper}           \XKV@useoption{executivepaper}
+\XKV@useoption{landscape}
+%    \end{macrocode}
 % \subsection{Basic packages}
 %    \begin{macrocode}
 \RequirePackage{color}
@@ -1640,18 +1714,19 @@
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
-\RequirePackage{ifxetex,ifluatex}
+\RequirePackage{ifxetex}
 %    \end{macrocode}
 % \subsection{Greek fonts}
-% Thanks to Enrico Gregorio for these macros:
+% Thanks to Claudio Beccari and Enrico Gregorio for these macros:
 %    \begin{macrocode}
 \ifxetex
-   \relax
-      \else
+  \relax
+    \else
 \RequirePackage{microtype}
 \RequirePackage[LGR,T1]{fontenc}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
-\ifsuftesi@cmfont
+\ifsuftesi@standardfont
+     \RequirePackage{lmodern}
   \relax
    \else
      \RequirePackage[osf,sc]{mathpazo}
@@ -1662,11 +1737,19 @@
 % Scale the Porson font:
 %    \begin{macrocode}
 \ifsuftesi@porson
-	\sbox\z@{\fontsize{10}{10}\normalfont A} 
-	\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A} 
-	\dimen@= 
-	\dimexpr(0.001\dimexpr\numexpr(\dimexpr(1000\ht\z@)/\ht\tw@)\p@) 
-	\edef\art@scale{\strip@pt\dimen@} 
+%	\sbox\z@{\fontsize{10}{10}\normalfont A} 
+%	\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
+%	\dimen@=\dimexpr \p@*\ht\z@/\ht\tw@ \relax
+%	\edef\art@scale{\strip@pt\dimen@} 
+\sbox\z@{\fontsize{10}{10}\normalfont A}
+\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
+\dimen@=\dimexpr \p@*\ht\z@/\ht\tw@\relax
+\sbox\z@{\normalfont\fontsize{10}{10}\selectfont a}
+\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp a}
+\dimen2=\dimexpr \p@*\ht\z@/\ht\tw@\relax
+\dimen4= 0.6\p@
+\dimen@=\dimexpr \dimen@ - \dimen4*\dimen@/\p@+\dimen4*\dimen2/\p@\relax
+\edef\art@scale{\strip@pt\dimen@}
 	\DeclareFontFamily{LGR}{porson}{} 
 	\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{} 
 	\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{} 
@@ -1681,8 +1764,8 @@
    \fi
 \AtBeginDocument{
   \DeclareRobustCommand{\greektext}{%
-    \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont
-    \def\encodingdefault{LGR}}}
+    \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}}%
+    \DeclareTextFontCommand{\textgreek}{\greektext}}
 \fi
 %    \end{macrocode}
 % \subsection{Page layout}
@@ -2089,7 +2172,9 @@
 %    \end{macrocode}
 % \DescribeMacro{\standardtitle} Reproduces the standard |\maketitle| style:
 %    \begin{macrocode}
-\let\standardtitle\maketitle
+%    \end{macrocode}
+% For |notitlepage| option:
+%    \begin{macrocode}
 %    \end{macrocode}
 % \DescribeMacro{\maketitle} 
 % For |titlepage| (default) option:
@@ -2134,8 +2219,34 @@
   \global\let\@thanks\@empty
      \global\let\@date\@empty
   \global\let\date\relax
-  \global\let\and\relax
-}
+  \global\let\and\relax}
+\newcommand\standardtitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@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\@date\@empty
+  \global\let\date\relax
+  \global\let\and\relax}
 \else
 %    \end{macrocode}
 % For |notitlepage| option:
@@ -2198,6 +2309,52 @@
    \end{center}%
    \par
    \vskip 1.5em}
+\newcommand\standardtitle{\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
+        \@standardmaketitle
+      \else
+        \twocolumn[\@standardmaketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@standardmaketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+   \setcounter{footnote}{0}%
+   \global\let\thanks\relax
+   \global\let\maketitle\relax
+   \global\let\@standardmaketitle\relax
+   \global\let\@thanks\@empty
+   \global\let\@date\@empty
+   \global\let\date\relax
+   \global\let\and\relax}
+\def\@standardmaketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+  \begin{center}%
+  \let \footnote \thanks
+    {\LARGE \@title \par}%
+    \vskip 1.5em%
+    {\large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \@date}%
+  \end{center}%
+  \par
+  \vskip 1.5em}
 \fi
 %    \end{macrocode}
 % \subsection{Frontispiece}
@@ -2373,7 +2530,7 @@
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
  \fancyfoot[RE,LO]{%
-   \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+   \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
  \fancyfoot[C]{\footnotesize\SUF@thepage}}
 %    \end{macrocode}
 % \paragraph{The \opt{centerheader} style}
@@ -2381,7 +2538,7 @@
 \fancypagestyle{centerheader}{%
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
-    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+    \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
   \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark} 
   \fancyhead[CE]{\footnotesize\xheadbreakfalse%
     \SUF@LR@MarkSwitch} 
@@ -2393,7 +2550,7 @@
 \fancypagestyle{sufdefault}{%
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
-    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+    \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
   \fancyhead[LE,RO]{\footnotesize\SUF@thepage} 
   \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
   \fancyhead[RE]{\footnotesize\xheadbreakfalse%
@@ -3095,7 +3252,8 @@
 \frenchspacing
 %    \end{macrocode}
 %</class>
-%
+% \vfill
+% \restoregeometry
 % \iffalse
 %<*bib>
 @book{Morison:1111,
@@ -3804,49 +3962,79 @@ style=sufelements,crop=false]{suftesi}
 \usepackage[margin=1cm]{geometry}
 \parindent0pt
 \pagestyle{empty}
-\newcommand{\inputex}[1]{%
+\newcommand{\inputex}[2]{%
 \vbox{\centering
-  \fbox{\includegraphics[width=.95\textwidth]{#1.pdf}}\\
+  \fbox{\includegraphics[width=#1\textwidth]{#2.pdf}}\\
     \begin{picture}(0,0)
       \put (-185,90) {%
-        \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#1}}}}
+        \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#2}}}}
     \end{picture}}
 }
-\setcounter{chapter}{2}
 \begin{document}
-\inputex{style-roman1}
-\inputex{style-roman2}
-\inputex{style-roman3}
-\inputex{style-roman4}
-\inputex{style-roman5}
-\inputex{style-roman6}
-\inputex{style-italic1}
-\inputex{style-italic2}
-\inputex{style-italic3}
-\inputex{style-italic4}
-\inputex{style-italic5}
-\inputex{style-italic6}
-\inputex{style-italic7}
-\inputex{style-italic8}
-\inputex{style-italic9}
-\inputex{style-italic10}
-\inputex{style-italic11}
-\inputex{style-italic12}
-\inputex{style-smallcaps1}
-\inputex{style-smallcaps2}
-\inputex{style-smallcaps3}
-\inputex{style-smallcaps4}
-\inputex{style-smallcaps5}
-\inputex{style-smallcaps6}
-\inputex{style-smallcaps7}
-\inputex{style-smallcaps8}
-\inputex{style-smallcaps9}
-\inputex{style-smallcaps10}
-\inputex{style-smallcaps11}
-\inputex{style-smallcaps12}
-\inputex{style-elements}
-\inputex{style-sufelements}
+\inputex{.95}{style-roman1}
+\inputex{.95}{style-roman2}
+\inputex{.95}{style-roman3}
+\inputex{.95}{style-roman4}
+\inputex{.95}{style-roman5}
+\inputex{.95}{style-roman6}
+\inputex{.95}{style-italic1}
+\inputex{.95}{style-italic2}
+\inputex{.95}{style-italic3}
+\inputex{.95}{style-italic4}
+\inputex{.95}{style-italic5}
+\inputex{.95}{style-italic6}
+\inputex{.95}{style-italic7}
+\inputex{.95}{style-italic8}
+\inputex{.95}{style-italic9}
+\inputex{.95}{style-italic10}
+\inputex{.95}{style-italic11}
+\inputex{.95}{style-italic12}
+\inputex{.95}{style-smallcaps1}
+\inputex{.95}{style-smallcaps2}
+\inputex{.95}{style-smallcaps3}
+\inputex{.95}{style-smallcaps4}
+\inputex{.95}{style-smallcaps5}
+\inputex{.95}{style-smallcaps6}
+\inputex{.95}{style-smallcaps7}
+\inputex{.95}{style-smallcaps8}
+\inputex{.95}{style-smallcaps9}
+\inputex{.95}{style-smallcaps10}
+\inputex{.95}{style-smallcaps11}
+\inputex{.95}{style-smallcaps12}
+\inputex{.8}{style-elements}
+\inputex{.95}{style-sufelements}
 \end{document}
 %</collect-examples>
 % \fi
+% \iffalse
+%<*frontespizio>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = pdfLaTeX
+\documentclass [titlepage]{article}
+\usepackage[utf8]{inputenc}
+\usepackage [a4paper,textwidth=312pt,includehead,textheight=624pt,right=90pt,vmarginratio=1:2]{geometry}
+\usepackage {graphicx}
+\usepackage [svgnames]{xcolor}
+\usepackage[nowrite,infront,suftesi]{frontespizio}
+\nofiles 
+\fontoptionnormal 
+\Logo [1.5cm]{fakelogo}
+\Istituzione {University of St.\ Anford}
+\Divisione {Department of Typography}
+\Scuola {Ph.D. degree in \TeX {} and \LaTeX {}}
+\Titolo {How to prepare a\\ formal frontispiece}
+\Sottotitolo {Theory and practice}
+\NCandidato {Candidate}
+\Candidato {Enrico Gregorio}
+\NRelatore {Thesis advisor}{}
+\Relatore {Prof. R. J. Drofnats}
+\NCorrelatore {Research supervisor}{Research supervisors}
+\Correlatore {J. H. Quick}
+\Correlatore {B. L. User}
+\Piede {Thesis submitted in 2010}
+\begin {document}
+\preparefrontpagesuftesi
+\end {document}
+%</frontespizio>
+% \fi
 % \Finale
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
index d99933b08dc..46a4329b7cf 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
@@ -79,6 +79,7 @@
    \file{style-elements.tex}{\from{suftesi.dtx}{style-elements}}
    \file{style-sufelements.tex}{\from{suftesi.dtx}{style-sufelements}}
    \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
+   \file{frontespizio.tex}{\from{suftesi.dtx}{frontespizio}}
  }
 
 \Msg{***********************************************************}