suftesi (31aug12)

git-svn-id: svn://tug.org/texlive/trunk@27575 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2012-09-02 22:45:43 +0000
committer: Karl Berry <karl@freefriends.org> 2012-09-02 22:45:43 +0000
commit: 5842ef917f7cbd5553126d78cfab16ebb0ca4e8f (patch)
tree: 9f1c9b817708fe6f63ef5de02adeeb7e976f61bb /Master
parent: 2878c13fb8496ecd8f401ed4102176941c485292 (diff)
19 files changed, 7783 insertions, 1171 deletions
diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README
index d04d04695cf..ac0118a75f3 100644
--- a/Master/texmf-dist/doc/latex/suftesi/README
+++ b/Master/texmf-dist/doc/latex/suftesi/README
@@ -60,17 +60,55 @@ DOCUMENTATION:
 
 To reproduce the complete documentation, follow these steps
 
+$ latex suftesi.ins
+$ mpost fakelogo.mp
+$ epstopdf --hires fakelogo.mps
 $ pdflatex suftesi.dtx
-$ bibtex suftesi
+$ pdflatex suftesi-frn.tex
+$ biber suftesi
 $ makeindex -s gind.ist -o suftesi.ind suftesi.idx
 $ makeindex -s gglo.ist -o suftesi.gls suftesi.glo
+$ xelatex rmstyle1.tex
+$ xelatex rmstyle2.tex
+$ xelatex rmstyle3.tex
+$ xelatex rmstyle4.tex
+$ xelatex rmstyle5.tex
+$ xelatex rmstyle6.tex
+$ xelatex itstyle1.tex
+$ xelatex itstyle2.tex
+$ xelatex itstyle3.tex
+$ xelatex itstyle4.tex
+$ xelatex itstyle5.tex
+$ xelatex itstyle6.tex
+$ xelatex itstyle7.tex
+$ xelatex itstyle8.tex
+$ xelatex itstyle9.tex
+$ xelatex itstyle10.tex
+$ xelatex itstyle11.tex
+$ xelatex itstyle12.tex
+$ xelatex scstyle1.tex
+$ xelatex scstyle2.tex
+$ xelatex scstyle3.tex
+$ xelatex scstyle4.tex
+$ xelatex scstyle5.tex
+$ xelatex scstyle6.tex
+$ xelatex scstyle7.tex
+$ xelatex scstyle8.tex
+$ xelatex scstyle9.tex
+$ xelatex scstyle10.tex
+$ xelatex scstyle11.tex
+$ xelatex scstyle12.tex
+$ pdflatex collect-examples.tex
 $ pdflatex suftesi.dtx
 $ pdflatex suftesi.dtx
 
 from a shell (or in the preferred method for you system),
-where "pdflatex" can be also "xelatex", and the `$' stands
-for the shell's prompt.
+where `$' stands for the shell's prompt.
+You can also use, on Unix systems,
+the automated script suftesi.sh by
 
+$ sh suftesi.sh
 
-2012/12/25
+
+2012/08/28
 Ivan Valbusa
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex
new file mode 100644
index 00000000000..4122cafe34a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex
@@ -0,0 +1,27 @@
+%% This file has been automatically generated by `frontespizio'.
+%% Don't use it as a model for a new frontispiece, use the
+%% `frontespizio' environment in you document instead.
+\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 
+\Universita {Paperopoli}
+\Logo [1.5cm]{logo}
+\Facolta {Pennutologia}
+\Corso [Laurea Magistrale]{Belle Lettere}
+\Annoaccademico {2030--2031}
+\Titoletto {Tesi di laurea magistrale}
+\Titolo {La mia tesi:\\ una lunga serie di risultati\\ difficilissimi e complicatissimi}
+\Sottotitolo {Alcune considerazioni mutevoli}
+\Candidato [PP999999]{Paperino Paolino}
+\Relatore {Giovanni Episcopo}
+\Relatore {Pippo Cluvio}
+\Correlatore {Ugo Frogio}
+\Correlatore {Ubaldo Kutuzu}
+\begin {document}
+\preparefrontpagesuftesi
+\end {document}
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux b/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux
new file mode 100644
index 00000000000..9b11e536db6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux
@@ -0,0 +1,117 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\catcode`"\active
+\providecommand\HyperFirstAtBeginDocument{\AtBeginDocument}
+\HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined
+\global\let\oldcontentsline\contentsline
+\gdef\contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
+\global\let\oldnewlabel\newlabel
+\gdef\newlabel#1#2{\newlabelxx{#1}#2}
+\gdef\newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
+\AtEndDocument{\ifx\hyper@anchor\@undefined
+\let\contentsline\oldcontentsline
+\let\newlabel\oldnewlabel
+\fi}
+\fi}
+\global\let\hyper@last\relax 
+\gdef\HyperFirstAtBeginDocument#1{#1}
+\providecommand\HyField@AuxAddToFields[1]{}
+\@writefile{toc}{\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax }
+\@writefile{lof}{\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax }
+\@writefile{lot}{\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax }
+\providecommand\mph@setcol[2]{}
+\select@language{italian}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\select@language{italian}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\select@language{italian}}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\select@language{italian}}
+\mph@setcol{ii:1}{\mph@nr}
+\mph@setcol{ii:2}{\mph@nr}
+\mph@setcol{ii:3}{\mph@nr}
+\mph@setcol{ii:4}{\mph@nr}
+\mph@setcol{ii:5}{\mph@nr}
+\mph@setcol{ii:6}{\mph@nr}
+\mph@setcol{ii:7}{\mph@nr}
+\mph@setcol{ii:8}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{Ringraziamenti}{9}{chapter*.4}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{Sigle}{9}{chapter*.4}}
+\mph@setcol{ii:9}{\mph@nr}
+\mph@setcol{ii:10}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{Introduzione}{11}{chapter*.5}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:11}{\mph@nr}
+\mph@setcol{ii:12}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {part}{I\hspace  {1em}uno}{13}{part.1}}
+\mph@setcol{ii:13}{\mph@nr}
+\mph@setcol{ii:14}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {1}Il primo capitolo della mia tesi}{15}{chapter.1}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{Introduzione}{15}{section*.6}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.1}Citazioni fuori testo e note}{15}{section.1.1}}
+\def\mph@nr{1}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.2}Documenti multilingua}{15}{section.1.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.2.1}Greco antico}{15}{subsection.1.2.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.2.2}Inglese}{15}{subsection.1.2.2}}
+\mph@setcol{ii:15}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.3}Citazioni}{16}{section.1.3}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.4}Elenchi puntati e numerati e descrizioni}{16}{section.1.4}}
+\newlabel{sec:elenchi}{{1.4}{16}{Elenchi puntati e numerati e descrizioni}{section.1.4}{}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.4.1}Elenchi puntati}{16}{subsection.1.4.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.4.2}Elenchi numerati}{16}{subsection.1.4.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.4.3}Descrizioni}{16}{subsection.1.4.3}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.5}Figure e tabelle}{16}{section.1.5}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.5.1}Inserimento delle figure}{16}{subsection.1.5.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.5.2}Inserimento di tabelle}{16}{subsection.1.5.2}}
+\newlabel{1@xvr}{{}{16}{Inserimento di tabelle}{subsection.1.5.2}{}}
+\newlabel{1@vr}{{}{16}{Inserimento di tabelle}{subsection.1.5.2}{}}
+\mph@setcol{ii:16}{\mph@nr}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\contentsline {figure}{\numberline {1.1}{\ignorespaces Donald Knuth e Laslie Lamport}}{17}{figure.caption.7}}
+\providecommand*\caption@xref[2]{\@setref\relax\@undefined{#1}}
+\newlabel{fig:knuth-lamport}{{1.1}{17}{Donald Knuth e Laslie Lamport}{figure.caption.7}{}}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\contentsline {table}{\numberline {1.1}{\ignorespaces Misure degli elementi della pagina}}{17}{table.caption.8}}
+\newlabel{tab:gabbia}{{1.1}{17}{Misure degli elementi della pagina}{table.caption.8}{}}
+\mph@setcol{ii:17}{\mph@nr}
+\mph@setcol{ii:18}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {2}Il secondo capitolo della mia tesi}{19}{chapter.2}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:19}{\mph@nr}
+\mph@setcol{ii:20}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {3}Il terzo capitolo della mia tesi}{21}{chapter.3}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:21}{\mph@nr}
+\mph@setcol{ii:22}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\ttl@change@i {\@ne }{part}{0em}{\addvspace {3ex}}{}{}{}\relax }
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\ttl@change@v {part}{}{}{\addvspace {1ex}}\relax }
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {part}{Appendici}{23}{chapter.3}}
+\mph@setcol{ii:23}{\mph@nr}
+\mph@setcol{ii:24}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\ttl@change@i {\@ne }{part}{0em}{\addvspace {3ex}\partname ~}{\makebox [\SUF@label@part ][l]{\thecontentslabel }\hspace *{1em}}{}{}\relax }
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\ttl@change@v {part}{}{}{\addvspace {1ex}}\relax }
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {A}Prima}{25}{appendix.A}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:25}{\mph@nr}
+\mph@setcol{ii:26}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {B}Seconda}{27}{appendix.B}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:27}{\mph@nr}
+\mph@setcol{ii:28}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {C}Terza}{29}{appendix.C}}
+\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
+\mph@setcol{ii:29}{\mph@nr}
+\mph@setcol{ii:30}{\mph@nr}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{Bibliografia}{31}{section*.9}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{Bibliografia primaria}{31}{section*.11}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{Bibliografia secondaria}{31}{section*.12}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{Indice dei nomi}{31}{section*.13}}
+\mph@setcol{ii:31}{\mph@nr}
+\gdef\mph@lastpage{32}
+\csname mph@do@warn\endcsname
+\ttl@finishall
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.bcf b/Master/texmf-dist/doc/latex/suftesi/example/tesi.bcf
new file mode 100644
index 00000000000..5203fe0e536
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.bcf
@@ -0,0 +1,2039 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bcf:controlfile version="2.0" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+  <!-- BIBER OPTIONS -->
+  <bcf:options component="biber" type="global">
+    <bcf:option type="singlevalued">
+      <bcf:key>bblencoding</bcf:key>
+      <bcf:value>utf8</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>bibencoding</bcf:key>
+      <bcf:value>utf8</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>debug</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>mincrossrefs</bcf:key>
+      <bcf:value>2</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>sortcase</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>sortfirstinits</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>sortupper</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+  </bcf:options>
+  <!-- BIBLATEX OPTIONS -->
+  <!-- GLOBAL -->
+  <bcf:options component="biblatex" type="global">
+    <bcf:option type="singlevalued">
+      <bcf:key>alphaothers</bcf:key>
+      <bcf:value>+</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>labelalpha</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="multivalued">
+      <bcf:key>labelnamespec</bcf:key>
+      <bcf:value order="1">shortauthor</bcf:value>
+      <bcf:value order="2">author</bcf:value>
+      <bcf:value order="3">shorteditor</bcf:value>
+      <bcf:value order="4">editor</bcf:value>
+      <bcf:value order="5">translator</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>labeltitle</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="multivalued">
+      <bcf:key>labeltitlespec</bcf:key>
+      <bcf:value order="1">shorttitle</bcf:value>
+      <bcf:value order="2">title</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>labeltitleyear</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>labelyear</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="multivalued">
+      <bcf:key>labelyearspec</bcf:key>
+      <bcf:value order="1">year</bcf:value>
+      <bcf:value order="2">eventyear</bcf:value>
+      <bcf:value order="3">origyear</bcf:value>
+      <bcf:value order="4">urlyear</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>maxalphanames</bcf:key>
+      <bcf:value>3</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>maxbibnames</bcf:key>
+      <bcf:value>999</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>maxcitenames</bcf:key>
+      <bcf:value>2</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>maxitems</bcf:key>
+      <bcf:value>3</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>minalphanames</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>minbibnames</bcf:key>
+      <bcf:value>999</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>mincitenames</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>minitems</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>singletitle</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>sortalphaothers</bcf:key>
+      <bcf:value>+</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>sortscheme</bcf:key>
+      <bcf:value>nyt</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>uniquelist</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>uniquename</bcf:key>
+      <bcf:value>2</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>useauthor</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>useeditor</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>useprefix</bcf:key>
+      <bcf:value>1</bcf:value>
+    </bcf:option>
+    <bcf:option type="singlevalued">
+      <bcf:key>usetranslator</bcf:key>
+      <bcf:value>0</bcf:value>
+    </bcf:option>
+  </bcf:options>
+  <!-- DISPLAYMODES -->
+  <bcf:displaymodes type="global">
+    <bcf:displaymode>
+      <bcf:dtarget>*</bcf:dtarget>
+      <bcf:dmode order="1">original</bcf:dmode>
+      <bcf:dmode order="2">romanised</bcf:dmode>
+      <bcf:dmode order="3">uniform</bcf:dmode>
+      <bcf:dmode order="4">translated</bcf:dmode>
+    </bcf:displaymode>
+  </bcf:displaymodes>
+  <!-- SOURCEMAP -->
+  <bcf:sourcemap>
+    <bcf:maps datatype="bibtex" driver_defaults="1">
+      <bcf:map>
+        <bcf:map_step map_type_source="conference" map_type_target="inproceedings"/>
+        <bcf:map_step map_type_source="electronic" map_type_target="online"/>
+        <bcf:map_step map_type_source="www" map_type_target="online"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_type_source="mastersthesis" map_type_target="thesis" map_final="1"/>
+        <bcf:map_step map_field_set="type" map_field_value="mathesis"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_type_source="phdthesis" map_type_target="thesis" map_final="1"/>
+        <bcf:map_step map_field_set="type" map_field_value="phdthesis"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_type_source="techreport" map_type_target="report" map_final="1"/>
+        <bcf:map_step map_field_set="type" map_field_value="techreport"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_field_source="address" map_field_target="location"/>
+        <bcf:map_step map_field_source="school" map_field_target="institution"/>
+        <bcf:map_step map_field_source="annote" map_field_target="annotation"/>
+        <bcf:map_step map_field_source="archiveprefix" map_field_target="eprinttype"/>
+        <bcf:map_step map_field_source="journal" map_field_target="journaltitle"/>
+        <bcf:map_step map_field_source="primaryclass" map_field_target="eprintclass"/>
+        <bcf:map_step map_field_source="key" map_field_target="sortkey"/>
+        <bcf:map_step map_field_source="pdf" map_field_target="file"/>
+      </bcf:map>
+    </bcf:maps>
+    <bcf:maps datatype="endnotexml" driver_defaults="1">
+      <bcf:map>
+        <bcf:map_step map_type_source="Aggregated Database" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Ancient Text" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Artwork" map_type_target="artwork"/>
+        <bcf:map_step map_type_source="Audiovisual Material" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Bill" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="Blog" map_type_target="online"/>
+        <bcf:map_step map_type_source="Book" map_type_target="book"/>
+        <bcf:map_step map_type_source="Book Section" map_type_target="inbook"/>
+        <bcf:map_step map_type_source="Case" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="Catalog" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Chart or Table" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Classical Work" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Computer Program" map_type_target="software"/>
+        <bcf:map_step map_type_source="Conference Paper" map_type_target="inproceedings"/>
+        <bcf:map_step map_type_source="Conference Proceedings" map_type_target="proceedings"/>
+        <bcf:map_step map_type_source="Dictionary" map_type_target="inreference"/>
+        <bcf:map_step map_type_source="Edited Book" map_type_target="collection"/>
+        <bcf:map_step map_type_source="Electronic Article" map_type_target="article"/>
+        <bcf:map_step map_type_source="Electronic Book" map_type_target="book"/>
+        <bcf:map_step map_type_source="Encyclopedia" map_type_target="reference"/>
+        <bcf:map_step map_type_source="Equation" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Figure" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Film or Broadcast" map_type_target="movie"/>
+        <bcf:map_step map_type_source="Government Document" map_type_target="report"/>
+        <bcf:map_step map_type_source="Grant" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Hearing" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="Journal Article" map_type_target="article"/>
+        <bcf:map_step map_type_source="Legal Rule or Regulation" map_type_target="legislation"/>
+        <bcf:map_step map_type_source="Magazine Article" map_type_target="article"/>
+        <bcf:map_step map_type_source="Manuscript" map_type_target="unpublished"/>
+        <bcf:map_step map_type_source="Map" map_type_target="misc"/>
+        <bcf:map_step map_type_source="Newspaper Article" map_type_target="article"/>
+        <bcf:map_step map_type_source="Online Database" map_type_target="online"/>
+        <bcf:map_step map_type_source="Online Multimedia" map_type_target="online"/>
+        <bcf:map_step map_type_source="Pamphlet" map_type_target="booklet"/>
+        <bcf:map_step map_type_source="Patent" map_type_target="patent"/>
+        <bcf:map_step map_type_source="Personal Communication" map_type_target="letter"/>
+        <bcf:map_step map_type_source="Report" map_type_target="report"/>
+        <bcf:map_step map_type_source="Serial" map_type_target="periodical"/>
+        <bcf:map_step map_type_source="Standard" map_type_target="standard"/>
+        <bcf:map_step map_type_source="Statute" map_type_target="legislation"/>
+        <bcf:map_step map_type_source="Thesis" map_type_target="thesis"/>
+        <bcf:map_step map_type_source="Unpublished Work" map_type_target="unpublished"/>
+        <bcf:map_step map_type_source="Web Page" map_type_target="online"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_field_source="electronic-resource-num" map_field_target="eprint"/>
+        <bcf:map_step map_field_source="alt-title" map_field_target="shorttitle"/>
+        <bcf:map_step map_field_source="meeting-place" map_field_target="venue"/>
+        <bcf:map_step map_field_source="pub-location" map_field_target="location"/>
+        <bcf:map_step map_field_source="orig-pub" map_field_target="origpublisher"/>
+        <bcf:map_step map_field_source="authors" map_field_target="author"/>
+        <bcf:map_step map_field_source="secondary-authors" map_field_target="editor"/>
+        <bcf:map_step map_field_source="tertiary-authors" map_field_target="commentator"/>
+        <bcf:map_step map_field_source="subsidiary-authors" map_field_target="translator"/>
+        <bcf:map_step map_field_source="year" map_field_target="date"/>
+        <bcf:map_step map_field_source="pub-dates" map_field_target="date"/>
+        <bcf:map_step map_field_source="num-vols" map_field_target="volumes"/>
+        <bcf:map_step map_field_source="call-num" map_field_target="library"/>
+        <bcf:map_step map_field_source="notes" map_field_target="note"/>
+        <bcf:map_step map_field_source="secondary-title" map_field_target="subtitle"/>
+        <bcf:map_step map_field_source="work-type" map_field_target="type"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Edited Book</bcf:per_type>
+        <bcf:map_step map_field_source="contributors/authors" map_field_target="contributors/editor"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Electronic Article</bcf:per_type>
+        <bcf:per_type>Journal Article</bcf:per_type>
+        <bcf:per_type>Magazine Article</bcf:per_type>
+        <bcf:per_type>Newspaper Article</bcf:per_type>
+        <bcf:map_step map_field_source="isbn" map_field_target="issn"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Patent</bcf:per_type>
+        <bcf:per_type>Report</bcf:per_type>
+        <bcf:per_type>Government Document</bcf:per_type>
+        <bcf:per_type>Legal Rule or Regulation</bcf:per_type>
+        <bcf:map_step map_field_source="isbn" map_field_target="number"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Blog</bcf:per_type>
+        <bcf:per_type>Online Database</bcf:per_type>
+        <bcf:per_type>Online Multimedia</bcf:per_type>
+        <bcf:per_type>Web Page</bcf:per_type>
+        <bcf:map_step map_field_source="titles/secondary-title" map_field_target="titles/title"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Book Section</bcf:per_type>
+        <bcf:map_step map_field_source="titles/secondary-title" map_field_target="titles/booktitle"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Book</bcf:per_type>
+        <bcf:per_type>Electronic Book</bcf:per_type>
+        <bcf:per_type>Manuscript</bcf:per_type>
+        <bcf:per_type>Unpublished Work</bcf:per_type>
+        <bcf:map_step map_field_source="titles/secondary-title" map_field_target="titles/series"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Conference Paper</bcf:per_type>
+        <bcf:per_type>Conference Proceedings</bcf:per_type>
+        <bcf:map_step map_field_source="titles/secondary-title" map_field_target="titles/eventtitle"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Electronic Article</bcf:per_type>
+        <bcf:per_type>Journal Article</bcf:per_type>
+        <bcf:per_type>Magazine Article</bcf:per_type>
+        <bcf:per_type>Newspaper Article</bcf:per_type>
+        <bcf:map_step map_field_source="titles/secondary-title" map_field_target="titles/journaltitle"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Book Section</bcf:per_type>
+        <bcf:map_step map_field_source="titles/tertiary-title" map_field_target="titles/booktitle"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:per_type>Conference Proceedings</bcf:per_type>
+        <bcf:per_type>periodical</bcf:per_type>
+        <bcf:map_step map_field_source="titles/tertiary-title" map_field_target="titles/series"/>
+      </bcf:map>
+    </bcf:maps>
+    <bcf:maps datatype="ris" driver_defaults="1">
+      <bcf:map>
+        <bcf:map_step map_type_source="ART" map_type_target="artwork"/>
+        <bcf:map_step map_type_source="BILL" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="BOOK" map_type_target="book"/>
+        <bcf:map_step map_type_source="CHAP" map_type_target="inbook"/>
+        <bcf:map_step map_type_source="COMP" map_type_target="software"/>
+        <bcf:map_step map_type_source="CONF" map_type_target="proceedings"/>
+        <bcf:map_step map_type_source="GEN" map_type_target="misc"/>
+        <bcf:map_step map_type_source="JFULL" map_type_target="article"/>
+        <bcf:map_step map_type_source="JOUR" map_type_target="article"/>
+        <bcf:map_step map_type_source="MGZN" map_type_target="misc"/>
+        <bcf:map_step map_type_source="MPCT" map_type_target="movie"/>
+        <bcf:map_step map_type_source="NEWS" map_type_target="misc"/>
+        <bcf:map_step map_type_source="PAMP" map_type_target="misc"/>
+        <bcf:map_step map_type_source="PAT" map_type_target="patent"/>
+        <bcf:map_step map_type_source="PCOMM" map_type_target="misc"/>
+        <bcf:map_step map_type_source="RPRT" map_type_target="report"/>
+        <bcf:map_step map_type_source="SER" map_type_target="misc"/>
+        <bcf:map_step map_type_source="SLIDE" map_type_target="misc"/>
+        <bcf:map_step map_type_source="SOUND" map_type_target="audio"/>
+        <bcf:map_step map_type_source="STAT" map_type_target="legal"/>
+        <bcf:map_step map_type_source="THES" map_type_target="thesis"/>
+        <bcf:map_step map_type_source="UNBILL" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="UNPB" map_type_target="unpublished"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_field_source="Y1" map_field_target="date"/>
+        <bcf:map_step map_field_source="PY" map_field_target="date"/>
+        <bcf:map_step map_field_source="Y2" map_field_target="eventdate"/>
+        <bcf:map_step map_field_source="A1" map_field_target="author"/>
+        <bcf:map_step map_field_source="AU" map_field_target="author"/>
+        <bcf:map_step map_field_source="A2" map_field_target="editor"/>
+        <bcf:map_step map_field_source="A3" map_field_target="editor"/>
+        <bcf:map_step map_field_source="ED" map_field_target="editor"/>
+        <bcf:map_step map_field_source="SPEP" map_field_target="pages"/>
+        <bcf:map_step map_field_source="N1" map_field_target="note"/>
+        <bcf:map_step map_field_source="N2" map_field_target="abstract"/>
+        <bcf:map_step map_field_source="AB" map_field_target="abstract"/>
+        <bcf:map_step map_field_source="JO" map_field_target="journaltitle"/>
+        <bcf:map_step map_field_source="JF" map_field_target="journaltitle"/>
+        <bcf:map_step map_field_source="JA" map_field_target="shortjournal"/>
+        <bcf:map_step map_field_source="VL" map_field_target="volume"/>
+        <bcf:map_step map_field_source="IS" map_field_target="issue"/>
+        <bcf:map_step map_field_source="CP" map_field_target="issue"/>
+        <bcf:map_step map_field_source="CY" map_field_target="location"/>
+        <bcf:map_step map_field_source="SN" map_field_target="isbn"/>
+        <bcf:map_step map_field_source="PB" map_field_target="publisher"/>
+        <bcf:map_step map_field_source="KW" map_field_target="keywords"/>
+        <bcf:map_step map_field_source="TI" map_field_target="title"/>
+        <bcf:map_step map_field_source="U1" map_field_target="usera"/>
+        <bcf:map_step map_field_source="U2" map_field_target="userb"/>
+        <bcf:map_step map_field_source="U3" map_field_target="userc"/>
+        <bcf:map_step map_field_source="U4" map_field_target="userd"/>
+        <bcf:map_step map_field_source="U5" map_field_target="usere"/>
+        <bcf:map_step map_field_source="UR" map_field_target="url"/>
+        <bcf:map_step map_field_source="L1" map_field_target="file"/>
+      </bcf:map>
+    </bcf:maps>
+    <bcf:maps datatype="zoterordfxml" driver_defaults="1">
+      <bcf:map>
+        <bcf:map_step map_type_source="conferencePaper" map_type_target="inproceedings"/>
+        <bcf:map_step map_type_source="bookSection" map_type_target="inbook"/>
+        <bcf:map_step map_type_source="journalArticle" map_type_target="article"/>
+        <bcf:map_step map_type_source="magazineArticle" map_type_target="article"/>
+        <bcf:map_step map_type_source="newspaperArticle" map_type_target="article"/>
+        <bcf:map_step map_type_source="encyclopediaArticle" map_type_target="inreference"/>
+        <bcf:map_step map_type_source="manuscript" map_type_target="unpublished"/>
+        <bcf:map_step map_type_source="document" map_type_target="misc"/>
+        <bcf:map_step map_type_source="dictionaryEntry" map_type_target="inreference"/>
+        <bcf:map_step map_type_source="interview" map_type_target="misc"/>
+        <bcf:map_step map_type_source="film" map_type_target="movie"/>
+        <bcf:map_step map_type_source="webpage" map_type_target="online"/>
+        <bcf:map_step map_type_source="note" map_type_target="misc"/>
+        <bcf:map_step map_type_source="attachment" map_type_target="misc"/>
+        <bcf:map_step map_type_source="bill" map_type_target="legislation"/>
+        <bcf:map_step map_type_source="case" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="hearing" map_type_target="jurisdiction"/>
+        <bcf:map_step map_type_source="statute" map_type_target="legislation"/>
+        <bcf:map_step map_type_source="email" map_type_target="letter"/>
+        <bcf:map_step map_type_source="map" map_type_target="image"/>
+        <bcf:map_step map_type_source="blogPost" map_type_target="online"/>
+        <bcf:map_step map_type_source="instantMessage" map_type_target="letter"/>
+        <bcf:map_step map_type_source="forumPost" map_type_target="online"/>
+        <bcf:map_step map_type_source="audioRecording" map_type_target="audio"/>
+        <bcf:map_step map_type_source="presentation" map_type_target="inproceedings"/>
+        <bcf:map_step map_type_source="videoRecording" map_type_target="video"/>
+        <bcf:map_step map_type_source="tvBroadcast" map_type_target="misc"/>
+        <bcf:map_step map_type_source="radioBroadcast" map_type_target="misc"/>
+        <bcf:map_step map_type_source="podcast" map_type_target="online"/>
+        <bcf:map_step map_type_source="computerProgram" map_type_target="software"/>
+      </bcf:map>
+      <bcf:map>
+        <bcf:map_step map_field_source="bib:contributors" map_field_target="author"/>
+        <bcf:map_step map_field_source="bib:authors" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:interviewers" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:directors" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:scriptwriters" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:bookAuthor" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:inventors" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:recipients" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:counsels" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:artists" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:podcasters" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:presenters" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:commenters" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:programers" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:composers" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:producers" map_field_target="author"/>
+        <bcf:map_step map_field_source="z:performers" map_field_target="author"/>
+        <bcf:map_step map_field_source="bib:editors" map_field_target="editor"/>
+        <bcf:map_step map_field_source="z:translators" map_field_target="translator"/>
+        <bcf:map_step map_field_source="z:seriesEditors" map_field_target="editor"/>
+        <bcf:map_step map_field_source="dc:date" map_field_target="date"/>
+        <bcf:map_step map_field_source="bib:pages" map_field_target="pages"/>
+        <bcf:map_step map_field_source="dc:title" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:proceedingsTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:encyclopediaTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:dictionaryTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:websiteTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:forumTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:blogTitle" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:nameOfAct" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:caseName" map_field_target="title"/>
+        <bcf:map_step map_field_source="z:meetingName" map_field_target="eventtitle"/>
+        <bcf:map_step map_field_source="prism:volume" map_field_target="volume"/>
+        <bcf:map_step map_field_source="numberOfVolumes" map_field_target="volumes"/>
+        <bcf:map_step map_field_source="z:numPages" map_field_target="pagetotal"/>
+        <bcf:map_step map_field_source="prism:edition" map_field_target="edition"/>
+        <bcf:map_step map_field_source="dc:description" map_field_target="note"/>
+        <bcf:map_step map_field_source="dc:alternative" map_field_target="shortjournal"/>
+        <bcf:map_step map_field_source="dcterms:abstract" map_field_target="abstract"/>
+        <bcf:map_step map_field_source="dc:type" map_field_target="type"/>
+        <bcf:map_step map_field_source="z:shortTitle" map_field_target="shorttitle"/>
+        <bcf:map_step map_field_source="z:bookTitle" map_field_target="booktitle"/>
+        <bcf:map_step map_field_source="prism:number" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:patentNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:codeNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:reportNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:billNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:documentNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:publicLawNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:applicationNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="z:episodeNumber" map_field_target="number"/>
+        <bcf:map_step map_field_source="dc:coverage" map_field_target="location"/>
+        <bcf:map_step map_field_source="z:university" map_field_target="institution"/>
+        <bcf:map_step map_field_source="z:language" map_field_target="language"/>
+        <bcf:map_step map_field_source="z:version" map_field_target="version"/>
+        <bcf:map_step map_field_source="z:libraryCatalog" map_field_target="library"/>
+        <bcf:map_step map_field_source="dcterms:isPartOf" map_field_target="BIBERCUSTOMpartof"/>
+        <bcf:map_step map_field_source="dc:identifier" map_field_target="BIBERCUSTOMidentifier"/>
+        <bcf:map_step map_field_source="dc:publisher" map_field_target="BIBERCUSTOMpublisher"/>
+        <bcf:map_step map_field_source="dc:presentedAt" map_field_target="BIBERCUSTOMpresentedat"/>
+        <bcf:map_step map_field_source="dc:subject" map_field_target="BIBERCUSTOMsubject"/>
+        <bcf:map_step map_field_source="dcterms:BIBERCUSTOMpartof/bib:Journal" map_field_target="dcterms:BIBERCUSTOMpartof/periodical"/>
+        <bcf:map_step map_field_source="dcterms:BIBERCUSTOMpartof/bib:Book" map_field_target="dcterms:BIBERCUSTOMpartof/book"/>
+        <bcf:map_step map_field_source="dcterms:BIBERCUSTOMpartof/bib:ConferenceProceedings" map_field_target="dcterms:BIBERCUSTOMpartof/proceedings"/>
+      </bcf:map>
+    </bcf:maps>
+  </bcf:sourcemap>
+  <!-- LABELALPHA TEMPLATE -->
+  <bcf:labelalphatemplate type="global">
+    <bcf:labelelement order="1">
+      <bcf:labelpart final="1">shorthand</bcf:labelpart>
+      <bcf:labelpart>label</bcf:labelpart>
+      <bcf:labelpart substring_width="3" substring_side="left" ifnamecount="1">labelname</bcf:labelpart>
+      <bcf:labelpart substring_width="1" substring_side="left">labelname</bcf:labelpart>
+    </bcf:labelelement>
+    <bcf:labelelement order="2">
+      <bcf:labelpart substring_width="2" substring_side="right">year</bcf:labelpart>
+    </bcf:labelelement>
+  </bcf:labelalphatemplate>
+  <!-- INHERITANCE -->
+  <bcf:inheritance>
+    <bcf:defaults inherit_all="true" override_target="false">
+    </bcf:defaults>
+    <bcf:inherit>
+      <bcf:type_pair source="mvbook" target="inbook"/>
+      <bcf:type_pair source="mvbook" target="bookinbook"/>
+      <bcf:type_pair source="mvbook" target="suppbook"/>
+      <bcf:type_pair source="book" target="inbook"/>
+      <bcf:type_pair source="book" target="bookinbook"/>
+      <bcf:type_pair source="book" target="suppbook"/>
+      <bcf:field source="author" target="author"/>
+      <bcf:field source="author" target="bookauthor"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="mvbook" target="book"/>
+      <bcf:type_pair source="mvbook" target="inbook"/>
+      <bcf:type_pair source="mvbook" target="bookinbook"/>
+      <bcf:type_pair source="mvbook" target="suppbook"/>
+      <bcf:field source="title" target="maintitle"/>
+      <bcf:field source="subtitle" target="mainsubtitle"/>
+      <bcf:field source="titleaddon" target="maintitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="mvcollection" target="collection"/>
+      <bcf:type_pair source="mvcollection" target="reference"/>
+      <bcf:type_pair source="mvcollection" target="incollection"/>
+      <bcf:type_pair source="mvcollection" target="inreference"/>
+      <bcf:type_pair source="mvcollection" target="suppcollection"/>
+      <bcf:type_pair source="mvreference" target="collection"/>
+      <bcf:type_pair source="mvreference" target="reference"/>
+      <bcf:type_pair source="mvreference" target="incollection"/>
+      <bcf:type_pair source="mvreference" target="inreference"/>
+      <bcf:type_pair source="mvreference" target="suppcollection"/>
+      <bcf:field source="title" target="maintitle"/>
+      <bcf:field source="subtitle" target="mainsubtitle"/>
+      <bcf:field source="titleaddon" target="maintitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="mvproceedings" target="proceedings"/>
+      <bcf:type_pair source="mvproceedings" target="inproceedings"/>
+      <bcf:field source="title" target="maintitle"/>
+      <bcf:field source="subtitle" target="mainsubtitle"/>
+      <bcf:field source="titleaddon" target="maintitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="book" target="inbook"/>
+      <bcf:type_pair source="book" target="bookinbook"/>
+      <bcf:type_pair source="book" target="suppbook"/>
+      <bcf:field source="title" target="booktitle"/>
+      <bcf:field source="subtitle" target="booksubtitle"/>
+      <bcf:field source="titleaddon" target="booktitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="collection" target="incollection"/>
+      <bcf:type_pair source="collection" target="inreference"/>
+      <bcf:type_pair source="collection" target="suppcollection"/>
+      <bcf:type_pair source="reference" target="incollection"/>
+      <bcf:type_pair source="reference" target="inreference"/>
+      <bcf:type_pair source="reference" target="suppcollection"/>
+      <bcf:field source="title" target="booktitle"/>
+      <bcf:field source="subtitle" target="booksubtitle"/>
+      <bcf:field source="titleaddon" target="booktitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="proceedings" target="inproceedings"/>
+      <bcf:field source="title" target="booktitle"/>
+      <bcf:field source="subtitle" target="booksubtitle"/>
+      <bcf:field source="titleaddon" target="booktitleaddon"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="periodical" target="article"/>
+      <bcf:type_pair source="periodical" target="suppperiodical"/>
+      <bcf:field source="title" target="journaltitle"/>
+      <bcf:field source="subtitle" target="journalsubtitle"/>
+      <bcf:field source="shorttitle" skip="true"/>
+      <bcf:field source="sorttitle" skip="true"/>
+      <bcf:field source="indextitle" skip="true"/>
+      <bcf:field source="indexsorttitle" skip="true"/>
+    </bcf:inherit>
+    <bcf:inherit>
+      <bcf:type_pair source="*" target="*"/>
+      <bcf:field source="crossref" skip="true"/>
+      <bcf:field source="xref" skip="true"/>
+      <bcf:field source="entryset" skip="true"/>
+      <bcf:field source="entrysubtype" skip="true"/>
+      <bcf:field source="execute" skip="true"/>
+      <bcf:field source="label" skip="true"/>
+      <bcf:field source="options" skip="true"/>
+      <bcf:field source="presort" skip="true"/>
+      <bcf:field source="related" skip="true"/>
+      <bcf:field source="relatedstring" skip="true"/>
+      <bcf:field source="relatedtype" skip="true"/>
+      <bcf:field source="shorthand" skip="true"/>
+      <bcf:field source="shorthandintro" skip="true"/>
+      <bcf:field source="sortkey" skip="true"/>
+    </bcf:inherit>
+  </bcf:inheritance>
+  <!-- SORTING -->
+  <bcf:sorting>
+    <bcf:presort>mm</bcf:presort>
+    <bcf:sort order="1">
+      <bcf:sortitem order="1">presort</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="2" final="1">
+      <bcf:sortitem order="1">sortkey</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="3">
+      <bcf:sortitem order="1">sortname</bcf:sortitem>
+      <bcf:sortitem order="2">author</bcf:sortitem>
+      <bcf:sortitem order="3">editor</bcf:sortitem>
+      <bcf:sortitem order="4">translator</bcf:sortitem>
+      <bcf:sortitem order="5">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="6">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="4">
+      <bcf:sortitem order="1">sortyear</bcf:sortitem>
+      <bcf:sortitem order="2">year</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="5">
+      <bcf:sortitem order="1">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="2">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="6">
+      <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+      <bcf:sortitem order="2">0000</bcf:sortitem>
+    </bcf:sort>
+  </bcf:sorting>
+  <!-- DATA MODEL -->
+  <bcf:datamodel>
+    <bcf:entrytypes>
+      <bcf:entrytype>article</bcf:entrytype>
+      <bcf:entrytype>artwork</bcf:entrytype>
+      <bcf:entrytype>audio</bcf:entrytype>
+      <bcf:entrytype>bibnote</bcf:entrytype>
+      <bcf:entrytype>book</bcf:entrytype>
+      <bcf:entrytype>bookinbook</bcf:entrytype>
+      <bcf:entrytype>booklet</bcf:entrytype>
+      <bcf:entrytype>collection</bcf:entrytype>
+      <bcf:entrytype>commentary</bcf:entrytype>
+      <bcf:entrytype>customa</bcf:entrytype>
+      <bcf:entrytype>customb</bcf:entrytype>
+      <bcf:entrytype>customc</bcf:entrytype>
+      <bcf:entrytype>customd</bcf:entrytype>
+      <bcf:entrytype>custome</bcf:entrytype>
+      <bcf:entrytype>customf</bcf:entrytype>
+      <bcf:entrytype>inbook</bcf:entrytype>
+      <bcf:entrytype>incollection</bcf:entrytype>
+      <bcf:entrytype>inproceedings</bcf:entrytype>
+      <bcf:entrytype>inreference</bcf:entrytype>
+      <bcf:entrytype>image</bcf:entrytype>
+      <bcf:entrytype>jurisdiction</bcf:entrytype>
+      <bcf:entrytype>legal</bcf:entrytype>
+      <bcf:entrytype>legislation</bcf:entrytype>
+      <bcf:entrytype>letter</bcf:entrytype>
+      <bcf:entrytype>manual</bcf:entrytype>
+      <bcf:entrytype>misc</bcf:entrytype>
+      <bcf:entrytype>movie</bcf:entrytype>
+      <bcf:entrytype>music</bcf:entrytype>
+      <bcf:entrytype>mvcollection</bcf:entrytype>
+      <bcf:entrytype>mvbook</bcf:entrytype>
+      <bcf:entrytype>online</bcf:entrytype>
+      <bcf:entrytype>patent</bcf:entrytype>
+      <bcf:entrytype>performance</bcf:entrytype>
+      <bcf:entrytype>periodical</bcf:entrytype>
+      <bcf:entrytype>proceedings</bcf:entrytype>
+      <bcf:entrytype>reference</bcf:entrytype>
+      <bcf:entrytype>report</bcf:entrytype>
+      <bcf:entrytype>review</bcf:entrytype>
+      <bcf:entrytype>set</bcf:entrytype>
+      <bcf:entrytype>software</bcf:entrytype>
+      <bcf:entrytype>standard</bcf:entrytype>
+      <bcf:entrytype>suppbook</bcf:entrytype>
+      <bcf:entrytype>suppcollection</bcf:entrytype>
+      <bcf:entrytype>thesis</bcf:entrytype>
+      <bcf:entrytype>unpublished</bcf:entrytype>
+      <bcf:entrytype>video</bcf:entrytype>
+      <bcf:entrytype>xdata</bcf:entrytype>
+    </bcf:entrytypes>
+    <bcf:fields>
+      <bcf:field fieldtype="field" datatype="integer">day</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">endday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">endmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">eventday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">eventendday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">eventendmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">eventmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">eventyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">origday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">origendday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">origendmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">origmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">origyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">urlday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">urlendday</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">urlendmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">urlmonth</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer">urlyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">abstract</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">addendum</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">annotation</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">booksubtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">booktitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">booktitleaddon</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">chapter</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">edition</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">eid</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">entrysubtype</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">eprintclass</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">eprinttype</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">eventtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">gender</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">howpublished</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">hyphenation</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">indexsorttitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">indextitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">isan</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">isbn</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">ismn</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">isrn</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">issn</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">issue</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">issuesubtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">issuetitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">iswc</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">journalsubtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">journaltitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">label</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">library</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">mainsubtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">maintitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">maintitleaddon</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">month</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">nameaddon</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">note</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">number</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">origtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">pagetotal</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">part</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">related</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">relatedtype</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">relatedstring</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">reprinttitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">series</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">shorthand</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">shorthandintro</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">shortjournal</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">shortseries</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">shorttitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">subtitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">title</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">titleaddon</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">usera</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">userb</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">userc</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">userd</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">usere</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">userf</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">venue</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">version</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">volume</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">volumes</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal">year</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer" nullok="true">urlendyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer" nullok="true">endyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer" nullok="true">eventendyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="integer" nullok="true">origendyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">sorttitle</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">sortshorthand</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">sortyear</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">sortkey</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">presort</bcf:field>
+      <bcf:field fieldtype="field" datatype="literal" skip_output="true">entryset</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">institution</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">lista</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">listb</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">listc</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">listd</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">liste</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">listf</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">location</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">organization</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">origlocation</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">origpublisher</bcf:field>
+      <bcf:field fieldtype="list" datatype="literal">publisher</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">afterword</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">annotator</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">author</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">bookauthor</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">commentator</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">editor</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">editora</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">editorb</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">editorc</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">foreword</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">holder</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">introduction</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">namea</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">nameb</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">namec</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">shortauthor</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">shorteditor</bcf:field>
+      <bcf:field fieldtype="list" datatype="name">translator</bcf:field>
+      <bcf:field fieldtype="list" datatype="name" skip_output="true">sortname</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">authortype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">editoratype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">editorbtype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">editorctype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">editortype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">bookpagination</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">nameatype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">namebtype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">namectype</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">origlanguage</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">pagination</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">pubstate</bcf:field>
+      <bcf:field fieldtype="field" datatype="key">type</bcf:field>
+      <bcf:field fieldtype="list" datatype="key">language</bcf:field>
+      <bcf:field fieldtype="field" datatype="entrykey">crossref</bcf:field>
+      <bcf:field fieldtype="field" datatype="entrykey">xref</bcf:field>
+      <bcf:field fieldtype="list" datatype="entrykey" skip_output="true">xdata</bcf:field>
+      <bcf:field fieldtype="list" datatype="entrykey" skip_output="true">ids</bcf:field>
+      <bcf:field fieldtype="field" datatype="date" skip_output="true">date</bcf:field>
+      <bcf:field fieldtype="field" datatype="date" skip_output="true">eventdate</bcf:field>
+      <bcf:field fieldtype="field" datatype="date" skip_output="true">origdate</bcf:field>
+      <bcf:field fieldtype="field" datatype="date" skip_output="true">urldate</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">doi</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">eprint</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">file</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">url</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">verba</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">verbb</bcf:field>
+      <bcf:field fieldtype="field" datatype="verbatim">verbc</bcf:field>
+      <bcf:field fieldtype="field" datatype="csv">keywords</bcf:field>
+      <bcf:field fieldtype="field" datatype="csv" skip_output="true">options</bcf:field>
+      <bcf:field fieldtype="field" datatype="range">pages</bcf:field>
+      <bcf:field fieldtype="field" datatype="code">execute</bcf:field>
+    </bcf:fields>
+    <bcf:entryfields>
+      <bcf:field>abstract</bcf:field>
+      <bcf:field>annotation</bcf:field>
+      <bcf:field>authortype</bcf:field>
+      <bcf:field>bookpagination</bcf:field>
+      <bcf:field>crossref</bcf:field>
+      <bcf:field>entryset</bcf:field>
+      <bcf:field>entrysubtype</bcf:field>
+      <bcf:field>execute</bcf:field>
+      <bcf:field>file</bcf:field>
+      <bcf:field>gender</bcf:field>
+      <bcf:field>hyphenation</bcf:field>
+      <bcf:field>ids</bcf:field>
+      <bcf:field>indextitle</bcf:field>
+      <bcf:field>indexsorttitle</bcf:field>
+      <bcf:field>isan</bcf:field>
+      <bcf:field>ismn</bcf:field>
+      <bcf:field>iswc</bcf:field>
+      <bcf:field>keywords</bcf:field>
+      <bcf:field>label</bcf:field>
+      <bcf:field>library</bcf:field>
+      <bcf:field>lista</bcf:field>
+      <bcf:field>listb</bcf:field>
+      <bcf:field>listc</bcf:field>
+      <bcf:field>listd</bcf:field>
+      <bcf:field>liste</bcf:field>
+      <bcf:field>listf</bcf:field>
+      <bcf:field>nameaddon</bcf:field>
+      <bcf:field>options</bcf:field>
+      <bcf:field>origday</bcf:field>
+      <bcf:field>origendday</bcf:field>
+      <bcf:field>origendmonth</bcf:field>
+      <bcf:field>origendyear</bcf:field>
+      <bcf:field>origmonth</bcf:field>
+      <bcf:field>origyear</bcf:field>
+      <bcf:field>origlocation</bcf:field>
+      <bcf:field>origpublisher</bcf:field>
+      <bcf:field>origtitle</bcf:field>
+      <bcf:field>pagination</bcf:field>
+      <bcf:field>presort</bcf:field>
+      <bcf:field>related</bcf:field>
+      <bcf:field>relatedtype</bcf:field>
+      <bcf:field>relatedstring</bcf:field>
+      <bcf:field>shortauthor</bcf:field>
+      <bcf:field>shorteditor</bcf:field>
+      <bcf:field>shorthand</bcf:field>
+      <bcf:field>shorthandintro</bcf:field>
+      <bcf:field>shortjournal</bcf:field>
+      <bcf:field>shortseries</bcf:field>
+      <bcf:field>shorttitle</bcf:field>
+      <bcf:field>sortkey</bcf:field>
+      <bcf:field>sortname</bcf:field>
+      <bcf:field>sortshorthand</bcf:field>
+      <bcf:field>sorttitle</bcf:field>
+      <bcf:field>sortyear</bcf:field>
+      <bcf:field>usera</bcf:field>
+      <bcf:field>userb</bcf:field>
+      <bcf:field>userc</bcf:field>
+      <bcf:field>userd</bcf:field>
+      <bcf:field>usere</bcf:field>
+      <bcf:field>userf</bcf:field>
+      <bcf:field>verba</bcf:field>
+      <bcf:field>verbb</bcf:field>
+      <bcf:field>verbc</bcf:field>
+      <bcf:field>xdata</bcf:field>
+      <bcf:field>xref</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>set</bcf:entrytype>
+      <bcf:field>entryset</bcf:field>
+      <bcf:field>crossref</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>article</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>journaltitle</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eid</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>issn</bcf:field>
+      <bcf:field>issue</bcf:field>
+      <bcf:field>issuetitle</bcf:field>
+      <bcf:field>issuesubtitle</bcf:field>
+      <bcf:field>journalsubtitle</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+      <bcf:field>volume</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>bibnote</bcf:entrytype>
+      <bcf:field>note</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>book</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>mvbook</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>inbook</bcf:entrytype>
+      <bcf:entrytype>bookinbook</bcf:entrytype>
+      <bcf:entrytype>suppbook</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>booktitle</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>bookauthor</bcf:field>
+      <bcf:field>booksubtitle</bcf:field>
+      <bcf:field>booktitleaddon</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>booklet</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>howpublished</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>collection</bcf:entrytype>
+      <bcf:entrytype>reference</bcf:entrytype>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>mvcollection</bcf:entrytype>
+      <bcf:entrytype>mvreference</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>incollection</bcf:entrytype>
+      <bcf:entrytype>suppcollection</bcf:entrytype>
+      <bcf:entrytype>inreference</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>booktitle</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>afterword</bcf:field>
+      <bcf:field>annotator</bcf:field>
+      <bcf:field>booksubtitle</bcf:field>
+      <bcf:field>booktitleaddon</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>commentator</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>foreword</bcf:field>
+      <bcf:field>introduction</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>origlanguage</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>translator</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>manual</bcf:entrytype>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>author</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>edition</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>misc</bcf:entrytype>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>author</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>howpublished</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>online</bcf:entrytype>
+      <bcf:field>title</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>author</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+      <bcf:field>year</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>patent</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>holder</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>periodical</bcf:entrytype>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>editora</bcf:field>
+      <bcf:field>editorb</bcf:field>
+      <bcf:field>editorc</bcf:field>
+      <bcf:field>editoratype</bcf:field>
+      <bcf:field>editorbtype</bcf:field>
+      <bcf:field>editorctype</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>issn</bcf:field>
+      <bcf:field>issue</bcf:field>
+      <bcf:field>issuesubtitle</bcf:field>
+      <bcf:field>issuetitle</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>volume</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>mvproceedings</bcf:entrytype>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>eventday</bcf:field>
+      <bcf:field>eventendday</bcf:field>
+      <bcf:field>eventendmonth</bcf:field>
+      <bcf:field>eventendyear</bcf:field>
+      <bcf:field>eventmonth</bcf:field>
+      <bcf:field>eventyear</bcf:field>
+      <bcf:field>eventtitle</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>venue</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>proceedings</bcf:entrytype>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>eventday</bcf:field>
+      <bcf:field>eventendday</bcf:field>
+      <bcf:field>eventendmonth</bcf:field>
+      <bcf:field>eventendyear</bcf:field>
+      <bcf:field>eventmonth</bcf:field>
+      <bcf:field>eventyear</bcf:field>
+      <bcf:field>eventtitle</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>venue</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>inproceedings</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>editor</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>booktitle</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>booksubtitle</bcf:field>
+      <bcf:field>booktitleaddon</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>eventday</bcf:field>
+      <bcf:field>eventendday</bcf:field>
+      <bcf:field>eventendmonth</bcf:field>
+      <bcf:field>eventendyear</bcf:field>
+      <bcf:field>eventmonth</bcf:field>
+      <bcf:field>eventyear</bcf:field>
+      <bcf:field>eventtitle</bcf:field>
+      <bcf:field>isbn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>mainsubtitle</bcf:field>
+      <bcf:field>maintitle</bcf:field>
+      <bcf:field>maintitleaddon</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>organization</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>part</bcf:field>
+      <bcf:field>publisher</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>series</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>venue</bcf:field>
+      <bcf:field>volume</bcf:field>
+      <bcf:field>volumes</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>report</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>institution</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>isrn</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>number</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+      <bcf:field>version</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>thesis</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>type</bcf:field>
+      <bcf:field>institution</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>chapter</bcf:field>
+      <bcf:field>doi</bcf:field>
+      <bcf:field>eprint</bcf:field>
+      <bcf:field>eprintclass</bcf:field>
+      <bcf:field>eprinttype</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>pages</bcf:field>
+      <bcf:field>pagetotal</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+    </bcf:entryfields>
+    <bcf:entryfields>
+      <bcf:entrytype>unpublished</bcf:entrytype>
+      <bcf:field>author</bcf:field>
+      <bcf:field>title</bcf:field>
+      <bcf:field>day</bcf:field>
+      <bcf:field>endday</bcf:field>
+      <bcf:field>endmonth</bcf:field>
+      <bcf:field>endyear</bcf:field>
+      <bcf:field>month</bcf:field>
+      <bcf:field>year</bcf:field>
+      <bcf:field>addendum</bcf:field>
+      <bcf:field>howpublished</bcf:field>
+      <bcf:field>language</bcf:field>
+      <bcf:field>location</bcf:field>
+      <bcf:field>note</bcf:field>
+      <bcf:field>pubstate</bcf:field>
+      <bcf:field>subtitle</bcf:field>
+      <bcf:field>titleaddon</bcf:field>
+      <bcf:field>url</bcf:field>
+      <bcf:field>urlday</bcf:field>
+      <bcf:field>urlendday</bcf:field>
+      <bcf:field>urlendmonth</bcf:field>
+      <bcf:field>urlendyear</bcf:field>
+      <bcf:field>urlmonth</bcf:field>
+      <bcf:field>urlyear</bcf:field>
+    </bcf:entryfields>
+    <bcf:constraints>
+      <bcf:entrytype>article</bcf:entrytype>
+      <bcf:entrytype>book</bcf:entrytype>
+      <bcf:entrytype>inbook</bcf:entrytype>
+      <bcf:entrytype>bookinbook</bcf:entrytype>
+      <bcf:entrytype>suppbook</bcf:entrytype>
+      <bcf:entrytype>booklet</bcf:entrytype>
+      <bcf:entrytype>collection</bcf:entrytype>
+      <bcf:entrytype>incollection</bcf:entrytype>
+      <bcf:entrytype>suppcollection</bcf:entrytype>
+      <bcf:entrytype>manual</bcf:entrytype>
+      <bcf:entrytype>misc</bcf:entrytype>
+      <bcf:entrytype>mvbook</bcf:entrytype>
+      <bcf:entrytype>mvcollection</bcf:entrytype>
+      <bcf:entrytype>online</bcf:entrytype>
+      <bcf:entrytype>patent</bcf:entrytype>
+      <bcf:entrytype>periodical</bcf:entrytype>
+      <bcf:entrytype>suppperiodical</bcf:entrytype>
+      <bcf:entrytype>proceedings</bcf:entrytype>
+      <bcf:entrytype>inproceedings</bcf:entrytype>
+      <bcf:entrytype>reference</bcf:entrytype>
+      <bcf:entrytype>inreference</bcf:entrytype>
+      <bcf:entrytype>report</bcf:entrytype>
+      <bcf:entrytype>set</bcf:entrytype>
+      <bcf:entrytype>thesis</bcf:entrytype>
+      <bcf:entrytype>unpublished</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:fieldxor>
+          <bcf:field>date</bcf:field>
+          <bcf:field>year</bcf:field>
+        </bcf:fieldxor>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>set</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>entryset</bcf:field>
+        <bcf:field>crossref</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>article</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>journaltitle</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>book</bcf:entrytype>
+      <bcf:entrytype>mvbook</bcf:entrytype>
+      <bcf:entrytype>mvcollection</bcf:entrytype>
+      <bcf:entrytype>mvreference</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>inbook</bcf:entrytype>
+      <bcf:entrytype>bookinbook</bcf:entrytype>
+      <bcf:entrytype>suppbook</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>booktitle</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>booklet</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:fieldor>
+          <bcf:field>author</bcf:field>
+          <bcf:field>editor</bcf:field>
+        </bcf:fieldor>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>collection</bcf:entrytype>
+      <bcf:entrytype>reference</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>editor</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>incollection</bcf:entrytype>
+      <bcf:entrytype>suppcollection</bcf:entrytype>
+      <bcf:entrytype>inreference</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>editor</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>booktitle</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>manual</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>misc</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>online</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>title</bcf:field>
+        <bcf:field>url</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>patent</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>number</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>periodical</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>editor</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>proceedings</bcf:entrytype>
+      <bcf:entrytype>mvproceedings</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>editor</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>inproceedings</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>editor</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>booktitle</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>report</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>type</bcf:field>
+        <bcf:field>institution</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>thesis</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+        <bcf:field>type</bcf:field>
+        <bcf:field>institution</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:entrytype>unpublished</bcf:entrytype>
+      <bcf:constraint type="mandatory">
+        <bcf:field>author</bcf:field>
+        <bcf:field>title</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+    <bcf:constraints>
+      <bcf:constraint type="data" datatype="isbn">
+        <bcf:field>isbn</bcf:field>
+      </bcf:constraint>
+      <bcf:constraint type="data" datatype="issn">
+        <bcf:field>issn</bcf:field>
+      </bcf:constraint>
+      <bcf:constraint type="data" datatype="ismn">
+        <bcf:field>ismn</bcf:field>
+      </bcf:constraint>
+      <bcf:constraint type="data" datatype="date">
+        <bcf:field>date</bcf:field>
+        <bcf:field>eventdate</bcf:field>
+        <bcf:field>origdate</bcf:field>
+        <bcf:field>urldate</bcf:field>
+      </bcf:constraint>
+      <bcf:constraint type="data" datatype="pattern" pattern="(?:sf|sm|sn|pf|pm|pn|pp)">
+        <bcf:field>gender</bcf:field>
+      </bcf:constraint>
+    </bcf:constraints>
+  </bcf:datamodel>
+  <!-- CITATION DATA -->
+  <!-- SECTION 0 -->
+  <bcf:bibdata section="0">
+    <bcf:datasource type="file" datatype="bibtex">bibliografia.bib</bcf:datasource>
+  </bcf:bibdata>
+  <bcf:section number="0">
+    <bcf:citekey order="1">Bringhurst:1996</bcf:citekey>
+    <bcf:citekey order="1">Descartes:1897</bcf:citekey>
+    <bcf:citekey order="1">Facchinetti:2009a</bcf:citekey>
+    <bcf:citekey order="1">Galilei1</bcf:citekey>
+    <bcf:citekey order="1">kant:kpv</bcf:citekey>
+  </bcf:section>
+  <bcf:sortlist section="0" type="shorthand" label="shorthand">
+    <bcf:filter type="field">shorthand</bcf:filter>
+  <bcf:sorting>
+    <bcf:sort order="1" final="1">
+      <bcf:sortitem order="1">sortshorthand</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="2">
+      <bcf:sortitem order="1">shorthand</bcf:sortitem>
+    </bcf:sort>
+  </bcf:sorting>
+  </bcf:sortlist>
+  <bcf:sortlist section="0" type="entry" label="nyt">
+  <bcf:sorting>
+    <bcf:sort order="1">
+      <bcf:sortitem order="1">presort</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="2" final="1">
+      <bcf:sortitem order="1">sortkey</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="3">
+      <bcf:sortitem order="1">sortname</bcf:sortitem>
+      <bcf:sortitem order="2">author</bcf:sortitem>
+      <bcf:sortitem order="3">editor</bcf:sortitem>
+      <bcf:sortitem order="4">translator</bcf:sortitem>
+      <bcf:sortitem order="5">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="6">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="4">
+      <bcf:sortitem order="1">sortyear</bcf:sortitem>
+      <bcf:sortitem order="2">year</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="5">
+      <bcf:sortitem order="1">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="2">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="6">
+      <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+      <bcf:sortitem order="2">0000</bcf:sortitem>
+    </bcf:sort>
+  </bcf:sorting>
+  </bcf:sortlist>
+  <bcf:sortlist section="0" type="entry" label="nyt">
+  <bcf:sorting>
+    <bcf:sort order="1">
+      <bcf:sortitem order="1">presort</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="2" final="1">
+      <bcf:sortitem order="1">sortkey</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="3">
+      <bcf:sortitem order="1">sortname</bcf:sortitem>
+      <bcf:sortitem order="2">author</bcf:sortitem>
+      <bcf:sortitem order="3">editor</bcf:sortitem>
+      <bcf:sortitem order="4">translator</bcf:sortitem>
+      <bcf:sortitem order="5">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="6">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="4">
+      <bcf:sortitem order="1">sortyear</bcf:sortitem>
+      <bcf:sortitem order="2">year</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="5">
+      <bcf:sortitem order="1">sorttitle</bcf:sortitem>
+      <bcf:sortitem order="2">title</bcf:sortitem>
+    </bcf:sort>
+    <bcf:sort order="6">
+      <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+      <bcf:sortitem order="2">0000</bcf:sortitem>
+    </bcf:sort>
+  </bcf:sorting>
+  </bcf:sortlist>
+</bcf:controlfile>
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.idx b/Master/texmf-dist/doc/latex/suftesi/example/tesi.idx
new file mode 100644
index 00000000000..a13c446025a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.idx
@@ -0,0 +1 @@
+\indexentry{Valbusa, Ivan|hyperpage}{2}
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.lof b/Master/texmf-dist/doc/latex/suftesi/example/tesi.lof
new file mode 100644
index 00000000000..ee7e3d4d5fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.lof
@@ -0,0 +1,22 @@
+\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax 
+\defcounter {refsection}{0}\relax 
+\select@language {italian}
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\contentsline {figure}{\numberline {1.1}{\ignorespaces Donald Knuth e Laslie Lamport}}{17}{figure.caption.7}
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\contentsfinish 
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.log b/Master/texmf-dist/doc/latex/suftesi/example/tesi.log
new file mode 100644
index 00000000000..09521fd0774
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.log
@@ -0,0 +1,1802 @@
+This is pdfTeX, Version 3.1415926-2.4-1.40.13 (TeX Live 2012) (format=pdflatex 2012.8.21)  31 AUG 2012 17:58
+entering extended mode
+ \write18 enabled.
+ file:line:error style messages enabled.
+ %&-line parsing enabled.
+**tesi.tex
+(./tesi.tex
+LaTeX2e <2011/06/27>
+Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, ge
+rman-x-2012-05-30, ngerman-x-2012-05-30, afrikaans, ancientgreek, ibycus, arabi
+c, armenian, basque, bulgarian, catalan, pinyin, coptic, croatian, czech, danis
+h, dutch, ukenglish, usenglishmax, esperanto, estonian, ethiopic, farsi, finnis
+h, french, friulan, galician, german, ngerman, swissgerman, monogreek, greek, h
+ungarian, icelandic, assamese, bengali, gujarati, hindi, kannada, malayalam, ma
+rathi, oriya, panjabi, tamil, telugu, indonesian, interlingua, irish, italian, 
+kurmanji, latin, latvian, lithuanian, mongolian, mongolianlmc, bokmal, nynorsk,
+ polish, portuguese, romanian, romansh, russian, sanskrit, serbian, serbianc, s
+lovak, slovenian, spanish, swedish, turkish, turkmen, ukrainian, uppersorbian, 
+welsh, loaded.
+(/Users/Ivan/Library/texmf/tex/latex/base/suftesi.cls
+Document Class: suftesi 2012/08/31 v0.9a A class for typesetting theses, books 
+and articles
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/book.cls
+Document Class: book 2007/10/19 v1.4h Standard LaTeX document class
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/bk10.clo
+File: bk10.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
+)
+\c@part=\count79
+\c@chapter=\count80
+\c@section=\count81
+\c@subsection=\count82
+\c@subsubsection=\count83
+\c@paragraph=\count84
+\c@subparagraph=\count85
+\c@figure=\count86
+\c@table=\count87
+\abovecaptionskip=\skip41
+\belowcaptionskip=\skip42
+\bibindent=\dimen102
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/latexconfig/color.cfg
+File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
+)
+Package color Info: Driver file: pdftex.def on input line 130.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/pdftex-def/pdftex.def
+File: pdftex.def 2011/05/27 v0.06d Graphics/color for pdfTeX
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
+)
+\Gread@gobject=\count88
+))
+(/usr/local/texlive/2012/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
+Package ifluatex Info: LuaTeX not detected.
+)
+(/Users/Ivan/Library/texmf/tex/latex/microtype/microtype.sty
+Package: microtype 2011/09/05 v2.5 <beta-08> Micro-typographical refinements (R
+S)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/graphics/keyval.sty
+Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
+\KV@toks@=\toks14
+)
+\MT@toks=\toks15
+\MT@count=\count89
+LaTeX Info: Redefining \textls on input line 766.
+\MT@outer@kern=\dimen103
+LaTeX Info: Redefining \textmicrotypecontext on input line 1284.
+\MT@listname@count=\count90
+
+(/Users/Ivan/Library/texmf/tex/latex/microtype/microtype-pdftex.def
+File: microtype-pdftex.def 2011/09/05 v2.5 <beta-08> Definitions specific to pd
+ftex (RS)
+LaTeX Info: Redefining \lsstyle on input line 883.
+LaTeX Info: Redefining \lslig on input line 883.
+\MT@outer@space=\skip43
+)
+Package microtype Info: Loading configuration file microtype.cfg.
+
+(/Users/Ivan/Library/texmf/tex/latex/microtype/microtype.cfg
+File: microtype.cfg 2011/09/05 v2.5 <beta-08> microtype main configuration file
+ (RS)
+))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/textcase/textcase.sty
+Package: textcase 2004/10/07 v0.07 Text only upper/lower case changing (DPC)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/tools/multicol.sty
+Package: multicol 2011/06/27 v1.7a multicolumn formatting (FMi)
+\c@tracingmulticols=\count91
+\mult@box=\box26
+\multicol@leftmargin=\dimen104
+\c@unbalance=\count92
+\c@collectmore=\count93
+\doublecol@number=\count94
+\multicoltolerance=\count95
+\multicolpretolerance=\count96
+\full@width=\dimen105
+\page@free=\dimen106
+\premulticols=\dimen107
+\postmulticols=\dimen108
+\multicolsep=\skip44
+\multicolbaselineskip=\skip45
+\partial@page=\box27
+\last@line=\box28
+\mult@rightbox=\box29
+\mult@grightbox=\box30
+\mult@gfirstbox=\box31
+\mult@firstbox=\box32
+\@tempa=\box33
+\@tempa=\box34
+\@tempa=\box35
+\@tempa=\box36
+\@tempa=\box37
+\@tempa=\box38
+\@tempa=\box39
+\@tempa=\box40
+\@tempa=\box41
+\@tempa=\box42
+\@tempa=\box43
+\@tempa=\box44
+\@tempa=\box45
+\@tempa=\box46
+\@tempa=\box47
+\@tempa=\box48
+\@tempa=\box49
+\c@columnbadness=\count97
+\c@finalcolumnbadness=\count98
+\last@try=\dimen109
+\multicolovershoot=\dimen110
+\multicolundershoot=\dimen111
+\mult@nat@firstbox=\box50
+\colbreak@box=\box51
+\multicol@sort@counter=\count99
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/emptypage/emptypage.sty
+Package: emptypage 2010/05/30 v1.2 Suppress page numbers and headings on empty 
+pages
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/mparhack/mparhack.sty
+Package: mparhack 2005/04/17 v1.4 (T. Sgouros and S. Ulrich)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/fontenc.sty
+Package: fontenc 2005/09/27 v1.99g Standard LaTeX package
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/lgrenc.def
+File: lgrenc.def 2008/06/17 v2.3 Greek Encoding
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/t1enc.def
+File: t1enc.def 2005/09/27 v1.99g Standard LaTeX file
+LaTeX Font Info:    Redeclaring font encoding T1 on input line 43.
+))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/mathpazo.sty
+Package: mathpazo 2005/04/12 PSNFSS-v9.2a Palatino w/ Pazo Math (D.Puga, WaS) 
+\symupright=\mathgroup4
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/bera/beramono.sty
+Package: beramono 2004/01/31 (WaS)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/geometry/geometry.sty
+Package: geometry 2010/09/12 v5.6 Page Geometry
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+Package: ifpdf 2011/01/30 v2.3 Provides the ifpdf switch (HO)
+Package ifpdf Info: pdfTeX in PDF mode is detected.
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)
+Package ifvtex Info: VTeX not detected.
+)
+\Gm@cnth=\count100
+\Gm@cntv=\count101
+\c@Gm@tempcnt=\count102
+\Gm@bindingoffset=\dimen112
+\Gm@wd@mp=\dimen113
+\Gm@odd@mp=\dimen114
+\Gm@even@mp=\dimen115
+\Gm@layoutwidth=\dimen116
+\Gm@layoutheight=\dimen117
+\Gm@layouthoffset=\dimen118
+\Gm@layoutvoffset=\dimen119
+\Gm@dimlist=\toks16
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/crop/crop.sty
+Package: crop 2003/05/20 v1.9 crop marks (mf)
+\stockwidth=\dimen120
+\stockheight=\dimen121
+\CROP@index=\count103
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/graphics/trig.sty
+Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/latexconfig/graphics.cfg
+File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
+)
+Package graphics Info: Driver file: pdftex.def on input line 91.
+)
+\CROP@offset=\count104
+Package crop Info: Local config file crop.cfg used on input line 605.
+
+(/usr/local/texlive/2012/texmf-dist/tex/xelatex/xetexconfig/crop.cfg))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/titlesec/titlesec.sty
+Package: titlesec 2011/12/15 v2.10.0 Sectioning titles
+\ttl@box=\box52
+\beforetitleunit=\skip46
+\aftertitleunit=\skip47
+\ttl@plus=\dimen122
+\ttl@minus=\dimen123
+\ttl@toksa=\toks17
+\titlewidth=\dimen124
+\titlewidthlast=\dimen125
+\titlewidthfirst=\dimen126
+)
+\sectionsep=\skip48
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/titlesec/ttlkeys.def
+File: ttlkeys.def 2011/12/15
+\c@ttlp@side=\count105
+\ttlp@side=\count106
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
+\fancy@headwidth=\skip49
+\f@ncyO@elh=\skip50
+\f@ncyO@erh=\skip51
+\f@ncyO@olh=\skip52
+\f@ncyO@orh=\skip53
+\f@ncyO@elf=\skip54
+\f@ncyO@erf=\skip55
+\f@ncyO@olf=\skip56
+\f@ncyO@orf=\skip57
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/caption/caption.sty
+Package: caption 2012/02/19 v3.2f Customizing captions (AR)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/caption/caption3.sty
+Package: caption3 2012/01/12 v1.4b caption3 kernel (AR)
+\captionmargin=\dimen127
+\captionmargin@=\dimen128
+\captionwidth=\dimen129
+\caption@indent=\dimen130
+\caption@parindent=\dimen131
+\caption@hangindent=\dimen132
+)
+\c@ContinuedFloat=\count107
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/epigraph/epigraph.sty
+Package: epigraph 2009/09/02 v1.5c typesetting epigraphs
+\beforeepigraphskip=\skip58
+\afterepigraphskip=\skip59
+\epigraphwidth=\skip60
+\epigraphrule=\skip61
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/enumitem/enumitem.sty
+Package: enumitem 2011/09/28 v3.5.2 Customized lists
+\labelindent=\skip62
+\enit@outerparindent=\dimen133
+\enit@toks=\toks18
+\enit@inbox=\box53
+\enitdp@description=\count108
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/titlesec/titletoc.sty
+Package: titletoc 2011/12/15 v1.6 TOC entries
+\ttl@leftsep=\dimen134
+)
+\SUF@label@chapter=\skip63
+\SUF@tochang=\skip64
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/fontenc.sty
+Package: fontenc 2005/09/27 v1.99g Standard LaTeX package
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/t1enc.def
+File: t1enc.def 2005/09/27 v1.99g Standard LaTeX file
+LaTeX Font Info:    Redeclaring font encoding T1 on input line 43.
+))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/inputenc.sty
+Package: inputenc 2008/03/30 v1.1d Input encoding file
+\inpenc@prehook=\toks19
+\inpenc@posthook=\toks20
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/utf8.def
+File: utf8.def 2008/04/05 v1.1m UTF-8 support for inputenc
+Now handling font encoding OML ...
+... no UTF-8 mapping file for font encoding OML
+Now handling font encoding T1 ...
+... processing UTF-8 mapping file for font encoding T1
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/t1enc.dfu
+File: t1enc.dfu 2008/04/05 v1.1m UTF-8 support for inputenc
+   defining Unicode char U+00A1 (decimal 161)
+   defining Unicode char U+00A3 (decimal 163)
+   defining Unicode char U+00AB (decimal 171)
+   defining Unicode char U+00BB (decimal 187)
+   defining Unicode char U+00BF (decimal 191)
+   defining Unicode char U+00C0 (decimal 192)
+   defining Unicode char U+00C1 (decimal 193)
+   defining Unicode char U+00C2 (decimal 194)
+   defining Unicode char U+00C3 (decimal 195)
+   defining Unicode char U+00C4 (decimal 196)
+   defining Unicode char U+00C5 (decimal 197)
+   defining Unicode char U+00C6 (decimal 198)
+   defining Unicode char U+00C7 (decimal 199)
+   defining Unicode char U+00C8 (decimal 200)
+   defining Unicode char U+00C9 (decimal 201)
+   defining Unicode char U+00CA (decimal 202)
+   defining Unicode char U+00CB (decimal 203)
+   defining Unicode char U+00CC (decimal 204)
+   defining Unicode char U+00CD (decimal 205)
+   defining Unicode char U+00CE (decimal 206)
+   defining Unicode char U+00CF (decimal 207)
+   defining Unicode char U+00D0 (decimal 208)
+   defining Unicode char U+00D1 (decimal 209)
+   defining Unicode char U+00D2 (decimal 210)
+   defining Unicode char U+00D3 (decimal 211)
+   defining Unicode char U+00D4 (decimal 212)
+   defining Unicode char U+00D5 (decimal 213)
+   defining Unicode char U+00D6 (decimal 214)
+   defining Unicode char U+00D8 (decimal 216)
+   defining Unicode char U+00D9 (decimal 217)
+   defining Unicode char U+00DA (decimal 218)
+   defining Unicode char U+00DB (decimal 219)
+   defining Unicode char U+00DC (decimal 220)
+   defining Unicode char U+00DD (decimal 221)
+   defining Unicode char U+00DE (decimal 222)
+   defining Unicode char U+00DF (decimal 223)
+   defining Unicode char U+00E0 (decimal 224)
+   defining Unicode char U+00E1 (decimal 225)
+   defining Unicode char U+00E2 (decimal 226)
+   defining Unicode char U+00E3 (decimal 227)
+   defining Unicode char U+00E4 (decimal 228)
+   defining Unicode char U+00E5 (decimal 229)
+   defining Unicode char U+00E6 (decimal 230)
+   defining Unicode char U+00E7 (decimal 231)
+   defining Unicode char U+00E8 (decimal 232)
+   defining Unicode char U+00E9 (decimal 233)
+   defining Unicode char U+00EA (decimal 234)
+   defining Unicode char U+00EB (decimal 235)
+   defining Unicode char U+00EC (decimal 236)
+   defining Unicode char U+00ED (decimal 237)
+   defining Unicode char U+00EE (decimal 238)
+   defining Unicode char U+00EF (decimal 239)
+   defining Unicode char U+00F0 (decimal 240)
+   defining Unicode char U+00F1 (decimal 241)
+   defining Unicode char U+00F2 (decimal 242)
+   defining Unicode char U+00F3 (decimal 243)
+   defining Unicode char U+00F4 (decimal 244)
+   defining Unicode char U+00F5 (decimal 245)
+   defining Unicode char U+00F6 (decimal 246)
+   defining Unicode char U+00F8 (decimal 248)
+   defining Unicode char U+00F9 (decimal 249)
+   defining Unicode char U+00FA (decimal 250)
+   defining Unicode char U+00FB (decimal 251)
+   defining Unicode char U+00FC (decimal 252)
+   defining Unicode char U+00FD (decimal 253)
+   defining Unicode char U+00FE (decimal 254)
+   defining Unicode char U+00FF (decimal 255)
+   defining Unicode char U+0102 (decimal 258)
+   defining Unicode char U+0103 (decimal 259)
+   defining Unicode char U+0104 (decimal 260)
+   defining Unicode char U+0105 (decimal 261)
+   defining Unicode char U+0106 (decimal 262)
+   defining Unicode char U+0107 (decimal 263)
+   defining Unicode char U+010C (decimal 268)
+   defining Unicode char U+010D (decimal 269)
+   defining Unicode char U+010E (decimal 270)
+   defining Unicode char U+010F (decimal 271)
+   defining Unicode char U+0110 (decimal 272)
+   defining Unicode char U+0111 (decimal 273)
+   defining Unicode char U+0118 (decimal 280)
+   defining Unicode char U+0119 (decimal 281)
+   defining Unicode char U+011A (decimal 282)
+   defining Unicode char U+011B (decimal 283)
+   defining Unicode char U+011E (decimal 286)
+   defining Unicode char U+011F (decimal 287)
+   defining Unicode char U+0130 (decimal 304)
+   defining Unicode char U+0131 (decimal 305)
+   defining Unicode char U+0132 (decimal 306)
+   defining Unicode char U+0133 (decimal 307)
+   defining Unicode char U+0139 (decimal 313)
+   defining Unicode char U+013A (decimal 314)
+   defining Unicode char U+013D (decimal 317)
+   defining Unicode char U+013E (decimal 318)
+   defining Unicode char U+0141 (decimal 321)
+   defining Unicode char U+0142 (decimal 322)
+   defining Unicode char U+0143 (decimal 323)
+   defining Unicode char U+0144 (decimal 324)
+   defining Unicode char U+0147 (decimal 327)
+   defining Unicode char U+0148 (decimal 328)
+   defining Unicode char U+014A (decimal 330)
+   defining Unicode char U+014B (decimal 331)
+   defining Unicode char U+0150 (decimal 336)
+   defining Unicode char U+0151 (decimal 337)
+   defining Unicode char U+0152 (decimal 338)
+   defining Unicode char U+0153 (decimal 339)
+   defining Unicode char U+0154 (decimal 340)
+   defining Unicode char U+0155 (decimal 341)
+   defining Unicode char U+0158 (decimal 344)
+   defining Unicode char U+0159 (decimal 345)
+   defining Unicode char U+015A (decimal 346)
+   defining Unicode char U+015B (decimal 347)
+   defining Unicode char U+015E (decimal 350)
+   defining Unicode char U+015F (decimal 351)
+   defining Unicode char U+0160 (decimal 352)
+   defining Unicode char U+0161 (decimal 353)
+   defining Unicode char U+0162 (decimal 354)
+   defining Unicode char U+0163 (decimal 355)
+   defining Unicode char U+0164 (decimal 356)
+   defining Unicode char U+0165 (decimal 357)
+   defining Unicode char U+016E (decimal 366)
+   defining Unicode char U+016F (decimal 367)
+   defining Unicode char U+0170 (decimal 368)
+   defining Unicode char U+0171 (decimal 369)
+   defining Unicode char U+0178 (decimal 376)
+   defining Unicode char U+0179 (decimal 377)
+   defining Unicode char U+017A (decimal 378)
+   defining Unicode char U+017B (decimal 379)
+   defining Unicode char U+017C (decimal 380)
+   defining Unicode char U+017D (decimal 381)
+   defining Unicode char U+017E (decimal 382)
+   defining Unicode char U+200C (decimal 8204)
+   defining Unicode char U+2013 (decimal 8211)
+   defining Unicode char U+2014 (decimal 8212)
+   defining Unicode char U+2018 (decimal 8216)
+   defining Unicode char U+2019 (decimal 8217)
+   defining Unicode char U+201A (decimal 8218)
+   defining Unicode char U+201C (decimal 8220)
+   defining Unicode char U+201D (decimal 8221)
+   defining Unicode char U+201E (decimal 8222)
+   defining Unicode char U+2030 (decimal 8240)
+   defining Unicode char U+2031 (decimal 8241)
+   defining Unicode char U+2039 (decimal 8249)
+   defining Unicode char U+203A (decimal 8250)
+   defining Unicode char U+2423 (decimal 9251)
+)
+Now handling font encoding OT1 ...
+... processing UTF-8 mapping file for font encoding OT1
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/ot1enc.dfu
+File: ot1enc.dfu 2008/04/05 v1.1m UTF-8 support for inputenc
+   defining Unicode char U+00A1 (decimal 161)
+   defining Unicode char U+00A3 (decimal 163)
+   defining Unicode char U+00B8 (decimal 184)
+   defining Unicode char U+00BF (decimal 191)
+   defining Unicode char U+00C5 (decimal 197)
+   defining Unicode char U+00C6 (decimal 198)
+   defining Unicode char U+00D8 (decimal 216)
+   defining Unicode char U+00DF (decimal 223)
+   defining Unicode char U+00E6 (decimal 230)
+   defining Unicode char U+00EC (decimal 236)
+   defining Unicode char U+00ED (decimal 237)
+   defining Unicode char U+00EE (decimal 238)
+   defining Unicode char U+00EF (decimal 239)
+   defining Unicode char U+00F8 (decimal 248)
+   defining Unicode char U+0131 (decimal 305)
+   defining Unicode char U+0141 (decimal 321)
+   defining Unicode char U+0142 (decimal 322)
+   defining Unicode char U+0152 (decimal 338)
+   defining Unicode char U+0153 (decimal 339)
+   defining Unicode char U+2013 (decimal 8211)
+   defining Unicode char U+2014 (decimal 8212)
+   defining Unicode char U+2018 (decimal 8216)
+   defining Unicode char U+2019 (decimal 8217)
+   defining Unicode char U+201C (decimal 8220)
+   defining Unicode char U+201D (decimal 8221)
+)
+Now handling font encoding OMS ...
+... processing UTF-8 mapping file for font encoding OMS
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/omsenc.dfu
+File: omsenc.dfu 2008/04/05 v1.1m UTF-8 support for inputenc
+   defining Unicode char U+00A7 (decimal 167)
+   defining Unicode char U+00B6 (decimal 182)
+   defining Unicode char U+00B7 (decimal 183)
+   defining Unicode char U+2020 (decimal 8224)
+   defining Unicode char U+2021 (decimal 8225)
+   defining Unicode char U+2022 (decimal 8226)
+)
+Now handling font encoding OMX ...
+... no UTF-8 mapping file for font encoding OMX
+Now handling font encoding U ...
+... no UTF-8 mapping file for font encoding U
+Now handling font encoding LGR ...
+... processing UTF-8 mapping file for font encoding LGR
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/lgrx/lgrenc.dfu
+File: lgrenc.dfu 2012/07/03 0.2 UTF-8 support for Greek
+   defining Unicode char U+00A8 (decimal 168)
+   defining Unicode char U+00AB (decimal 171)
+   defining Unicode char U+00AF (decimal 175)
+   defining Unicode char U+00B4 (decimal 180)
+   defining Unicode char U+00B7 (decimal 183)
+   defining Unicode char U+00BB (decimal 187)
+   defining Unicode char U+0259 (decimal 601)
+   defining Unicode char U+02D8 (decimal 728)
+   defining Unicode char U+200C (decimal 8204)
+   defining Unicode char U+2013 (decimal 8211)
+   defining Unicode char U+2014 (decimal 8212)
+   defining Unicode char U+2018 (decimal 8216)
+   defining Unicode char U+2019 (decimal 8217)
+   defining Unicode char U+201A (decimal 8218)
+   defining Unicode char U+2030 (decimal 8240)
+   defining Unicode char U+2039 (decimal 8249)
+   defining Unicode char U+203A (decimal 8250)
+   defining Unicode char U+20AC (decimal 8364)
+   defining Unicode char U+0374 (decimal 884)
+   defining Unicode char U+0375 (decimal 885)
+   defining Unicode char U+037A (decimal 890)
+   defining Unicode char U+037E (decimal 894)
+   defining Unicode char U+0384 (decimal 900)
+   defining Unicode char U+0385 (decimal 901)
+   defining Unicode char U+0386 (decimal 902)
+   defining Unicode char U+0387 (decimal 903)
+   defining Unicode char U+0388 (decimal 904)
+   defining Unicode char U+0389 (decimal 905)
+   defining Unicode char U+038A (decimal 906)
+   defining Unicode char U+038C (decimal 908)
+   defining Unicode char U+038E (decimal 910)
+   defining Unicode char U+038F (decimal 911)
+   defining Unicode char U+0390 (decimal 912)
+   defining Unicode char U+0391 (decimal 913)
+   defining Unicode char U+0392 (decimal 914)
+   defining Unicode char U+0393 (decimal 915)
+   defining Unicode char U+0394 (decimal 916)
+   defining Unicode char U+0395 (decimal 917)
+   defining Unicode char U+0396 (decimal 918)
+   defining Unicode char U+0397 (decimal 919)
+   defining Unicode char U+0398 (decimal 920)
+   defining Unicode char U+0399 (decimal 921)
+   defining Unicode char U+039A (decimal 922)
+   defining Unicode char U+039B (decimal 923)
+   defining Unicode char U+039C (decimal 924)
+   defining Unicode char U+039D (decimal 925)
+   defining Unicode char U+039E (decimal 926)
+   defining Unicode char U+039F (decimal 927)
+   defining Unicode char U+03A0 (decimal 928)
+   defining Unicode char U+03A1 (decimal 929)
+   defining Unicode char U+03A3 (decimal 931)
+   defining Unicode char U+03A4 (decimal 932)
+   defining Unicode char U+03A5 (decimal 933)
+   defining Unicode char U+03A6 (decimal 934)
+   defining Unicode char U+03A7 (decimal 935)
+   defining Unicode char U+03A8 (decimal 936)
+   defining Unicode char U+03A9 (decimal 937)
+   defining Unicode char U+03AA (decimal 938)
+   defining Unicode char U+03AB (decimal 939)
+   defining Unicode char U+03AC (decimal 940)
+   defining Unicode char U+03AD (decimal 941)
+   defining Unicode char U+03AE (decimal 942)
+   defining Unicode char U+03AF (decimal 943)
+   defining Unicode char U+03B0 (decimal 944)
+   defining Unicode char U+03B1 (decimal 945)
+   defining Unicode char U+03B2 (decimal 946)
+   defining Unicode char U+03B3 (decimal 947)
+   defining Unicode char U+03B4 (decimal 948)
+   defining Unicode char U+03B5 (decimal 949)
+   defining Unicode char U+03B6 (decimal 950)
+   defining Unicode char U+03B7 (decimal 951)
+   defining Unicode char U+03B8 (decimal 952)
+   defining Unicode char U+03B9 (decimal 953)
+   defining Unicode char U+03BA (decimal 954)
+   defining Unicode char U+03BB (decimal 955)
+   defining Unicode char U+03BC (decimal 956)
+   defining Unicode char U+03BD (decimal 957)
+   defining Unicode char U+03BE (decimal 958)
+   defining Unicode char U+03BF (decimal 959)
+   defining Unicode char U+03C0 (decimal 960)
+   defining Unicode char U+03C1 (decimal 961)
+   defining Unicode char U+03C2 (decimal 962)
+   defining Unicode char U+03C3 (decimal 963)
+   defining Unicode char U+03C4 (decimal 964)
+   defining Unicode char U+03C5 (decimal 965)
+   defining Unicode char U+03C6 (decimal 966)
+   defining Unicode char U+03C7 (decimal 967)
+   defining Unicode char U+03C8 (decimal 968)
+   defining Unicode char U+03C9 (decimal 969)
+   defining Unicode char U+03CA (decimal 970)
+   defining Unicode char U+03CB (decimal 971)
+   defining Unicode char U+03CC (decimal 972)
+   defining Unicode char U+03CD (decimal 973)
+   defining Unicode char U+03CE (decimal 974)
+   defining Unicode char U+03D8 (decimal 984)
+   defining Unicode char U+03D9 (decimal 985)
+   defining Unicode char U+03DA (decimal 986)
+   defining Unicode char U+03DB (decimal 987)
+   defining Unicode char U+03DC (decimal 988)
+   defining Unicode char U+03DD (decimal 989)
+   defining Unicode char U+03DF (decimal 991)
+   defining Unicode char U+03E0 (decimal 992)
+   defining Unicode char U+03E1 (decimal 993)
+   defining Unicode char U+1F00 (decimal 7936)
+   defining Unicode char U+1F01 (decimal 7937)
+   defining Unicode char U+1F02 (decimal 7938)
+   defining Unicode char U+1F03 (decimal 7939)
+   defining Unicode char U+1F04 (decimal 7940)
+   defining Unicode char U+1F05 (decimal 7941)
+   defining Unicode char U+1F06 (decimal 7942)
+   defining Unicode char U+1F07 (decimal 7943)
+   defining Unicode char U+1F08 (decimal 7944)
+   defining Unicode char U+1F09 (decimal 7945)
+   defining Unicode char U+1F0A (decimal 7946)
+   defining Unicode char U+1F0B (decimal 7947)
+   defining Unicode char U+1F0C (decimal 7948)
+   defining Unicode char U+1F0D (decimal 7949)
+   defining Unicode char U+1F0E (decimal 7950)
+   defining Unicode char U+1F0F (decimal 7951)
+   defining Unicode char U+1F10 (decimal 7952)
+   defining Unicode char U+1F11 (decimal 7953)
+   defining Unicode char U+1F12 (decimal 7954)
+   defining Unicode char U+1F13 (decimal 7955)
+   defining Unicode char U+1F14 (decimal 7956)
+   defining Unicode char U+1F15 (decimal 7957)
+   defining Unicode char U+1F18 (decimal 7960)
+   defining Unicode char U+1F19 (decimal 7961)
+   defining Unicode char U+1F1A (decimal 7962)
+   defining Unicode char U+1F1B (decimal 7963)
+   defining Unicode char U+1F1C (decimal 7964)
+   defining Unicode char U+1F1D (decimal 7965)
+   defining Unicode char U+1F20 (decimal 7968)
+   defining Unicode char U+1F21 (decimal 7969)
+   defining Unicode char U+1F22 (decimal 7970)
+   defining Unicode char U+1F23 (decimal 7971)
+   defining Unicode char U+1F24 (decimal 7972)
+   defining Unicode char U+1F25 (decimal 7973)
+   defining Unicode char U+1F26 (decimal 7974)
+   defining Unicode char U+1F27 (decimal 7975)
+   defining Unicode char U+1F28 (decimal 7976)
+   defining Unicode char U+1F29 (decimal 7977)
+   defining Unicode char U+1F2A (decimal 7978)
+   defining Unicode char U+1F2B (decimal 7979)
+   defining Unicode char U+1F2C (decimal 7980)
+   defining Unicode char U+1F2D (decimal 7981)
+   defining Unicode char U+1F2E (decimal 7982)
+   defining Unicode char U+1F2F (decimal 7983)
+   defining Unicode char U+1F30 (decimal 7984)
+   defining Unicode char U+1F31 (decimal 7985)
+   defining Unicode char U+1F32 (decimal 7986)
+   defining Unicode char U+1F33 (decimal 7987)
+   defining Unicode char U+1F34 (decimal 7988)
+   defining Unicode char U+1F35 (decimal 7989)
+   defining Unicode char U+1F36 (decimal 7990)
+   defining Unicode char U+1F37 (decimal 7991)
+   defining Unicode char U+1F38 (decimal 7992)
+   defining Unicode char U+1F39 (decimal 7993)
+   defining Unicode char U+1F3A (decimal 7994)
+   defining Unicode char U+1F3B (decimal 7995)
+   defining Unicode char U+1F3C (decimal 7996)
+   defining Unicode char U+1F3D (decimal 7997)
+   defining Unicode char U+1F3E (decimal 7998)
+   defining Unicode char U+1F3F (decimal 7999)
+   defining Unicode char U+1F40 (decimal 8000)
+   defining Unicode char U+1F41 (decimal 8001)
+   defining Unicode char U+1F42 (decimal 8002)
+   defining Unicode char U+1F43 (decimal 8003)
+   defining Unicode char U+1F44 (decimal 8004)
+   defining Unicode char U+1F45 (decimal 8005)
+   defining Unicode char U+1F48 (decimal 8008)
+   defining Unicode char U+1F49 (decimal 8009)
+   defining Unicode char U+1F4A (decimal 8010)
+   defining Unicode char U+1F4B (decimal 8011)
+   defining Unicode char U+1F4C (decimal 8012)
+   defining Unicode char U+1F4D (decimal 8013)
+   defining Unicode char U+1F50 (decimal 8016)
+   defining Unicode char U+1F51 (decimal 8017)
+   defining Unicode char U+1F52 (decimal 8018)
+   defining Unicode char U+1F53 (decimal 8019)
+   defining Unicode char U+1F54 (decimal 8020)
+   defining Unicode char U+1F55 (decimal 8021)
+   defining Unicode char U+1F56 (decimal 8022)
+   defining Unicode char U+1F57 (decimal 8023)
+   defining Unicode char U+1F59 (decimal 8025)
+   defining Unicode char U+1F5B (decimal 8027)
+   defining Unicode char U+1F5D (decimal 8029)
+   defining Unicode char U+1F5F (decimal 8031)
+   defining Unicode char U+1F60 (decimal 8032)
+   defining Unicode char U+1F61 (decimal 8033)
+   defining Unicode char U+1F62 (decimal 8034)
+   defining Unicode char U+1F63 (decimal 8035)
+   defining Unicode char U+1F64 (decimal 8036)
+   defining Unicode char U+1F65 (decimal 8037)
+   defining Unicode char U+1F66 (decimal 8038)
+   defining Unicode char U+1F67 (decimal 8039)
+   defining Unicode char U+1F68 (decimal 8040)
+   defining Unicode char U+1F69 (decimal 8041)
+   defining Unicode char U+1F6A (decimal 8042)
+   defining Unicode char U+1F6B (decimal 8043)
+   defining Unicode char U+1F6C (decimal 8044)
+   defining Unicode char U+1F6D (decimal 8045)
+   defining Unicode char U+1F6E (decimal 8046)
+   defining Unicode char U+1F6F (decimal 8047)
+   defining Unicode char U+1F70 (decimal 8048)
+   defining Unicode char U+1F71 (decimal 8049)
+   defining Unicode char U+1F72 (decimal 8050)
+   defining Unicode char U+1F73 (decimal 8051)
+   defining Unicode char U+1F74 (decimal 8052)
+   defining Unicode char U+1F75 (decimal 8053)
+   defining Unicode char U+1F76 (decimal 8054)
+   defining Unicode char U+1F77 (decimal 8055)
+   defining Unicode char U+1F78 (decimal 8056)
+   defining Unicode char U+1F79 (decimal 8057)
+   defining Unicode char U+1F7A (decimal 8058)
+   defining Unicode char U+1F7B (decimal 8059)
+   defining Unicode char U+1F7C (decimal 8060)
+   defining Unicode char U+1F7D (decimal 8061)
+   defining Unicode char U+1F80 (decimal 8064)
+   defining Unicode char U+1F81 (decimal 8065)
+   defining Unicode char U+1F82 (decimal 8066)
+   defining Unicode char U+1F83 (decimal 8067)
+   defining Unicode char U+1F84 (decimal 8068)
+   defining Unicode char U+1F85 (decimal 8069)
+   defining Unicode char U+1F86 (decimal 8070)
+   defining Unicode char U+1F87 (decimal 8071)
+   defining Unicode char U+1F88 (decimal 8072)
+   defining Unicode char U+1F89 (decimal 8073)
+   defining Unicode char U+1F8A (decimal 8074)
+   defining Unicode char U+1F8B (decimal 8075)
+   defining Unicode char U+1F8C (decimal 8076)
+   defining Unicode char U+1F8D (decimal 8077)
+   defining Unicode char U+1F8E (decimal 8078)
+   defining Unicode char U+1F8F (decimal 8079)
+   defining Unicode char U+1F90 (decimal 8080)
+   defining Unicode char U+1F91 (decimal 8081)
+   defining Unicode char U+1F92 (decimal 8082)
+   defining Unicode char U+1F93 (decimal 8083)
+   defining Unicode char U+1F94 (decimal 8084)
+   defining Unicode char U+1F95 (decimal 8085)
+   defining Unicode char U+1F96 (decimal 8086)
+   defining Unicode char U+1F97 (decimal 8087)
+   defining Unicode char U+1F98 (decimal 8088)
+   defining Unicode char U+1F99 (decimal 8089)
+   defining Unicode char U+1F9A (decimal 8090)
+   defining Unicode char U+1F9B (decimal 8091)
+   defining Unicode char U+1F9C (decimal 8092)
+   defining Unicode char U+1F9D (decimal 8093)
+   defining Unicode char U+1F9E (decimal 8094)
+   defining Unicode char U+1F9F (decimal 8095)
+   defining Unicode char U+1FA0 (decimal 8096)
+   defining Unicode char U+1FA1 (decimal 8097)
+   defining Unicode char U+1FA2 (decimal 8098)
+   defining Unicode char U+1FA3 (decimal 8099)
+   defining Unicode char U+1FA4 (decimal 8100)
+   defining Unicode char U+1FA5 (decimal 8101)
+   defining Unicode char U+1FA6 (decimal 8102)
+   defining Unicode char U+1FA7 (decimal 8103)
+   defining Unicode char U+1FA8 (decimal 8104)
+   defining Unicode char U+1FA9 (decimal 8105)
+   defining Unicode char U+1FAA (decimal 8106)
+   defining Unicode char U+1FAB (decimal 8107)
+   defining Unicode char U+1FAC (decimal 8108)
+   defining Unicode char U+1FAD (decimal 8109)
+   defining Unicode char U+1FAE (decimal 8110)
+   defining Unicode char U+1FAF (decimal 8111)
+   defining Unicode char U+1FB0 (decimal 8112)
+   defining Unicode char U+1FB1 (decimal 8113)
+   defining Unicode char U+1FB2 (decimal 8114)
+   defining Unicode char U+1FB3 (decimal 8115)
+   defining Unicode char U+1FB4 (decimal 8116)
+   defining Unicode char U+1FB6 (decimal 8118)
+   defining Unicode char U+1FB7 (decimal 8119)
+   defining Unicode char U+1FB8 (decimal 8120)
+   defining Unicode char U+1FB9 (decimal 8121)
+   defining Unicode char U+1FBA (decimal 8122)
+   defining Unicode char U+1FBB (decimal 8123)
+   defining Unicode char U+1FBC (decimal 8124)
+   defining Unicode char U+1FBD (decimal 8125)
+   defining Unicode char U+1FBE (decimal 8126)
+   defining Unicode char U+1FBF (decimal 8127)
+   defining Unicode char U+1FC0 (decimal 8128)
+   defining Unicode char U+1FC1 (decimal 8129)
+   defining Unicode char U+1FC2 (decimal 8130)
+   defining Unicode char U+1FC3 (decimal 8131)
+   defining Unicode char U+1FC4 (decimal 8132)
+   defining Unicode char U+1FC6 (decimal 8134)
+   defining Unicode char U+1FC7 (decimal 8135)
+   defining Unicode char U+1FC8 (decimal 8136)
+   defining Unicode char U+1FC9 (decimal 8137)
+   defining Unicode char U+1FCA (decimal 8138)
+   defining Unicode char U+1FCB (decimal 8139)
+   defining Unicode char U+1FCC (decimal 8140)
+   defining Unicode char U+1FCD (decimal 8141)
+   defining Unicode char U+1FCE (decimal 8142)
+   defining Unicode char U+1FCF (decimal 8143)
+   defining Unicode char U+1FD0 (decimal 8144)
+   defining Unicode char U+1FD1 (decimal 8145)
+   defining Unicode char U+1FD2 (decimal 8146)
+   defining Unicode char U+1FD3 (decimal 8147)
+   defining Unicode char U+1FD6 (decimal 8150)
+   defining Unicode char U+1FD7 (decimal 8151)
+   defining Unicode char U+1FD8 (decimal 8152)
+   defining Unicode char U+1FD9 (decimal 8153)
+   defining Unicode char U+1FDA (decimal 8154)
+   defining Unicode char U+1FDB (decimal 8155)
+   defining Unicode char U+1FDD (decimal 8157)
+   defining Unicode char U+1FDE (decimal 8158)
+   defining Unicode char U+1FDF (decimal 8159)
+   defining Unicode char U+1FE0 (decimal 8160)
+   defining Unicode char U+1FE1 (decimal 8161)
+   defining Unicode char U+1FE2 (decimal 8162)
+   defining Unicode char U+1FE3 (decimal 8163)
+   defining Unicode char U+1FE4 (decimal 8164)
+   defining Unicode char U+1FE5 (decimal 8165)
+   defining Unicode char U+1FE6 (decimal 8166)
+   defining Unicode char U+1FE7 (decimal 8167)
+   defining Unicode char U+1FE8 (decimal 8168)
+   defining Unicode char U+1FE9 (decimal 8169)
+   defining Unicode char U+1FEA (decimal 8170)
+   defining Unicode char U+1FEB (decimal 8171)
+   defining Unicode char U+1FEC (decimal 8172)
+   defining Unicode char U+1FED (decimal 8173)
+   defining Unicode char U+1FEE (decimal 8174)
+   defining Unicode char U+1FEF (decimal 8175)
+   defining Unicode char U+1FF2 (decimal 8178)
+   defining Unicode char U+1FF3 (decimal 8179)
+   defining Unicode char U+1FF4 (decimal 8180)
+   defining Unicode char U+1FF6 (decimal 8182)
+   defining Unicode char U+1FF7 (decimal 8183)
+   defining Unicode char U+1FF8 (decimal 8184)
+   defining Unicode char U+1FF9 (decimal 8185)
+   defining Unicode char U+1FFA (decimal 8186)
+   defining Unicode char U+1FFB (decimal 8187)
+   defining Unicode char U+1FFC (decimal 8188)
+   defining Unicode char U+1FFD (decimal 8189)
+   defining Unicode char U+1FFE (decimal 8190)
+   defining Unicode char U+2013 (decimal 8211)
+   defining Unicode char U+2014 (decimal 8212)
+   defining Unicode char U+2018 (decimal 8216)
+   defining Unicode char U+2019 (decimal 8217)
+   defining Unicode char U+2030 (decimal 8240)
+   defining Unicode char U+20AC (decimal 8364)
+   defining Unicode char U+2126 (decimal 8486)
+   defining Unicode char U+10144 (decimal 65860)
+   defining Unicode char U+10145 (decimal 65861)
+   defining Unicode char U+10146 (decimal 65862)
+   defining Unicode char U+10147 (decimal 65863)
+)
+   defining Unicode char U+00A9 (decimal 169)
+   defining Unicode char U+00AA (decimal 170)
+   defining Unicode char U+00AE (decimal 174)
+   defining Unicode char U+00BA (decimal 186)
+   defining Unicode char U+02C6 (decimal 710)
+   defining Unicode char U+02DC (decimal 732)
+   defining Unicode char U+200C (decimal 8204)
+   defining Unicode char U+2026 (decimal 8230)
+   defining Unicode char U+2122 (decimal 8482)
+   defining Unicode char U+2423 (decimal 9251)
+))
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/babel.sty
+Package: babel 2008/07/08 v3.8m The Babel package
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/greek.ldf
+Language: greek 2005/03/30 v1.3l Greek support from the babel system
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/babel.def
+File: babel.def 2008/07/08 v3.8m Babel common definitions
+\babel@savecnt=\count109
+\U@D=\dimen135
+)
+Loading the definitions for the Greek font encoding
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/lgrenc.def
+File: lgrenc.def 2008/06/17 v2.3 Greek Encoding
+LaTeX Font Info:    Redeclaring font encoding LGR on input line 45.
+))
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/germanb.ldf
+Language: germanb 2008/06/01 v2.6m German support from the babel system
+\l@austrian = a dialect from \language\l@german 
+Package babel Info: Making " an active character on input line 102.
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/english.ldf
+Language: english 2005/03/30 v3.3o English support from the babel system
+\l@canadian = a dialect from \language\l@american 
+\l@australian = a dialect from \language\l@british 
+\l@newzealand = a dialect from \language\l@british 
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/italian.ldf
+Language: italian 2008/03/14 v1.2t Italian support from the babel system
+))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/graphics/graphicx.sty
+Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
+\Gin@req@height=\dimen136
+\Gin@req@width=\dimen137
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/booktabs/booktabs.sty
+Package: booktabs 2005/04/14 v1.61803 publication quality tables
+\heavyrulewidth=\dimen138
+\lightrulewidth=\dimen139
+\cmidrulewidth=\dimen140
+\belowrulesep=\dimen141
+\belowbottomsep=\dimen142
+\aboverulesep=\dimen143
+\abovetopsep=\dimen144
+\cmidrulesep=\dimen145
+\cmidrulekern=\dimen146
+\defaultaddspace=\dimen147
+\@cmidla=\count110
+\@cmidlb=\count111
+\@aboverulesep=\dimen148
+\@belowrulesep=\dimen149
+\@thisruleclass=\count112
+\@lastruleclass=\count113
+\@thisrulewidth=\dimen150
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/tools/varioref.sty
+Package: varioref 2011/10/02 v1.4z package for extended references (FMi)
+\c@vrcnt=\count114
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/lipsum/lipsum.sty
+Package: lipsum 2011/04/14 v1.2 150 paragraphs of Lorem Ipsum dummy text
+\c@lips@count=\count115
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/makeidx.sty
+Package: makeidx 2000/03/29 v1.0m Standard LaTeX package
+)
+\@indexfile=\write3
+\openout3 = `tesi.idx'.
+
+
+Writing index file tesi.idx
+(/usr/local/texlive/2012/texmf-dist/tex/latex/csquotes/csquotes.sty
+Package: csquotes 2011/10/22 v5.1d context-sensitive quotations
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+Package: etoolbox 2011/01/03 v2.1 e-TeX tools for LaTeX
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/etex-pkg/etex.sty
+Package: etex 1998/03/26 v2.0 eTeX basic definition package (PEB)
+\et@xins=\count116
+)
+\etb@tempcnta=\count117
+)
+\csq@reset=\count118
+\csq@gtype=\count119
+\csq@glevel=\count120
+\csq@qlevel=\count121
+\csq@maxlvl=\count122
+\csq@tshold=\count123
+\csq@ltx@everypar=\toks21
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/csquotes/csquotes.def
+File: csquotes.def 2011/10/22 v5.1d csquotes generic definitions
+)
+Package csquotes Info: Trying to load configuration file 'csquotes.cfg'...
+Package csquotes Info: ... configuration file loaded successfully.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/csquotes/csquotes.cfg
+File: csquotes.cfg 
+)
+Package csquotes Info: Redefining alias 'italian' -> 'italian/guillemets'.
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/biblatex.sty
+Package: biblatex 2012/08/17 v2.2 programmable bibliographies (PK/JW/AB)
+
+
+Package biblatex Warning: No "backend" specified, using Biber backend.
+(biblatex)                To use BibTeX, load biblatex with 
+(biblatex)                the "backend=bibtex" option.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/biblatex2.sty
+Package: biblatex2 2012/08/17 v2.2 programmable bibliographies (biber) (PK/JW/A
+B)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+Package: kvsetkeys 2012/04/25 v1.16 Key value parser (HO)
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)
+Package etexcmds Info: Could not find \expanded.
+(etexcmds)             That can mean that you are not using pdfTeX 1.50 or
+(etexcmds)             that some package has redefined \expanded.
+(etexcmds)             In the latter case, load this package earlier.
+)))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/logreq/logreq.sty
+Package: logreq 2010/08/04 v1.0 xml request logger
+\lrq@indent=\count124
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/logreq/logreq.def
+File: logreq.def 2010/08/04 v1.0 logreq spec v1.0
+))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/base/ifthen.sty
+Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/url/url.sty
+\Urlmuskip=\muskip10
+Package: url 2006/04/12  ver 3.3  Verb mode for urls, etc.
+)
+\c@tabx@nest=\count125
+\c@listtotal=\count126
+\c@listcount=\count127
+\c@liststart=\count128
+\c@liststop=\count129
+\c@citecount=\count130
+\c@citetotal=\count131
+\c@multicitecount=\count132
+\c@multicitetotal=\count133
+\c@instcount=\count134
+\c@maxnames=\count135
+\c@minnames=\count136
+\c@maxitems=\count137
+\c@minitems=\count138
+\c@citecounter=\count139
+\c@savedcitecounter=\count140
+\c@uniquelist=\count141
+\c@uniquename=\count142
+\c@refsection=\count143
+\c@refsegment=\count144
+\c@maxextratitle=\count145
+\c@maxextratitleyear=\count146
+\c@maxextrayear=\count147
+\c@maxextraalpha=\count148
+\c@abbrvpenalty=\count149
+\c@highnamepenalty=\count150
+\c@lownamepenalty=\count151
+\c@maxparens=\count152
+\c@parenlevel=\count153
+\blx@tempcnta=\count154
+\blx@tempcntb=\count155
+\blx@tempcntc=\count156
+\blx@maxsection=\count157
+\blx@maxsegment@0=\count158
+\blx@notetype=\count159
+\blx@parenlevel@text=\count160
+\blx@parenlevel@foot=\count161
+\blx@sectionciteorder@0=\count162
+\labelnumberwidth=\skip65
+\labelalphawidth=\skip66
+\shorthandwidth=\skip67
+\biblabelsep=\skip68
+\bibitemsep=\skip69
+\bibnamesep=\skip70
+\bibinitsep=\skip71
+\bibparsep=\skip72
+\bibhang=\skip73
+\blx@bcfin=\read1
+\blx@bcfout=\write4
+\c@mincomprange=\count163
+\c@maxcomprange=\count164
+\c@mincompwidth=\count165
+Package biblatex Info: Trying to load biblatex default data model...
+Package biblatex Info: ... file 'blx-dm.def' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/blx-dm.def)
+Package biblatex Info: Trying to load biblatex style data model...
+Package biblatex Info: ... file 'philosophy-classic.dbx' not found.
+Package biblatex Info: Trying to load biblatex custom data model...
+Package biblatex Info: ... file 'biblatex-dm.cfg' not found.
+\c@afterword=\count166
+\c@savedafterword=\count167
+\c@annotator=\count168
+\c@savedannotator=\count169
+\c@author=\count170
+\c@savedauthor=\count171
+\c@bookauthor=\count172
+\c@savedbookauthor=\count173
+\c@commentator=\count174
+\c@savedcommentator=\count175
+\c@editor=\count176
+\c@savededitor=\count177
+\c@editora=\count178
+\c@savededitora=\count179
+\c@editorb=\count180
+\c@savededitorb=\count181
+\c@editorc=\count182
+\c@savededitorc=\count183
+\c@foreword=\count184
+\c@savedforeword=\count185
+\c@holder=\count186
+\c@savedholder=\count187
+\c@introduction=\count188
+\c@savedintroduction=\count189
+\c@namea=\count190
+\c@savednamea=\count191
+\c@nameb=\count192
+\c@savednameb=\count193
+\c@namec=\count194
+\c@savednamec=\count195
+\c@shortauthor=\count196
+\c@savedshortauthor=\count197
+\c@shorteditor=\count198
+\c@savedshorteditor=\count199
+\c@translator=\count200
+\c@savedtranslator=\count201
+\c@labelname=\count202
+\c@savedlabelname=\count203
+\c@institution=\count204
+\c@savedinstitution=\count205
+\c@lista=\count206
+\c@savedlista=\count207
+\c@listb=\count208
+\c@savedlistb=\count209
+\c@listc=\count210
+\c@savedlistc=\count211
+\c@listd=\count212
+\c@savedlistd=\count213
+\c@liste=\count214
+\c@savedliste=\count215
+\c@listf=\count216
+\c@savedlistf=\count217
+\c@location=\count218
+\c@savedlocation=\count219
+\c@organization=\count220
+\c@savedorganization=\count221
+\c@origlocation=\count222
+\c@savedoriglocation=\count223
+\c@origpublisher=\count224
+\c@savedorigpublisher=\count225
+\c@publisher=\count226
+\c@savedpublisher=\count227
+\c@language=\count228
+\c@savedlanguage=\count229
+\c@pageref=\count230
+\c@savedpageref=\count231
+Package biblatex Info: Trying to load compatibility code...
+Package biblatex Info: ... file 'blx-compat.def' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/blx-compat.def
+File: blx-compat.def 2012/08/17 v2.2 biblatex compatibility (PK/JW/AB)
+)
+Package biblatex Info: Trying to load generic definitions...
+Package biblatex Info: ... file 'biblatex.def' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/biblatex.def
+File: biblatex.def 
+\c@biburlnumpenalty=\count232
+\c@biburlucpenalty=\count233
+Normal \count register pool exhausted, switching to extended pool.
+\c@biburllcpenalty=\count277
+\c@smartand=\count278
+)
+Package biblatex Info: Trying to load bibliography style 'philosophy-classic'..
+.
+Package biblatex Info: ... file 'philosophy-classic.bbx' found.
+
+(/Users/Ivan/Library/texmf/tex/latex/biblatex/biblatex-philosophy/philosophy-cl
+assic.bbx
+File: philosophy-classic.bbx philosophy-classic.bbx,v 0.8b 2012/05/06 valbusa b
+eta$
+Package biblatex Info: Trying to load bibliography style 'authoryear'...
+Package biblatex Info: ... file 'authoryear.bbx' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+File: authoryear.bbx 2012/08/17 v2.2 biblatex bibliography style (PK/JW/AB)
+Package biblatex Info: Trying to load bibliography style 'standard'...
+Package biblatex Info: ... file 'standard.bbx' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+File: standard.bbx 2012/08/17 v2.2 biblatex bibliography style (PK/JW/AB)
+\c@bbx:relatedcount=\count279
+))
+Package biblatex Info: Trying to load bibliography style 'philosophy-standard'.
+..
+Package biblatex Info: ... file 'philosophy-standard.bbx' found.
+
+(/Users/Ivan/Library/texmf/tex/latex/biblatex/biblatex-philosophy/philosophy-st
+andard.bbx
+File: philosophy-standard.bbx $Id: philosophy-standard.bbx,v 0.8b 2012/05/06 va
+lbsua beta $
+)
+\c@maxnamesincross=\count280
+\c@minnamesincross=\count281
+)
+Package biblatex Info: Trying to load citation style 'philosophy-classic'...
+Package biblatex Info: ... file 'philosophy-classic.cbx' found.
+
+(/Users/Ivan/Library/texmf/tex/latex/biblatex/biblatex-philosophy/philosophy-cl
+assic.cbx
+File: philosophy-classic.cbx philosophy-classic.cbx,v 0.8b 2012/05/06 valbusa b
+eta$
+Package biblatex Info: Trying to load citation style 'authoryear-comp'...
+Package biblatex Info: ... file 'authoryear-comp.cbx' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+File: authoryear-comp.cbx 2012/08/17 v2.2 biblatex citation style (PK/JW/AB)
+Package biblatex Info: Redefining '\cite'.
+Package biblatex Info: Redefining '\parencite'.
+Package biblatex Info: Redefining '\footcite'.
+Package biblatex Info: Redefining '\footcitetext'.
+Package biblatex Info: Redefining '\smartcite'.
+Package biblatex Info: Redefining '\textcite'.
+Package biblatex Info: Redefining '\cites'.
+Package biblatex Info: Redefining '\parencites'.
+Package biblatex Info: Redefining '\footcites'.
+Package biblatex Info: Redefining '\footcitetexts'.
+Package biblatex Info: Redefining '\smartcites'.
+Package biblatex Info: Redefining '\textcites'.
+)
+Package biblatex Info: Redefining '\citetitle'.
+Package biblatex Info: Redefining '\citeyear'.
+)
+Package biblatex Info: Trying to load configuration file...
+Package biblatex Info: ... file 'biblatex.cfg' found.
+ (/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/biblatex.cfg
+File: biblatex.cfg 
+)))
+(/usr/local/texlive/2012/texmf-dist/tex/latex/frontespizio/frontespizio.sty
+Package: frontespizio 2011/09/21 1.4a (Enrico Gregorio)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/tools/afterpage.sty
+Package: afterpage 1995/10/27 v1.08 After-Page Package (DPC)
+\AP@output=\toks22
+\AP@partial=\box54
+\AP@footins=\box55
+)
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+Package: atbegshi 2011/10/05 v1.16 At begin shipout hook (HO)
+Package atbegshi Info: Package `crop' patched.
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/environ/environ.sty
+Package: environ 2008/06/18 v0.2 A new way to define environments
+\@emptytoks=\toks23
+\@envbody=\toks24
+)
+\front@out=\write5
+\openout5 = `tesi-frn.tex'.
+
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/hyperref/hyperref.sty
+Package: hyperref 2012/08/18 v6.83b Hypertext links for LaTeX
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+Package: hobsub-hyperref 2012/05/28 v1.13 Bundle oberdiek, subset hyperref (HO)
+
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+Package: hobsub-generic 2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)
+Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)
+Package hobsub Info: Skipping package `infwarerr' (already loaded).
+Package hobsub Info: Skipping package `ltxcmds' (already loaded).
+Package hobsub Info: Skipping package `ifluatex' (already loaded).
+Package hobsub Info: Skipping package `ifvtex' (already loaded).
+Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)
+Package hobsub Info: Skipping package `ifpdf' (already loaded).
+Package hobsub Info: Skipping package `etexcmds' (already loaded).
+Package hobsub Info: Skipping package `kvsetkeys' (already loaded).
+Package: kvdefinekeys 2011/04/07 v1.3 Define keys (HO)
+Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO
+)
+Package pdftexcmds Info: LuaTeX not detected.
+Package pdftexcmds Info: \pdf@primitive is available.
+Package pdftexcmds Info: \pdf@ifprimitive is available.
+Package pdftexcmds Info: \pdfdraftmode found.
+Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)
+Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO
+)
+Package: bitset 2011/01/30 v1.1 Handle bit-vector datatype (HO)
+Package: uniquecounter 2011/01/30 v1.2 Provide unlimited unique counter (HO)
+)
+Package hobsub Info: Skipping package `hobsub' (already loaded).
+Package: letltxmacro 2010/09/02 v1.4 Let assignment for LaTeX macros (HO)
+Package: hopatch 2012/05/28 v1.2 Wrapper for package hooks (HO)
+Package: xcolor-patch 2011/01/30 xcolor patch
+Package: atveryend 2011/06/30 v1.8 Hooks at the very end of document (HO)
+Package hobsub Info: Skipping package `atbegshi' (already loaded).
+Package: refcount 2011/10/16 v3.4 Data extraction from label references (HO)
+Package: hycolor 2011/01/30 v1.7 Color options for hyperref/bookmark (HO)
+)
+(/usr/local/texlive/2012/texmf-dist/tex/latex/oberdiek/auxhook.sty
+Package: auxhook 2011/03/04 v1.3 Hooks for auxiliary files (HO)
+)
+\@linkdim=\dimen151
+\Hy@linkcounter=\count282
+\Hy@pagecounter=\count283
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/hyperref/pd1enc.def
+File: pd1enc.def 2012/08/18 v6.83b Hyperref: PDFDocEncoding definition (HO)
+Now handling font encoding PD1 ...
+... no UTF-8 mapping file for font encoding PD1
+)
+\Hy@SavedSpaceFactor=\count284
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
+)
+Package hyperref Info: Hyper figures OFF on input line 4262.
+Package hyperref Info: Link nesting OFF on input line 4267.
+Package hyperref Info: Hyper index ON on input line 4270.
+Package hyperref Info: Plain pages OFF on input line 4277.
+Package hyperref Info: Backreferencing OFF on input line 4282.
+Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
+Package hyperref Info: Bookmarks ON on input line 4500.
+\c@Hy@tempcnt=\count285
+LaTeX Info: Redefining \url on input line 4853.
+\XeTeXLinkMargin=\dimen152
+\Fld@menulength=\count286
+\Field@Width=\dimen153
+\Fld@charsize=\dimen154
+Package hyperref Info: Hyper figures OFF on input line 6093.
+Package hyperref Info: Link nesting OFF on input line 6098.
+Package hyperref Info: Hyper index ON on input line 6101.
+Package hyperref Info: backreferencing OFF on input line 6108.
+Package hyperref Info: Link coloring OFF on input line 6113.
+Package hyperref Info: Link coloring with OCG OFF on input line 6118.
+Package hyperref Info: PDF/A mode OFF on input line 6123.
+LaTeX Info: Redefining \ref on input line 6163.
+LaTeX Info: Redefining \pageref on input line 6167.
+\Hy@abspage=\count287
+\c@Item=\count288
+\c@Hfootnote=\count289
+)
+
+Package hyperref Message: Driver (autodetected): hpdftex.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/hyperref/hpdftex.def
+File: hpdftex.def 2012/08/18 v6.83b Hyperref driver for pdfTeX
+\Fld@listcount=\count290
+\c@bookmark@seq@number=\count291
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+Package: rerunfilecheck 2011/04/15 v1.7 Rerun checks for auxiliary files (HO)
+Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 2
+82.
+)
+\Hy@SectionHShift=\skip74
+)
+Package hyperref Info: Option `colorlinks' set `true' on input line 46.
+Package csquotes Info: Checking for multilingual support...
+Package csquotes Info: ... found 'babel' package.
+Package csquotes Info: Adjusting default style.
+Package csquotes Info: Redefining alias 'default' -> 'italian'.
+Package biblatex Info: Trying to load language 'italian' -> 'italian-philosophy
+'...
+Package biblatex Info: ... file 'italian-philosophy.lbx' found.
+
+(/Users/Ivan/Library/texmf/tex/latex/biblatex/biblatex-philosophy/italian-philo
+sophy.lbx
+File: italian-philosophy.lbx v 0.8b 2012/05/06 biblatex localization file for b
+iblatex-philosophy
+Package biblatex Info: Trying to load language 'italian'...
+Package biblatex Info: ... file 'italian.lbx' found.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+File: italian.lbx 2012/08/17 v2.2 biblatex localization (PK/JW/AB)
+))
+No file tesi.aux.
+\openout1 = `tesi.aux'.
+
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for LGR/cmr/m/n on input line 52.
+LaTeX Font Info:    Try loading font information for LGR+cmr on input line 52.
+(/usr/local/texlive/2012/texmf-dist/tex/generic/babel/lgrcmr.fd
+File: lgrcmr.fd 2008/06/17 v2.3 Greek Computer Modern
+)
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Try loading font information for T1+pplj on input line 52.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/t1pplj.fd
+File: t1pplj.fd 2004/09/06 font definitions for T1/pplj.
+)
+(/usr/local/texlive/2012/texmf-dist/tex/context/base/supp-pdf.mkii
+[Loading MPS to PDF converter (version 2006.09.02).]
+\scratchcounter=\count292
+\scratchdimen=\dimen155
+\scratchbox=\box56
+\nofMPsegments=\count293
+\nofMParguments=\count294
+\everyMPshowfont=\toks25
+\MPscratchCnt=\count295
+\MPscratchDim=\dimen156
+\MPnumerator=\count296
+\makeMPintoPDFobject=\count297
+\everyMPtoPDFconversion=\toks26
+)
+LaTeX Info: Redefining \microtypecontext on input line 52.
+Package microtype Info: Generating PDF output.
+Package microtype Info: Character protrusion enabled (level 2).
+Package microtype Info: Using default protrusion set `alltext'.
+Package microtype Info: Automatic font expansion enabled (level 2),
+(microtype)             stretch: 20, shrink: 20, step: 1, non-selected.
+Package microtype Info: Using default expansion set `basictext'.
+Package microtype Info: No adjustment of tracking.
+Package microtype Info: No adjustment of interword spacing.
+Package microtype Info: No adjustment of character kerning.
+ (/Users/Ivan/Library/texmf/tex/latex/microtype/mt-ppl.cfg
+File: mt-ppl.cfg 2005/11/16 v1.6 microtype config. file: Palatino (RS)
+)
+\big@size=\dimen157
+LaTeX Info: Redefining \greektext on input line 52.
+
+*geometry* driver: auto-detecting
+*geometry* detected driver: pdftex
+*geometry* verbose mode - [ preamble ] result:
+* driver: pdftex
+* paper: a4paper
+* layout: <same size as paper>
+* layoutoffset:(h,v)=(0.0pt,0.0pt)
+* hratio: 1:2
+* vratio: 1:2
+* modes: includehead twoside heightrounded 
+* h-part:(L,W,R)=(95.16928pt, 312.0pt, 190.3386pt)
+* v-part:(T,H,B)=(63.65977pt, 654.06749pt, 127.31958pt)
+* \paperwidth=597.50787pt
+* \paperheight=845.04684pt
+* \textwidth=312.0pt
+* \textheight=620.0pt
+* \oddsidemargin=22.89929pt
+* \evensidemargin=118.0686pt
+* \topmargin=-8.61021pt
+* \headheight=12.0pt
+* \headsep=18.06749pt
+* \topskip=10.0pt
+* \footskip=25.29494pt
+* \marginparwidth=82.0pt
+* \marginparsep=12.0pt
+* \columnsep=10.0pt
+* \skip\footins=9.0pt plus 4.0pt minus 2.0pt
+* \hoffset=0.0pt
+* \voffset=0.0pt
+* \mag=1000
+* \@twocolumnfalse
+* \@twosidetrue
+* \@mparswitchtrue
+* \@reversemarginfalse
+* (1in=72.27pt=25.4mm, 1cm=28.453pt)
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+Package: epstopdf-base 2010/02/09 v2.5 Base part for package epstopdf
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/oberdiek/grfext.sty
+Package: grfext 2010/08/19 v1.1 Manage graphics extensions (HO)
+)
+Package grfext Info: Graphics extension search list:
+(grfext)             [.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPE
+G,.JBIG2,.JB2,.eps]
+(grfext)             \AppendGraphicsExtensions on input line 452.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/latexconfig/epstopdf-sys.cfg
+File: epstopdf-sys.cfg 2010/07/13 v1.3 Configuration of (r)epstopdf for TeX Liv
+e
+))
+Package crop Info: requested driver: `' on input line 52.
+Package crop Info: detected driver: `pdftex' on input line 52.
+Package crop Info: using `pdftex' graphics driver on input line 52.
+Package caption Info: Begin \AtBeginDocument code.
+Package caption Info: hyperref package is loaded.
+Package caption Info: End \AtBeginDocument code.
+\SUF@label@part=\skip75
+\SUF@label@section=\skip76
+\SUF@label@subsection=\skip77
+\SUF@label@subsubsection=\skip78
+\SUF@label@paragraph=\skip79
+\SUF@label@subparagraph=\skip80
+\SUF@label@figure=\skip81
+\SUF@label@table=\skip82
+\SUF@tocindent@chap=\skip83
+\SUF@tocindent@sec=\skip84
+\SUF@tocindent@subsec=\skip85
+\SUF@tocindent@subsubsec=\skip86
+\SUF@tocindent@par=\skip87
+\SUF@tocindent@subpar=\skip88
+\SUF@tocindent@fig=\skip89
+\SUF@tocindent@tab=\skip90
+Package biblatex Info: Input encoding 'utf8' detected.
+Package biblatex Info: Automatic encoding selection.
+(biblatex)             Assuming data encoding 'utf8'.
+\openout4 = `tesi.bcf'.
+
+Package biblatex Info: Trying to load bibliographic data...
+Package biblatex Info: ... file 'tesi.bbl' not found.
+
+No file tesi.bbl.
+Package biblatex Info: Reference section=0 on input line 52.
+Package biblatex Info: Reference segment=0 on input line 52.
+\AtBeginShipoutBox=\box57
+Package hyperref Info: Link coloring ON on input line 52.
+(/usr/local/texlive/2012/texmf-dist/tex/latex/hyperref/nameref.sty
+Package: nameref 2012/07/31 v2.42 Cross-referencing by name of section
+
+(/usr/local/texlive/2012/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+Package: gettitlestring 2010/12/03 v1.4 Cleanup title references (HO)
+)
+\c@section@level=\count298
+LaTeX Info: Redefining \Ref on input line 503.
+)
+LaTeX Info: Redefining \ref on input line 52.
+LaTeX Info: Redefining \pageref on input line 52.
+LaTeX Info: Redefining \nameref on input line 52.
+\@outlinefile=\write6
+\openout6 = `tesi.out'.
+
+LaTeX Info: Redefining \Ref on input line 52.
+
+
+Package frontespizio Warning: Missing file tesi-frn.pdf.
+
+[1{/usr/local/texlive/2012/texmf-var/fonts/map/pdftex/updmap/pdftex.map}
+
+
+]
+LaTeX Font Info:    Try loading font information for OMS+pplj on input line 76.
+
+LaTeX Font Info:    No file OMSpplj.fd. on input line 76.
+
+
+LaTeX Font Warning: Font shape `OMS/pplj/m/n' undefined
+(Font)              using `OMS/cmsy/m/n' instead on input line 76.
+
+LaTeX Font Info:    Try loading font information for OT1+pplx on input line 76.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/ot1pplx.fd
+File: ot1pplx.fd 2004/09/06 font definitions for OT1/pplx.
+)
+LaTeX Font Info:    Try loading font information for OML+zplm on input line 76.
+
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/omlzplm.fd
+File: omlzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OML/zplm.
+)
+LaTeX Font Info:    Try loading font information for OMS+zplm on input line 76.
+
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/omszplm.fd
+File: omszplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMS/zplm.
+)
+LaTeX Font Info:    Try loading font information for OMX+zplm on input line 76.
+
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/omxzplm.fd
+File: omxzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMX/zplm.
+)
+LaTeX Font Info:    Try loading font information for OT1+zplm on input line 76.
+
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/psnfss/ot1zplm.fd
+File: ot1zplm.fd 2002/09/08 Fontinst v1.914 font definitions for OT1/zplm.
+)
+
+Package microtype Warning: Loading generic settings for font family `zplm'.
+(microtype)                For optimal results, create font-specific settings.
+(microtype)                See the microtype manual for details.
+
+LaTeX Font Info:    Try loading font information for T1+iwona on input line 76.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/iwona/t1iwona.fd
+File: t1iwona.fd 2008/07/22 v0.995 font definition file for T1/iwona (MW)
+)
+
+Package microtype Warning: Loading generic settings for font family `iwona'.
+(microtype)                For optimal results, create font-specific settings.
+(microtype)                See the microtype manual for details.
+
+[2]
+\tf@toc=\write7
+\openout7 = `tesi.toc'.
+
+ [3
+
+
+
+] [4
+
+]
+\tf@lot=\write8
+\openout8 = `tesi.lot'.
+
+ [5] [6
+
+]
+\tf@lof=\write9
+\openout9 = `tesi.lof'.
+
+ (./MaterialeInizialeFinale/Ringraziamenti.tex [7] [8
+
+])
+
+LaTeX Warning: Empty list of shorthands on input line 89.
+
+(./MaterialeInizialeFinale/Introduzione.tex [9] [10
+
+]) [11] [12
+
+] [13
+
+] [14]
+(./Capitoli/primo.tex
+Capitolo 1.
+LaTeX Font Info:    Try loading font information for LGR+artemisiaeuler on inpu
+t line 38.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/gfsartemisia/lgrartemisiaeuler.fd
+)
+LaTeX Font Info:    Font shape `LGR/artemisiaeuler/m/n' will be
+(Font)              scaled to size 9.79996pt on input line 38.
+LaTeX Font Info:    Try loading font information for T1+artemisiaeuler on input
+ line 48.
+
+(/usr/local/texlive/2012/texmf-dist/tex/latex/gfsartemisia/t1artemisiaeuler.fd)
+LaTeX Font Info:    Font shape `T1/artemisiaeuler/m/n' will be
+(Font)              scaled to size 9.79996pt on input line 48.
+
+Package microtype Warning: Loading generic settings for font family `artemisiae
+uler'.
+(microtype)                For optimal results, create font-specific settings.
+(microtype)                See the microtype manual for details.
+
+[15
+
+]
+
+LaTeX Warning: Citation 'Bringhurst:1996' on page 16 undefined on input line 59
+.
+
+LaTeX Font Info:    Font shape `T1/pplj/bx/n' in size <10> not available
+(Font)              Font shape `T1/pplj/b/n' tried instead on input line 59.
+
+LaTeX Warning: Citation 'Descartes:1897' on page 16 undefined on input line 59.
+
+
+
+LaTeX Warning: Citation 'Facchinetti:2009a' on page 16 undefined on input line 
+59.
+
+
+LaTeX Warning: Citation 'Galilei1' on page 16 undefined on input line 59.
+
+
+LaTeX Warning: Citation 'kant:kpv' on page 16 undefined on input line 59.
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 59--60
+
+ []
+
+
+LaTeX Warning: Reference `fig:knuth-lamport' on page 16 undefined on input line
+ 102.
+
+<Immagini/don.png, id=88, 140.525pt x 192.72pt>
+File: Immagini/don.png Graphic file (type png)
+ <use Immagini/don.png>
+Package pdftex.def Info: Immagini/don.png used on input line 105.
+(pdftex.def)             Requested size: 85.35826pt x 117.06204pt.
+
+<Immagini/lamport.jpg, id=89, 301.125pt x 401.5pt>
+File: Immagini/lamport.jpg Graphic file (type jpg)
+ <use Immagini/lamport.jpg>
+Package pdftex.def Info: Immagini/lamport.jpg used on input line 107.
+(pdftex.def)             Requested size: 85.35826pt x 113.80992pt.
+
+
+LaTeX Warning: `h' float specifier changed to `ht'.
+
+
+LaTeX Warning: Hyper reference `tab:gabbia' on page 16 undefined on input line 
+115.
+
+
+LaTeX Warning: Reference `tab:gabbia' on page 16 undefined on input line 115.
+
+
+LaTeX Warning: `h' float specifier changed to `ht'.
+
+) (./Capitoli/secondo.tex [16] [17 <./Immagini/don.png> <./Immagini/lamport.jpg
+>] [18
+
+]
+Capitolo 2.
+) (./Capitoli/terzo.tex [19] [20
+
+]
+Capitolo 3.
+) [21] [22
+
+] [23
+
+] [24
+
+]
+Appendice A.
+
+Underfull \vbox (badness 1072) has occurred while \output is active []
+
+ [25
+
+]
+[26]
+Appendice B.
+
+Underfull \vbox (badness 1072) has occurred while \output is active []
+
+ [27
+
+]
+[28]
+Appendice C.
+
+Underfull \vbox (badness 1072) has occurred while \output is active []
+
+ [29
+
+]
+[30]
+
+Package biblatex Warning: Keyword 'primaria' not found on input line 119.
+
+
+LaTeX Warning: Empty bibliography on input line 119.
+
+
+Package biblatex Warning: Keyword 'secondaria' not found on input line 124.
+
+
+LaTeX Warning: Empty bibliography on input line 124.
+
+No file tesi.ind.
+[31
+
+
+]
+
+Package frontespizio Warning: Remember to compile tesi-frn with
+(frontespizio)                pdflatex tesi-frn
+(frontespizio)                and then rerun pdflatex.
+
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 133.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 133.
+(./tesi.aux
+
+Package mparhack Warning: Marginpars may have changed.
+(mparhack)                Rerun to get them right.
+
+)
+Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 133.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 133.
+
+
+Package rerunfilecheck Warning: File `tesi.out' has changed.
+(rerunfilecheck)                Rerun to get outlines right
+(rerunfilecheck)                or use package `bookmark'.
+
+Package rerunfilecheck Info: Checksums for `tesi.out':
+(rerunfilecheck)             Before: <no file>
+(rerunfilecheck)             After:  76AF895FA8C0D3DEF96F0486900B732C;1749.
+
+LaTeX Font Warning: Some font shapes were not available, defaults substituted.
+
+
+LaTeX Warning: There were undefined references.
+
+
+LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
+
+
+Package biblatex Warning: Please (re)run Biber on the file:
+(biblatex)                tesi
+(biblatex)                and rerun LaTeX afterwards.
+
+Package logreq Info: Writing requests to 'tesi.run.xml'.
+\openout1 = `tesi.run.xml'.
+
+ ) 
+Here is how much of TeX's memory you used:
+ 17498 strings out of 493488
+ 279700 string characters out of 3141326
+ 811265 words of memory out of 3000000
+ 20150 multiletter control sequences out of 15000+200000
+ 70721 words of font info for 252 fonts, out of 3000000 for 9000
+ 957 hyphenation exceptions out of 8191
+ 43i,11n,48p,805b,1391s stack positions out of 5000i,500n,10000p,200000b,50000s
+{/usr/local/texlive/2012/texmf-dist/fonts/enc/dvips/base/8r.enc}{/usr/local/t
+exlive/2012/texmf-dist/fonts/enc/dvips/gfsartemisia/artemisiael.enc}{/usr/local
+/texlive/2012/texmf-dist/fonts/enc/dvips/iwona/ec-iwona.enc}</usr/local/texlive
+/2012/texmf-dist/fonts/type1/public/gfsartemisia/GFSArtemisia-Regular.pfb></usr
+/local/texlive/2012/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/
+local/texlive/2012/texmf-dist/fonts/type1/public/fpl/fplbj8a.pfb></usr/local/te
+xlive/2012/texmf-dist/fonts/type1/public/fpl/fplrc8a.pfb></usr/local/texlive/20
+12/texmf-dist/fonts/type1/nowacki/iwona/iwonar.pfb></usr/local/texlive/2012/tex
+mf-dist/fonts/type1/public/amsfonts/latxfont/lcircle1.pfb></usr/local/texlive/2
+012/texmf-dist/fonts/type1/urw/palatino/uplb8a.pfb></usr/local/texlive/2012/tex
+mf-dist/fonts/type1/urw/palatino/uplr8a.pfb></usr/local/texlive/2012/texmf-dist
+/fonts/type1/urw/palatino/uplri8a.pfb>
+Output written on tesi.pdf (31 pages, 228531 bytes).
+PDF statistics:
+ 232 PDF objects out of 1000 (max. 8388607)
+ 185 compressed objects within 2 object streams
+ 67 named destinations out of 1000 (max. 500000)
+ 55307 words of extra memory for PDF output out of 61914 (max. 10000000)
+
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.lot b/Master/texmf-dist/doc/latex/suftesi/example/tesi.lot
new file mode 100644
index 00000000000..ace6c45c7e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.lot
@@ -0,0 +1,22 @@
+\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax 
+\defcounter {refsection}{0}\relax 
+\select@language {italian}
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\contentsline {table}{\numberline {1.1}{\ignorespaces Misure degli elementi della pagina}}{17}{table.caption.8}
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\defcounter {refsection}{0}\relax 
+\addvspace {10\p@ }
+\contentsfinish 
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.out b/Master/texmf-dist/doc/latex/suftesi/example/tesi.out
new file mode 100644
index 00000000000..be5d28062e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.out
@@ -0,0 +1,28 @@
+\BOOKMARK [0][-]{chapter*.4}{Ringraziamenti}{}% 1
+\BOOKMARK [0][-]{chapter*.4}{Sigle}{}% 2
+\BOOKMARK [0][-]{chapter*.5}{Introduzione}{}% 3
+\BOOKMARK [-1][-]{part.1}{I uno}{}% 4
+\BOOKMARK [0][-]{chapter.1}{Il primo capitolo della mia tesi}{part.1}% 5
+\BOOKMARK [1][-]{section*.6}{Introduzione}{chapter.1}% 6
+\BOOKMARK [1][-]{section.1.1}{Citazioni fuori testo e note}{chapter.1}% 7
+\BOOKMARK [1][-]{section.1.2}{Documenti multilingua}{chapter.1}% 8
+\BOOKMARK [2][-]{subsection.1.2.1}{Greco antico}{section.1.2}% 9
+\BOOKMARK [2][-]{subsection.1.2.2}{Inglese}{section.1.2}% 10
+\BOOKMARK [1][-]{section.1.3}{Citazioni}{chapter.1}% 11
+\BOOKMARK [1][-]{section.1.4}{Elenchi puntati e numerati e descrizioni}{chapter.1}% 12
+\BOOKMARK [2][-]{subsection.1.4.1}{Elenchi puntati}{section.1.4}% 13
+\BOOKMARK [2][-]{subsection.1.4.2}{Elenchi numerati}{section.1.4}% 14
+\BOOKMARK [2][-]{subsection.1.4.3}{Descrizioni}{section.1.4}% 15
+\BOOKMARK [1][-]{section.1.5}{Figure e tabelle}{chapter.1}% 16
+\BOOKMARK [2][-]{subsection.1.5.1}{Inserimento delle figure}{section.1.5}% 17
+\BOOKMARK [2][-]{subsection.1.5.2}{Inserimento di tabelle}{section.1.5}% 18
+\BOOKMARK [0][-]{chapter.2}{Il secondo capitolo della mia tesi}{part.1}% 19
+\BOOKMARK [0][-]{chapter.3}{Il terzo capitolo della mia tesi}{part.1}% 20
+\BOOKMARK [-1][-]{chapter.3}{Appendici}{}% 21
+\BOOKMARK [0][-]{appendix.A}{Prima}{chapter.3}% 22
+\BOOKMARK [0][-]{appendix.B}{Seconda}{chapter.3}% 23
+\BOOKMARK [0][-]{appendix.C}{Terza}{chapter.3}% 24
+\BOOKMARK [0][-]{section*.9}{Bibliografia}{chapter.3}% 25
+\BOOKMARK [1][-]{section*.11}{Bibliografia primaria}{section*.9}% 26
+\BOOKMARK [1][-]{section*.12}{Bibliografia secondaria}{section*.9}% 27
+\BOOKMARK [0][-]{section*.13}{Indice dei nomi}{chapter.3}% 28
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf b/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
new file mode 100644
index 00000000000..76a16d13dfd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml b/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml
new file mode 100644
index 00000000000..91fea9a4e28
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" standalone="yes"?>
+<!-- logreq request file -->
+<!-- logreq version 1.0 / dtd version 1.0 -->
+<!-- Do not edit this file! -->
+<!DOCTYPE requests [
+  <!ELEMENT requests (internal | external)*>
+  <!ELEMENT internal (generic, (provides | requires)*)>
+  <!ELEMENT external (generic, cmdline?, input?, output?, (provides | requires)*)>
+  <!ELEMENT cmdline (binary, (option | infile | outfile)*)>
+  <!ELEMENT input (file)+>
+  <!ELEMENT output (file)+>
+  <!ELEMENT provides (file)+>
+  <!ELEMENT requires (file)+>
+  <!ELEMENT generic (#PCDATA)>
+  <!ELEMENT binary (#PCDATA)>
+  <!ELEMENT option (#PCDATA)>
+  <!ELEMENT infile (#PCDATA)>
+  <!ELEMENT outfile (#PCDATA)>
+  <!ELEMENT file (#PCDATA)>
+  <!ATTLIST requests
+    version CDATA #REQUIRED
+  >
+  <!ATTLIST internal
+    package CDATA #REQUIRED
+    priority (9) #REQUIRED
+    active (0 | 1) #REQUIRED
+  >
+  <!ATTLIST external
+    package CDATA #REQUIRED
+    priority (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8) #REQUIRED
+    active (0 | 1) #REQUIRED
+  >
+  <!ATTLIST provides
+    type (static | dynamic | editable) #REQUIRED
+  >
+  <!ATTLIST requires
+    type (static | dynamic | editable) #REQUIRED
+  >
+  <!ATTLIST file
+    type CDATA #IMPLIED
+  >
+]>
+<requests version="1.0">
+  <internal package="biblatex" priority="9" active="1">
+    <generic>latex</generic>
+    <provides type="dynamic">
+      <file>tesi.bcf</file>
+    </provides>
+    <requires type="dynamic">
+      <file>tesi.bbl</file>
+    </requires>
+    <requires type="static">
+      <file>blx-dm.def</file>
+      <file>blx-compat.def</file>
+      <file>biblatex.def</file>
+      <file>philosophy-classic.bbx</file>
+      <file>authoryear.bbx</file>
+      <file>standard.bbx</file>
+      <file>philosophy-standard.bbx</file>
+      <file>philosophy-classic.cbx</file>
+      <file>authoryear-comp.cbx</file>
+      <file>biblatex.cfg</file>
+      <file>italian-philosophy.lbx</file>
+      <file>italian.lbx</file>
+    </requires>
+  </internal>
+  <external package="biblatex" priority="5" active="1">
+    <generic>biber</generic>
+    <cmdline>
+      <binary>biber</binary>
+      <infile>tesi</infile>
+    </cmdline>
+    <input>
+      <file>tesi.bcf</file>
+    </input>
+    <output>
+      <file>tesi.bbl</file>
+    </output>
+    <provides type="dynamic">
+      <file>tesi.bbl</file>
+    </provides>
+    <requires type="dynamic">
+      <file>tesi.bcf</file>
+    </requires>
+    <requires type="editable">
+      <file>bibliografia.bib</file>
+    </requires>
+  </external>
+</requests>
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.synctex.gz b/Master/texmf-dist/doc/latex/suftesi/example/tesi.synctex.gz
new file mode 100644
index 00000000000..0daa290b436
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.synctex.gz
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
index 492dc4c4c3d..a36d3f37cb7 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
@@ -1,4 +1,4 @@
-%	copyright (C) Ivan Valbusa 2010
+%	copyright (C) Ivan Valbusa 2010-2012
 %
 %	Questo file è distribuito assieme alla classe suftesi nella cartella suftesi.zip
 %
@@ -7,25 +7,13 @@
 % !TEX root = tesi.tex
 
 \documentclass[
+%rmstyle1,%2,...,6
+%itstyle1,%2,...12
+%scstyle1,%2,...12
 %dottedtoc,
 %raggedtoc,
-%authortitle,
-%article,
-%compact,
-%supercompact,
-%periodical,
-%elements,
-%sufelements,
-%nocrop,
-%nomarginpar,
-%sctitles,
-%centertitle,
-%centerheadings,
-%sufplain,
-%bozza,
-%porson,
-%defaultgreek,
-%defaultfont
+%tocpageleft,
+%<altre opzioni>...
 ]{suftesi}
 
 \usepackage[T1]{fontenc}                
@@ -43,7 +31,6 @@
 % Bibliografia
 \usepackage[italian=guillemets]{csquotes}
 \usepackage[
-	%backend=biber,% Se si usa biber al posto di bibtex
 	style=philosophy-classic,%philosophy-modern, philosophy-verbose
 	]{biblatex}
    \addbibresource{bibliografia.bib}
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc b/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc
new file mode 100644
index 00000000000..cf168767220
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc
@@ -0,0 +1,68 @@
+\boolfalse {citerequest}\boolfalse {citetracker}\boolfalse {pagetracker}\boolfalse {backtracker}\relax 
+\defcounter {refsection}{0}\relax 
+\select@language {italian}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{Ringraziamenti}{9}{chapter*.4}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{Sigle}{9}{chapter*.4}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{Introduzione}{11}{chapter*.5}
+\defcounter {refsection}{0}\relax 
+\contentsline {part}{I\hspace {1em}uno}{13}{part.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {1}Il primo capitolo della mia tesi}{15}{chapter.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{Introduzione}{15}{section*.6}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{\numberline {1.1}Citazioni fuori testo e note}{15}{section.1.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{\numberline {1.2}Documenti multilingua}{15}{section.1.2}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.2.1}Greco antico}{15}{subsection.1.2.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.2.2}Inglese}{15}{subsection.1.2.2}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{\numberline {1.3}Citazioni}{16}{section.1.3}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{\numberline {1.4}Elenchi puntati e numerati e descrizioni}{16}{section.1.4}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.4.1}Elenchi puntati}{16}{subsection.1.4.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.4.2}Elenchi numerati}{16}{subsection.1.4.2}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.4.3}Descrizioni}{16}{subsection.1.4.3}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{\numberline {1.5}Figure e tabelle}{16}{section.1.5}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.5.1}Inserimento delle figure}{16}{subsection.1.5.1}
+\defcounter {refsection}{0}\relax 
+\contentsline {subsection}{\numberline {1.5.2}Inserimento di tabelle}{16}{subsection.1.5.2}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {2}Il secondo capitolo della mia tesi}{19}{chapter.2}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {3}Il terzo capitolo della mia tesi}{21}{chapter.3}
+\defcounter {refsection}{0}\relax 
+\ttl@change@i {\@ne }{part}{0em}{\addvspace {3ex}}{}{}{}\relax 
+\defcounter {refsection}{0}\relax 
+\ttl@change@v {part}{}{}{\addvspace {1ex}}\relax 
+\defcounter {refsection}{0}\relax 
+\contentsline {part}{Appendici}{23}{chapter.3}
+\defcounter {refsection}{0}\relax 
+\ttl@change@i {\@ne }{part}{0em}{\addvspace {3ex}\partname ~}{\makebox [\SUF@label@part ][l]{\thecontentslabel }\hspace *{1em}}{}{}\relax 
+\defcounter {refsection}{0}\relax 
+\ttl@change@v {part}{}{}{\addvspace {1ex}}\relax 
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {A}Prima}{25}{appendix.A}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {B}Seconda}{27}{appendix.B}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{\numberline {C}Terza}{29}{appendix.C}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{Bibliografia}{31}{section*.9}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{Bibliografia primaria}{31}{section*.11}
+\defcounter {refsection}{0}\relax 
+\contentsline {section}{Bibliografia secondaria}{31}{section*.12}
+\defcounter {refsection}{0}\relax 
+\contentsline {chapter}{Indice dei nomi}{31}{section*.13}
+\contentsfinish 
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index f06c75503ec..78a60ce7b98 100644
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.sh b/Master/texmf-dist/doc/latex/suftesi/suftesi.sh
new file mode 100644
index 00000000000..6f29b453855
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.sh
@@ -0,0 +1,33 @@
+latex suftesi.ins
+xelatex rmstyle1.tex
+xelatex rmstyle2.tex
+xelatex rmstyle3.tex
+xelatex rmstyle4.tex
+xelatex rmstyle5.tex
+xelatex rmstyle6.tex
+xelatex itstyle1.tex
+xelatex itstyle2.tex
+xelatex itstyle3.tex
+xelatex itstyle4.tex
+xelatex itstyle5.tex
+xelatex itstyle6.tex
+xelatex itstyle7.tex
+xelatex itstyle8.tex
+xelatex itstyle9.tex
+xelatex itstyle10.tex
+xelatex itstyle11.tex
+xelatex itstyle12.tex
+xelatex scstyle1.tex
+xelatex scstyle2.tex
+xelatex scstyle3.tex
+xelatex scstyle4.tex
+xelatex scstyle5.tex
+xelatex scstyle6.tex
+xelatex scstyle7.tex
+xelatex scstyle8.tex
+xelatex scstyle9.tex
+xelatex scstyle10.tex
+xelatex scstyle11.tex
+xelatex scstyle12.tex
+pdflatex collect-examples.tex
+exit
+\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index c299e599486..c8afabc9651 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,42 +23,36 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2012/04/22 v0.9 A class for typesetting theses, books and articles]
+    [2012/08/31 v0.9a A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\PassOptionsToClass{a4paper}{article} % we need a4paper
+\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}
-\usepackage{fourier}
-\usepackage{xcolor}
-\usepackage{graphicx}
 \usepackage{array,booktabs,multirow}
 \usepackage{microtype}
 \usepackage{siunitx}
+\usepackage{pdfpages}
 \usepackage{metalogo}
-\usepackage[suftesi]{frontespizio}
 \usepackage[style=philosophy-classic]{biblatex}
-\addbibresource{suftesi.bib}
-
+  \addbibresource{suftesi.bib}
+\usepackage[suftesi]{frontespizio}
 \usepackage{hyperref}
 \hypersetup{%
-    pdftitle={User's Guide to \sty{suftesi}},
-    pdfsubject={A document class for typesetting theses, books and articles},
+    pdftitle={User's Guide to \textsf{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}
-  \setlength{\fboxsep}{0pt}\fbox{\includegraphics[scale=.3]{#1}}
-  \end{center}}
-
+\newcommand{\new}{}%
 \DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{#1\char`\}}}
 \DeclareRobustCommand*{\oar}[1]{\texttt{[#1]}}
 \DeclareRobustCommand*{\meta}[1]{%
@@ -84,13 +78,15 @@
 \EnableCrossrefs         
 \CodelineIndex
 \RecordChanges
+
 \begin{document}
   \DocInput{suftesi.dtx}
 \end{document}
+%
 %</driver>
 % \fi
 %
-% \CheckSum{1747}
+% \CheckSum{2826}
 %
 % \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,7 +104,45 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \changes{v0.9a}{2012/05/05}{Changed code for toc, lot and lof elements}
+% \changes{v0.9a}{2012/08/31}{Added \option{inline} option to 
+% \sty{enumitem} package. Deleted \opt{centertitle} to \opt{centerchap}. 
+% New command \cmd{toclabelspace}. Renamed \opt{sctitles} to 
+% \opt{scstyle(1-12)}. Changed code for toc, lot and lof elements. 
+% Added options:
+% \opt{tocpageleft},
+% \opt{defaultparindent}, 
+% \opt{standardfootnote},
+% \opt{dottedfootnote},
+% \opt{alignlist}, 
+% \opt{indentlist}, 
+% \opt{ralignquotation},
+% \opt{smallquotation}, 
+% \opt{romanchap}, 
+% \opt{centerpart}, 
+% \opt{centerchap}, 
+% \opt{centersec}, 
+% \opt{rightpart}, 
+% \opt{rightchap}, 
+% \opt{rightsec}, 
+% \opt{numparpart}, 
+% \opt{numparchap}, 
+% \opt{numparsec}, 
+% \opt{smallcapspart}, 
+% \opt{smallcapschap}, 
+% \opt{smallcapssec}, 
+% \opt{italicpart}, 
+% \opt{italicchap}, 
+% \opt{italicsec}, 
+% \opt{italicsubsec},
+% \opt{romanchap}, 
+% \opt{dottedpart}, 
+% \opt{dottedchap},
+% \opt{italicheader}, 
+% \opt{smallcapsheader}, 
+% \opt{rmstyle(1-6)}, 
+% \opt{itstyle(1-12)}, 
+% \opt{scstyle(1-12)}.
+% }
 % \changes{v0.9}{2012/04/22}{Added \opt{dottedtoc} and \opt{raggedtoc} options. Improved compatibility with \sty{mathspec}}
 % \changes{v0.8}{2012/03/19}{Added macro for using \sty{frontespizio} package with \opt{compact} and \opt{supercompact} options. Added option \opt{periodical}. Renewed \cmd{title} command}
 % \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template}
@@ -121,7 +155,7 @@
 % 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}.}
+% Changed option \opt{Roma}.}
 % \GetFileInfo{suftesi.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ }
@@ -158,13 +192,12 @@
 % \begin{abstract}
 % The \sty{suftesi}
 % class
-% provides a set of page layouts, title styles and heading styles for
-% typesetting theses, books and articles. It is based on the standard
+% 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
 % \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
 % \textcite{Morison:1111}. See the template file \file{tesi.tex} in the \file{example} folder.
 % \end{abstract}
-%
 % \tableofcontents
 %
 % \section*{Note on copyright}
@@ -212,10 +245,10 @@
 %
 % The standard document classes allow you to typeset beautiful
 % documents but their layout is quite far from the stylistic requests
-% of some humanists (especially italian). The styles provided by
-% \sty{suftesi} are very simple and sober, and also have the aim of
-% finding in the formal simplicity an aesthetic harmony. They are
-% largely inspired by some beautiful readings, particularly
+% 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}.
@@ -243,24 +276,25 @@
 % \subsection{Font}
 %
 % The default font for body text is
-% Palatino designed by Hermann Zapf\index{Zapf, Hermann}.\footnote{Using  \XeLaTeX{} 
-% the \LaTeX{} default font is loaded and the font options are turned off.}
+% 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.}. 
-% This choice is inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}.
+% This choice has been 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}, 
+% \sty{lmodern} or \sty{libertine} packages), remember to load the \opt{defaultfont} class option 
 % which turns off the \sty{suftesi}{} font settings. Moreover pay particular attention 
-% in choosing the greek font.
+% in choosing the Greek font.
 %
 % \subsubsection{Greek alphabet}
 %
-% The default font for the greek text is Artemisia by the Greek Font Society, 
-% which is very suitable for Palatino:
+% The default font for the Greek text is Artemisia by the Greek Font Society  
+% which is particularly suitable for Palatino:
 % \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{polutonikogreek}%
 % \fontfamily{artemisia}\selectfont
 % Pr`epei na skeftoume mia
@@ -271,7 +305,7 @@
 % \end{quotation}
 % With the \opt{porson} option you can use the Porson font by the Greek Font Society:
 % \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{greek}%
 % \fontfamily{porson}\selectfont
 % Prepei na skeftoume mia
@@ -284,7 +318,7 @@
 % font:\footnote{This option is also activated by the \opt{defaultfont} option 
 % (see section \ref{sec:options}).}
 % \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots{}
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{greek}%
 % \fontfamily{lmr}\selectfont
 % Prepei na skeftoume mia
@@ -296,75 +330,166 @@
 % 
 % \subsection{Frontispiece} 
 %
-% The class has a original frontispiece now directly available loading the 
+% 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 template file \file{tesi.tex} in the \file{example} folder):
+% with the \opt{suftesi} option (see the \file{tesi.tex} template file in the \file{example} folder):
 % \begin{ttquote}
 % \cmd{usepackage}[suftesi]\ar{frontespizio}
 % \end{ttquote}
 %
-%\section{Options}\label{sec:options}
+% \section{Options}\label{sec:options}
 %
 %In addition to the options defined by the \sty{book} document class, \sty{suftesi} accepts the following new options.
 %
-%\subsection{Page layout}
-%
+% \subsection{Page layouts}
 % \begin{ltxsyntax}
-% \optitem{dottedtoc} Prints a standard table of contents with dotted lines.
-% \optitem{raggedtoc} Aligns the table of contents on the left as \textcite{Bringhurst:1996} suggests.
-% \optitem{compact} 
-% Prints a typeblock  of $16 \si{cm} \times 24 \si{cm}$ on a A4 paper, 
+% \optitem{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). 
-% The \cmd{crop[off]} command turns off the crop marks. 
+% This style is expecially meant for theses.
+% The \opt{nocrop} option disables the crop marks. 
+% \optitem{compact} 
+% The same as \opt{periodical} but with a typeblock  of $16 \si{cm} \times 24 \si{cm}$ (see table \ref{tab:gabbia} for details). 
 % \optitem{supercompact} The same as \opt{compact} but with a  typeblock 
 % 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).
-% \optitem{nocrop} 
-% 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 three ``compact'' layouts.
-% \optitem{11pt} 
-% Sets the font size at  $11\si{pt}$ and resizes the text block dimensions. 
+% \end{ltxsyntax}
+% \subsection{Table of contents}
+% \begin{ltxsyntax}
+% \optitem{dottedtoc} 
+% Prints a table of contents with dotted lines.
+% \optitem{raggedtoc} 
+% Aligns the table of contents on the left as suggested by 
+% \textcite{Bringhurst:1996}.\new{}
+% \optitem{tocpageleft}  Prints the page numbers on the left margin.\new{}
+% \end{ltxsyntax}
+%\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
+% \subsection{Footnotes, lists, quotations}
+% \begin{ltxsyntax}
+% \optitem{standardfootnote} 
+% Prints a standard superscript footnote \new
+% \optitem{dottedfootnote}
+% Prints a footnote number followed by a dot\new
+% \optitem{indentlist} 
+%  Prints standard indented lists\new
+% \optitem{alignlist} 
+%  Aligns the lists to the left margin\new
+% \optitem{ralignquotation}
+% Prints the block quotations indented 
+% only on the left margin\new
+% \optitem{smallquotation}
+% Prints the block quotations 
+% in \cmd{small} size
+% \optitem{defaultparindent}
+% Set |\parinden| to the standard value of 1.5\,em.\new
 % \end{ltxsyntax}
 %
-%\subsection{Titles and headings}
-%
+% 	\subsection{Titles}
+% In the following options \texttt{<level>} stands for \opt{part}, 
+% \opt{chap}, \opt{sec}, \opt{subsec},\opt{subsubsec}
 % \begin{ltxsyntax}
-% \optitem{sctitles} 
-% Prints the headings and the chapter (section) titles in small caps.
-% \optitem{centertitle}
-% Centers the chapter title and number, with the chapter title below the number.
-% \optitem{sufelements} 
-% Loads the  \opt{sctitles} class option and prints the chapter numbers according to 
-% the \opt{elements} option. 
-% \optitem{centerheadings}
-% Prints the page number in the center of the footer, the string ``Chapter $n$'' 
-% in the header of even pages and the chapter title in the header of odd pages.
-% \optitem{sufplain}
-% Prints no headers and puts the page number in the center of the footer.
+% \optitem{centerpart}
+% Centers the title of the part\new{}
+% \optitem{centerchap}
+% Centers the title of the chapter\new{}
+% \optitem{centersec}
+% Centers the title of the section\new{}
+% \optitem{rightpart}
+% Prints the title of the part on the right\new{}
+% \optitem{rightchap}
+% Prints the title of the chapter on the right\new{}
+% \optitem{rightsec}
+% Prints the title of the section on the right\new{}
+% \optitem{numparpart}
+% Prints the part number below the part title\new
+% \optitem{numparchap}
+% Prints the chapter number below the chapter title\new
+% \optitem{numparsec}
+% Prints the section number below the section title\new
+% \optitem{smallcapspart}
+% Prints the part title in small caps \new{}
+% \optitem{smallcapschap}
+% Prints the chapter title in small caps \new{}
+% \optitem{smallcapssec}
+% Prints the section title in small caps \new{}
+% \optitem{italicpart}
+% Prints the part title in italic \new{}
+% \optitem{italicchap}
+% Prints the chapter title in italic \new{}
+% \optitem{italicsec}
+% Prints the section title in italic \new{}
+% \optitem{italicsubsec}
+% Prints the subsection title in italic \new{}
+% \optitem{romanchap}
+% Prints the number of the chapter in roman numbers\new{}
+% \optitem{dottedpart}
+% Prints a dot after the number of the part\new{}
+% \optitem{dottedchap}
+% Prints a dot after the number of the chapter\new{}
+% \end{ltxsyntax}
+% \subsection{Headings}
+% \begin{ltxsyntax}
+% \optitem{italicheader} 
+% Prints the header of both even and odd pages in italic \new
+% \optitem{smallcapsheader}
+% Prints the header of both even and odd pages 
+% in small caps \new
+% \optitem{centerheader}
+% Centers the header and footer
+% \optitem{sufplain / plain}
+% Prints no header and puts the page number in the center of 
+% the footer
 % \optitem{authortitle}
-% Changes the content of the headings. It prints the author's name on the even 
-% numbered pages and the title on the odd ones. This option can be combined 
-% with the other options seen above. In order to use this option the \cmd{title} and 
-% \cmd{author} commands are required. 
+% Changes the content of the headers. It prints the author's name 
+% on the even pages and the title on the odd ones. 
+% This option can be combined with the other options seen above. 
+% In order to use this option the \cmd{title} and 
+% \cmd{author} commands are required
 % \optitem{article} 
-% This option is aimed to typeset articles or short theses (that is to say without chapter divisions) 
-% in a two side document.
+% Similar to defaull page style but with section tile on both 
+% even and odd pages. It is particularly suitable to typeset articles 
+% or short theses (that is  without chapter division) 
+% in a two side documen
 % \optitem{bozza} 
 % Prints the following note in the footer:  
 % \begin{quote} 
 % Version of \meta{date}
 % \end{quote}
-% \optitem{plain}
-% An older name of the \opt{centerheadings} option. Disabled since version 0.6.
-% \optitem{fullplain} An older name of the \opt{sufplain} option. Disabled since version 0.6.
+% \optitem{sufelements} 
+% Loads the  \opt{smallcapsheader}, \opt{smallcapschap}, 
+% \opt{smallcapssec} options and prints the chapter 
+% number in the style of the \opt{elements} option. 
 % \end{ltxsyntax}
-%
 %\subsection{Fonts}
 %
 % \begin{ltxsyntax}
@@ -372,17 +497,48 @@
 % \optitem{porson} Loads the Porson font.
 % \optitem{defaultgreek} Loads the standard CB~Greek font.
 % \optitem{defaultfont} Loads the \LaTeX{} standard font and set the \cmd{baselineskip} to the standard default.
-% \optitem{disablefront} 
-% Disabled since version 0.5. 
 % \end{ltxsyntax}
 %
-% \section{Commands}\label{sec:commands}
+% \paragraph{Other options}
+% \begin{ltxsyntax}
+% \optitem{nocrop} 
+% Prints a \textsc{pdf} with page dimensions according to the 
+% \opt{periodical}, \opt{compact}, \opt{supercompact} and 
+% \opt{elements} options.
+% \optitem{nomarginpar} Disables the \cmd{marginpar} command. 
+% 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. 
+% \optitem{12pt} 
+% Sets the font size at  $12\si{pt}$ and resizes the 
+% text block dimensions. 
+% \end{ltxsyntax}
+%
+% \subsection{Pre-defined styles}
+% \begin{ltxsyntax}
+% \optitem{rmstyle(1-6)} 
+% The titles of chapters and headers are printed in roman. 
+% The number of the chapter is on the same line in styles 1-3 and above
+% the title in styles 4-6.
+% The title can be printed on the left (styles 1 and 4), in the center (styles 2 and 5) or on the right (styles 3 and 6) (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% \optitem{itstyle(1-12)}
+% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  in styles 1-6 and in \textsc{small caps}  in styles 7-12.
+% There are three position for the title and two positions for the number as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% \optitem{scstyle(1-12)}
+% The titles of chapters and headers are in \textsc{small caps}. The  title of the section is in \emph{italic}  in styles 1-6 and in \textsc{small caps}  in styles 7-12.
+% 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).
+% \end{ltxsyntax}
+% You can get up to 120 variants combining these styles
+% with \opt{dottedchap} and \opt{romanchap} options.
+%
+% \section{New commands}\label{sec:commands}
 %
 % The class defines the following new commands.
 %
 % \begin{ltxsyntax}
 %
-% \cmditem{title}[short title for headings]{complete title for titlepage}
+% \cmditem{title}[short title for headers]{complete title for titlepage}
 % 
 % This command is for use with option \opt{authortitle} if the title is too long
 % or has some breaks. 
@@ -390,11 +546,11 @@
 % 
 % \cmditem{colophon}[OS]{name and surname}{additional info}
 % 
-% This command is provided only for italian documents. It prints a page with 
+% 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 
+% 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}}
@@ -404,7 +560,8 @@
 % (see below) 
 % or  the \cmd{thanks} command:
 % \begin{ttquote}
-% \cmd{author}\{\meta{Name Surname}\cmd{thanks}\{This work has been typeset with \LaTeX{},\\
+% \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}
 %
@@ -424,7 +581,7 @@
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
 %
-% This command has only one argument. It simply prints its content at the 
+% This command only has one argument. It simply prints its content at the 
 % bottom of the page. Here is an example:
 %
 % \begin{verbatim}
@@ -443,12 +600,12 @@
 % \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} 
+% top of the page. It is aimed at typesetting a classical \emph{colophon} 
 % at the end of the work.
 %
 % \cmditem{chapterintro}
 %
-% Prints an unnumbered introduction at the beginning of the chapters, 
+% Prints an unnumbered introduction at the beginning of the chapter, 
 % with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
 %
 % \cmditem{chapterintroname}{name}\hfill(default=\texttt{Introduzione})
@@ -461,40 +618,51 @@
 %
 % \cmditem{headbreak}
 %
-% A manual break which is active for the table of contents but not in the text or in the headings
+% A manual break which is active for the table of contents but not in the text or in the headers.
 %
 % \cmditem{xheadbreak}
 %
-% A manual break which is active in the text and in the headings but not in the table of contents.
+% A manual break which is active in the text and in the headers but not in the table of contents.
 %
 % \cmditem{chapnumfont}{name}
 %
-% Sets the font for the chapter number with the \opt{sufelements} option. 
+% Sets the font for the number of the chapter (only with the \opt{sufelements} option). 
 % The default is ``\texttt{pplj}'' (\LaTeX) or ``Palatino''  (\XeLaTeX). 
-% \end{ltxsyntax}
+% 
+% \cmditem{toclabelspace}{level}{label-width}\new
 %
+% Sets the width of \cmd{thecontentslabel}. The default values are:
+% \begin{verbatim}
+% \toclabelwidth{part}{1em}
+% \toclabelwidth{chapter}{1em}
+% \toclabelwidth{section}{1.5em}
+% \toclabelwidth{subsection}{2em}
+% \toclabelwidth{subsubsection}{2.5em}
+% \toclabelwidth{paragraph}{3em}
+% \toclabelwidth{subparagraph}{3.5em}
+% \end{verbatim}
+% \end{ltxsyntax}
+% \appendix
+% \label{predefined-styles}
+% \includepdf[pages=1-]{collect-examples}
 % \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}
 %<*class>
 %    \begin{macrocode}		
-\newif\ifsuftesi@centertitle
-\newif\ifsuftesi@sctitles
 \newif\ifsuftesi@artemisia 
 \newif\ifsuftesi@porson 
-\newif\ifsuftesi@defaultfont 
 \newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@centerheadings
+\newif\ifsuftesi@defaultfont 
+\newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@bozza
 \newif\ifsuftesi@article
 \newif\ifsuftesi@authortitle
-\newif\ifsuftesi@nofront
 \newif\ifsuftesi@periodical
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
@@ -504,53 +672,370 @@
 \newif\ifsuftesi@nomarginpar
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\DeclareOption{centertitle}{\suftesi@centertitletrue}
-\DeclareOption{sctitles}{\suftesi@sctitlestrue}
-\DeclareOption{disablefront}{\suftesi@nofronttrue}
-\DeclareOption{defaultfont}{\suftesi@defaultfonttrue\suftesi@defaultgreektrue}
-\DeclareOption{artemisia}{\suftesi@artemisiatrue\suftesi@porsonfalse
-	\suftesi@defaultgreekfalse} 
-\DeclareOption{porson}{\suftesi@porsontrue\suftesi@artemisiafalse
-	\suftesi@defaultgreekfalse} 
-\DeclareOption{defaultgreek}{\suftesi@defaultgreektrue
-	\suftesi@artemisiafalse\suftesi@porsonfalse} 
-\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
-\suftesi@supercompactfalse\suftesi@compactfalse}
-\DeclareOption{sufelements}{\suftesi@sufelementstrue\suftesi@sctitlestrue} 
-\DeclareOption{nocrop}{\suftesi@nocroptrue} 
-\DeclareOption{nomarginpar}{\suftesi@nomarginpartrue} 
-\DeclareOption{article}{\suftesi@articletrue}
-\DeclareOption{authortitle}{\suftesi@authortitletrue}
-\DeclareOption{dottedtoc}{\suftesi@dottedtoctrue}
-\DeclareOption{raggedtoc}{\suftesi@raggedtoctrue}
+\newif\ifsuftesi@tocpageleft
+\newif\ifsuftesi@defaultparindent
+\newif\ifsuftesi@standardfootnote
+\newif\ifsuftesi@dottedfootnote
+\newif\ifsuftesi@alignlist
+\newif\ifsuftesi@indentlist
+\newif\ifsuftesi@ralignquotation
+\newif\ifsuftesi@smallquotation
+\newif\ifsuftesi@romanchap
+\newif\ifsuftesi@centerpart
+\newif\ifsuftesi@centerchap
+\newif\ifsuftesi@centersec
+\newif\ifsuftesi@centersubsec
+\newif\ifsuftesi@rightpart
+\newif\ifsuftesi@rightchap
+\newif\ifsuftesi@rightsec
+\newif\ifsuftesi@rightsubsec
+\newif\ifsuftesi@centersubsubsec
+\newif\ifsuftesi@rightsubsubsec
+\newif\ifsuftesi@numparpart
+\newif\ifsuftesi@numparchap
+\newif\ifsuftesi@numparsec
+\newif\ifsuftesi@numparsubsec
+\newif\ifsuftesi@numparsubsubsec
+\newif\ifsuftesi@dottedpart
+\newif\ifsuftesi@dottedchap
+\newif\ifsuftesi@italicpart
+\newif\ifsuftesi@italicchap
+\newif\ifsuftesi@italicsec
+\newif\ifsuftesi@italicsubsec
+\newif\ifsuftesi@italicsubsubsec
+\newif\ifsuftesi@smallcapspart
+\newif\ifsuftesi@smallcapschap
+\newif\ifsuftesi@smallcapssec
+\newif\ifsuftesi@smallcapssubsec
+\newif\ifsuftesi@smallcapssubsubsec
+\newif\ifsuftesi@italicLhead
+\newif\ifsuftesi@italicRhead
+\newif\ifsuftesi@italicheader
+\newif\ifsuftesi@smallcapsRhead
+\newif\ifsuftesi@smallcapsLhead
+\newif\ifsuftesi@smallcapsheader
+\DeclareOption{defaultfont}{
+    \suftesi@defaultfonttrue
+    \suftesi@defaultgreektrue}
+\DeclareOption{artemisia}{
+    \suftesi@artemisiatrue
+    \suftesi@porsonfalse
+	  \suftesi@defaultgreekfalse} 
+\DeclareOption{porson}{
+    \suftesi@porsontrue
+    \suftesi@artemisiafalse
+	  \suftesi@defaultgreekfalse} 
+\DeclareOption{defaultgreek}{
+    \suftesi@defaultgreektrue
+    \suftesi@artemisiafalse
+    \suftesi@porsonfalse} 
+\DeclareOption{centerheader}{
+    \suftesi@centerheadertrue} 
+\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
+    \suftesi@articlefalse
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@raggedtoctrue
+    }
+\DeclareOption{sufelements}{
+    \suftesi@sufelementstrue
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@compactfalse
+    \suftesi@supercompactfalse} 
+\DeclareOption{nocrop}{
+    \suftesi@nocroptrue} 
+\DeclareOption{nomarginpar}{
+    \suftesi@nomarginpartrue} 
+\DeclareOption{article}{
+    \suftesi@articletrue}
+\DeclareOption{authortitle}{
+    \suftesi@authortitletrue}
+\DeclareOption{dottedtoc}{
+    \suftesi@dottedtoctrue}
+\DeclareOption{raggedtoc}{
+    \suftesi@raggedtoctrue}
+\DeclareOption{tocpageleft}{
+    \suftesi@tocpagelefttrue}
+\DeclareOption{defaultparindent}{
+    \suftesi@defaultparindenttrue}
+\DeclareOption{standardfootnote}{
+    \suftesi@standardfootnotetrue}
+\DeclareOption{dottedfootnote}{
+    \suftesi@dottedfootnotetrue}
+\DeclareOption{alignlist}{
+    \suftesi@alignlisttrue}
+\DeclareOption{indentlist}{
+    \suftesi@indentlisttrue}
+\DeclareOption{ralignquotation}{
+    \suftesi@ralignquotationtrue}
+\DeclareOption{smallquotation}{
+    \suftesi@smallquotationtrue}
+\DeclareOption{centerpart}{
+    \suftesi@centerparttrue}
+\DeclareOption{centerchap}{
+    \suftesi@centerchaptrue}
+\DeclareOption{centersec}{
+    \suftesi@centersectrue}
+\DeclareOption{rightpart}{
+    \suftesi@rightparttrue}
+\DeclareOption{rightchap}{
+    \suftesi@rightchaptrue}
+\DeclareOption{rightsec}{
+    \suftesi@rightsectrue}
+\DeclareOption{numparpart}{
+    \suftesi@numparparttrue}
+\DeclareOption{numparchap}{
+    \suftesi@numparchaptrue}
+\DeclareOption{numparsec}{
+    \suftesi@numparsectrue}
+\DeclareOption{smallcapspart}{
+    \suftesi@smallcapsparttrue}
+\DeclareOption{smallcapschap}{
+    \suftesi@smallcapschaptrue}
+\DeclareOption{smallcapssec}{
+    \suftesi@smallcapssectrue}
+\DeclareOption{italicpart}{
+    \suftesi@italicparttrue}
+\DeclareOption{italicchap}{
+    \suftesi@italicchaptrue}
+\DeclareOption{italicsec}{
+    \suftesi@italicsectrue}
+\DeclareOption{italicsubsec}{
+    \suftesi@italicsubsectrue}
+\DeclareOption{romanchap}{
+    \suftesi@romanchaptrue}
+\DeclareOption{dottedpart}{
+    \suftesi@dottedparttrue}
+\DeclareOption{dottedchap}{
+    \suftesi@dottedchaptrue}
+\DeclareOption{italicheader}{
+  \suftesi@italicLheadtrue
+  \suftesi@italicRheadtrue}
+\DeclareOption{smallcapsheader}{
+  \suftesi@smallcapsLheadtrue
+  \suftesi@smallcapsRheadtrue}
+\DeclareOption{rmstyle1}{
+        \suftesi@italicsectrue}
+\DeclareOption{rmstyle2}{
+        \suftesi@italicsectrue
+        \suftesi@centerchaptrue}
+\DeclareOption{rmstyle3}{
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue}
+\DeclareOption{rmstyle4}{
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue}
+\DeclareOption{rmstyle5}{
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue}
+\DeclareOption{rmstyle6}{
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue}
+\DeclareOption{itstyle1}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle2}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle3}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle4}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle5}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle6}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle7}{
+    \suftesi@italicchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicsubsectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle8}{
+    \suftesi@italicchaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle9}{
+    \suftesi@italicchaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle10}{
+    \suftesi@italicchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle11}{
+    \suftesi@italicchaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle12}{
+    \suftesi@italicchaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{scstyle1}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle2}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle3}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle4}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle5}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle6}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle7}{
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle8}{
+    \suftesi@smallcapschaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle9}{
+    \suftesi@smallcapschaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle10}{
+    \suftesi@smallcapschaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle11}{
+    \suftesi@smallcapschaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle12}{
+    \suftesi@smallcapschaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+%    \end{macrocode}
+% Execute options:
+%    \begin{macrocode}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ExecuteOptions{artemisia} 
+\ExecuteOptions{artemisia,rmstyle1} 
 \ProcessOptions
 \relax
-\LoadClass[a4paper]{book}
 %    \end{macrocode}
-% \subsubsection{Basic packages}
+% \sty{suftesi} is based on the standard \sty{book} class!
+%    \begin{macrocode}
+\LoadClass{book}
+%    \end{macrocode}
+% \subsection{Basic packages}
 %    \begin{macrocode}
 \RequirePackage{color}
     \definecolor{sufred}{rgb}{0.5,0,0}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{ifxetex,ifluatex}
-\ifxetex\relax
-  \else
-    \RequirePackage{microtype}
-    \fi
+\ifxetex
+  \relax
+    \else
+  \RequirePackage{microtype}
+\fi
 \RequirePackage{textcase}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
 \RequirePackage{mparhack}
 %    \end{macrocode}
-% \subsection{The greek font}
+% \subsection{Greek fonts}
 % Thanks to Enrico Gregorio for these macros:
 %    \begin{macrocode}
 \ifxetex
@@ -567,10 +1052,10 @@
     \renewcommand{\sfdefault}{iwona}
   \fi
 \ifsuftesi@artemisia
-	\def\suftesi@greekfamily{artemisiaeuler}
+	\def\SUF@greekfamily{artemisiaeuler}
     \fi
 \ifsuftesi@defaultgreek
-	\def\suftesi@greekfamily{cmr}
+	\def\SUF@greekfamily{cmr}
     \fi
 \ifsuftesi@porson
 	\sbox\z@{\fontsize{10}{10}\normalfont A} 
@@ -579,123 +1064,104 @@
 	\dimexpr(0.001\dimexpr\numexpr(\dimexpr(1000\ht\z@)/\ht\tw@)\p@) 
 	\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}{} 
-	\DeclareFontShape{LGR}{porson}{b}{n}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{b}{it}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{m}{sl}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{b}{sl}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{m}{sc}{<-> ssub * porson/m/n}{} 
-	\DeclareFontShape{LGR}{porson}{bx}{n}{<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{} 
+	\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{b}{n}  {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{} 
+	\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{} 
 	\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{} 
 	\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{} 
-      \def\suftesi@greekfamily{porson}
+      \def\SUF@greekfamily{porson}
    \fi
 \AtBeginDocument{
   \DeclareRobustCommand{\greektext}{%
-    \fontencoding{LGR}\fontfamily{\suftesi@greekfamily}\selectfont
+    \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont
     \def\encodingdefault{LGR}}}
 \fi
 %    \end{macrocode}
 % \subsection{Page layout}
 %    \begin{macrocode}
 \RequirePackage{geometry}
+\ifsuftesi@defaultparindent
+  \relax
+    \else
   \parindent1em
-\ifcase\@ptsize\relax
-	\geometry{%
-	  textwidth=312pt,
-	  textheight=624pt}\or
-	\geometry{%
-	  textwidth=324pt,
-	  textheight=648pt}\or
-	\geometry{%
-	  textwidth=324pt,
-	  textheight=648pt}
-	  \fi
-	\geometry{%
-	  marginparsep=12pt,
-	  includehead,
-	  hmarginratio=1:2,
-	  vmarginratio=1:2,
-	  heightrounded,
-	  marginparwidth=82pt}	  
+\fi
+  \geometry{heightrounded}
 \ifsuftesi@nocrop
-     \relax
-       \else
-          \RequirePackage[a4,cam,center]{crop}
+  \relax
+    \else
+  \RequirePackage[a4,cam,center]{crop}
 \fi
-%    \end{macrocode}
-%\subsubsection{\opt{periodical}}
-%    \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}
+  \geometry{
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     170mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 75pt,
+    marginparsep=   10pt}
 \else
-%    \end{macrocode}
-%\subsubsection{\opt{compact}}
-%    \begin{macrocode}
 \ifsuftesi@compact
-    \geometry{
-    textheight=16.5cm,
-    textwidth=11cm,
-    paperwidth=16cm,
-    paperheight=24cm,
-    hmarginratio=2:3,
-    vmarginratio=2:3,
-    includefoot,
-    includehead,
-    heightrounded,
-    marginparwidth=65pt,
-    marginparsep=10pt}
+  \geometry{
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     160mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 65pt,
+    marginparsep=   10pt}
 \else
-%    \end{macrocode}
-%\subsubsection{\opt{supercompact}}
-%    \begin{macrocode}
 \ifsuftesi@supercompact
-    \geometry{
-    textheight=15cm,
-    textwidth=10cm,
-    paperwidth=14cm,
-    paperheight=21cm,
-    hmarginratio=2:3,
-    vmarginratio=2:3,
-    includefoot,
-    includehead,
-    heightrounded,
-    marginparwidth=50pt,
-    marginparsep=9pt}
+  \geometry{
+    textheight=     150mm,
+    textwidth=      100mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    2:3,
+    marginparwidth= 50pt,
+    marginparsep=   9pt}
 \else
-%    \end{macrocode}
-%\subsubsection{\opt{elements}}
-%    \begin{macrocode}
 \ifsuftesi@elements
-    \geometry{%
-    textwidth=251pt,
-    textheight=502pt,
-    marginparwidth=60pt,
-    marginparsep=18pt,
-    paperwidth=378pt,
-    paperheight=654pt,
-    heightrounded,
-    outer=91.2pt,
-    top=64pt}
+  \geometry{%
+    textwidth=      251pt,
+    textheight=     502pt,
+    paperwidth=     374pt,
+    paperheight=    648pt,
+    marginparwidth= 60pt,
+    marginparsep=   18pt,
+    outer=          90pt,
+    top=            64pt}
    \else
+\ifcase\@ptsize\relax
+	\geometry{%
+	  textwidth=      312pt,
+	  textheight=     624pt}\or
+	\geometry{%
+	  textwidth=      324pt,
+	  textheight=     648pt}\or
+	\geometry{%
+	  textwidth=      324pt,
+	  textheight=     648pt}
+	  \fi
+	\geometry{%
+	  a4paper,
+	  includehead,
+	  heightrounded,
+	  marginparwidth=  82pt,
+	  marginparsep=    12pt,
+	  hmarginratio=    1:2,
+	  vmarginratio=    1:2}	  
+      \fi
+    \fi 
   \fi
- \fi 
-\fi
 \fi
 %    \end{macrocode}
-% And now a macro to produce oneside documents:
+% A trick to produce one-side documents:
 %    \begin{macrocode}
  \if@twoside
    \relax
@@ -708,162 +1174,367 @@
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifsuftesi@supercompact
-  \DeclareRobustCommand{\sufchaptersize}{\large}
+\ifsuftesi@periodical
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
     \else
       \ifsuftesi@compact
-       \DeclareRobustCommand{\sufchaptersize}{\Large}
+       \DeclareRobustCommand{\SUF@chaptersize}{\large}
          \else
-           \DeclareRobustCommand{\sufchaptersize}{\Large}
-     \fi
+           \ifsuftesi@supercompact
+          \DeclareRobustCommand{\SUF@chaptersize}{\large}
+        \else
+      \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+    \fi
+  \fi
 \fi
+%    \end{macrocode}
+% \DescribeMacro{\SUF@titlesmallcaps} 
+%    \begin{macrocode}
 \ifxetex
-  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
-  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
-      \def\@chapnumfont{\fontspec{#1}}}
+      \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}}
       \chapnumfont{Palatino}
 \else
-  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
-  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
   \newcommand{\chapnumfont}[1]{%
-    \def\@chapnumfont{\fontfamily{#1}}}
+    \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
 \fi
 %    \end{macrocode}
-% \subsubsection{Part}
+% \DescribeMacro{\SUF@thechapter} 
 %    \begin{macrocode}
-\ifsuftesi@article
-\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
-\titleformat{\part}[display]
-  {\LARGE\filcenter}
-  {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
-  {3ex}
-  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+\ifsuftesi@romanchap
+  \def\SUF@thechapter{\Roman{chapter}}
+    \else
+  \def\SUF@thechapter{\arabic{chapter}}
 \fi
 %    \end{macrocode}
-% \subsubsection{Chapter}
-% \paragraph{The \opt{elements} styles}
+% \DescribeMacro{\SUF@lr@PARTSwitch} 
+% \DescribeMacro{\SUF@lr@CHAPSwitch} 
+% \DescribeMacro{\SUF@lr@SECswitch} 
+% \DescribeMacro{\SUF@lr@SUBSECswitch} 
+% \DescribeMacro{\SUF@lr@SUBSUBSECswitch} 
+% These macros control the position of the titles and numbers of parts, chapters,
+% sections, subsections and subsubsection. There are three positions:
+% left, center and right. 
 %    \begin{macrocode}
+\ifsuftesi@centerpart
+  \def\SUF@lr@PARTSwitch{\filcenter}
+    \else
+      \ifsuftesi@rightpart
+        \def\SUF@lr@PARTSwitch{\filleft}        
+      \else
+    \def\SUF@lr@PARTSwitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centerchap
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+    \else
+      \ifsuftesi@rightchap
+        \def\SUF@lr@CHAPSwitch{\filleft}        
+      \else
+    \def\SUF@lr@CHAPSwitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersec
+  \def\SUF@lr@SECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsec
+        \def\SUF@lr@SECswitch{\filleft}        
+      \else
+    \def\SUF@lr@SECswitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersubsec
+  \def\SUF@lr@SUBSECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsubsec
+        \def\SUF@lr@SUBSECswitch{\filleft}        
+      \else
+    \def\SUF@lr@SUBSECswitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersubsubsec
+  \def\SUF@lr@SUBSUBSECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsubsubsec
+        \def\SUF@lr@SUBSUBSECswitch{\filleft}        
+      \else
+    \def\SUF@lr@SUBSUBSECswitch{\filright}
+  \fi
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\SUF@dotchap} 
+%    \begin{macrocode}
+\ifsuftesi@dottedchap
+  \def\SUF@dotchap{.}
+   \else
+  \def\SUF@dotchap{}
+\fi
+\ifsuftesi@dottedpart
+  \def\SUF@dotpart{.}
+   \else
+  \def\SUF@dotpart{}
+\fi
+%    \end{macrocode}
+% \paragraph{The \opt{elements} style} 
+%    \begin{macrocode}
+\def\SUF@chapnumpos{-73}
 \ifsuftesi@sufelements
    \titleformat{\chapter}[block]
      {}%
      {\begin{picture}(0,0)
      \setlength{\unitlength}{1pt}
-     \@chapnumfont%
+     \SUF@chapnumfont%
      \ifsuftesi@elements
-       \fontsize{64}{64}\selectfont%
-       \put(0,-73){%
-       \hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}%
+       \ifsuftesi@periodical
+         \fontsize{80}{80}\selectfont%
+           \def\SUF@chapnumpos{-83}
+         \else
+       \ifsuftesi@compact
+         \fontsize{80}{80}\selectfont%
+           \def\SUF@chapnumpos{-83}
+         \else
+       \ifsuftesi@supercompact
+         \fontsize{64}{64}\selectfont%
+           \def\SUF@chapnumpos{-73}
+         \else
+         \fontsize{64}{64}\selectfont%
+           \def\SUF@chapnumpos{-73}
+       \fi\fi\fi
      \else
        \fontsize{95}{95}\selectfont%
-       \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)%
-       \textcolor{sufgray}{\thechapter}}%
+       \def\SUF@chapnumpos{-83}
      \fi
+     \put(0,\SUF@chapnumpos){%
+       \hskip\dimexpr(\textwidth+\marginparsep)%
+       \textcolor{sufgray}{\SUF@thechapter}}%
    \end{picture}}%
   {0pt}
-  {\suftesi@titlesmallcaps}
+  {\Large\SUF@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@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}
-    \else
-      \ifsuftesi@supercompact
-        \titlespacing*{\chapter}{0em}{0ex}{18ex}
-         \else
-           \ifsuftesi@elements
-             \titlespacing*{\chapter}{0em}{-45pt}{10pt}[0em]
-               \else
-                 \ifsuftesi@sufelements
-                \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em]
-              \else
-            \titlespacing*{\chapter}{0em}{6ex}{18ex}
-         \fi
-      \fi
-   \fi
-\fi
-%    \end{macrocode}
-% \subsubsection{Section, subsection, subsubsection, \dots}
-% \paragraph{\opt{elements}}
-%    \begin{macrocode}
-\ifsuftesi@elements
-\titleformat{\section}[hang]
-	  {\raggedright}
+  \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]
+\titleformat{\section}[block]
+	  {\filright}
 	  {\textnormal\thesection}
 	  {1em}
-	  {\small\suftesi@titlesmallcaps}
-	\titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em] 
+	  {\SUF@titlesmallcaps}
+	\titlespacing*{\section}{0em}{1em}{1em}[0em] 
 \titleformat{\subsection}[block]
 	  {\filright\normalsize\itshape}
 	  {\textnormal\thesubsection}
 	  {1em}
 	  {}
-	\titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] 
+  \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] 
 \titleformat{\subsubsection}[block]
-	  {\filright\normalsize\itshape}
+	  {\filright\normalsize}
 	  {\textnormal\thesubsubsection}
 	  {1em}
 	  {}
-	\titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] 
-\else
+  \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] 
+   \else
+%    \end{macrocode}
+% \paragraph{The default styles}
+% \DescribeMacro{\SUF@PART@StyleSwitch}
+% \DescribeMacro{\SUF@CHAP@StyleSwitch}
+% \DescribeMacro{\SUF@SEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSUBSEC@StyleSwitch}
+%    \begin{macrocode}
+\def\SUF@PART@StyleSwitch{%
+  \ifsuftesi@smallcapspart
+    \expandafter\SUF@titlesmallcaps
+      \else
+        \ifsuftesi@italicpart
+      \itshape
+    \else
+  \fi
+\fi}
+\def\SUF@CHAP@StyleSwitch{%
+  \ifsuftesi@smallcapschap
+    \expandafter\SUF@titlesmallcaps
+      \else
+        \ifsuftesi@italicchap
+      \itshape
+    \else
+  \fi
+\fi}
+\def\SUF@SEC@StyleSwitch{%
+        \ifsuftesi@smallcapssec
+          \expandafter\SUF@titlesmallcaps
+         \else
+        \ifsuftesi@italicsec
+      \itshape        
+    \else
+  \fi
+\fi}
+\def\SUF@SUBSEC@StyleSwitch{%
+  \ifsuftesi@smallcapssubsec
+    \expandafter
+      \SUF@titlesmallcaps
+        \else
+         \ifsuftesi@italicsubsec
+      \itshape
+    \else
+  \fi
+\fi
+}
+\def\SUF@SUBSUBSEC@StyleSwitch{%
+  \ifsuftesi@smallcapssubsubsec
+    \expandafter
+      \SUF@titlesmallcaps
+        \else
+         \ifsuftesi@italicsubsubsec
+      \itshape
+    \else
+  \fi
+\fi}
 %    \end{macrocode}
-% \paragraph{\opt{default}}
+% \subparagraph{Redefinitions 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}
+\def\chapter#1{\ClassError{suftesi}
+  {\noexpand\chapter level is not defined using 'article' option}
+  {\noexpand\chapter level is not defined using 'article' option}}
+  \setcounter{tocdepth}{3}
+    \setcounter{secnumdepth}{3}
+ 		  \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}
+\titleclass{\part}{straight}
+\titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
 \else
 \fi
+%    \end{macrocode}
+% \subparagraph{The default \opt{`book'} mode}
+%    \begin{macrocode}
+%    \end{macrocode}
+% \DescribeMacro{\part}
+%    \begin{macrocode}
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+  {3em}
+  {\SUF@PART@StyleSwitch}
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\chapter}
+%    \begin{macrocode}
+\ifsuftesi@numparchap
+  \titleformat{\chapter}[display]
+    {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+    {\SUF@thechapter\SUF@dotchap}
+    {2ex}
+    {\SUF@CHAP@StyleSwitch}
+  \else
+  \titleformat{\chapter}[hang]
+    {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+    {\SUF@thechapter\SUF@dotchap}
+    {3em}
+    {\SUF@CHAP@StyleSwitch}
+  \fi
+\ifsuftesi@numparchap
+  \def\SUF@ADJnumparchap{-2.5\baselineskip}
+    \else
+  \def\SUF@ADJnumparchap{0pt}
+\fi
+\ifsuftesi@periodical
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+    \else
+      \ifsuftesi@compact
+        \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+        \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+         \else
+           \ifsuftesi@supercompact
+            \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+            \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+           \else
+        \titlespacing*{\chapter}{0em}{%
+     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}	
+        \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
+    \fi
+  \fi
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\section}
+%    \begin{macrocode}
+\ifsuftesi@numparsec
+\titleformat{\section}[display]
+	  {\SUF@lr@SECswitch}
+	  {\thesection}
+	  {0ex}
+	  {\SUF@SEC@StyleSwitch}
+	\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]	 
+\else
 \titleformat{\section}[hang]
-	  {\filright}
+	  {\SUF@lr@SECswitch}
 	  {\thesection}
-	  {.5em}
-	  {\unskip\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\itshape\fi}
+	  {1em}
+	  {\SUF@SEC@StyleSwitch}
 	\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]	  
+\fi	 
+%    \end{macrocode}
+% \DescribeMacro{\subsection}
+%    \begin{macrocode}
+\ifsuftesi@numparsubsec
+\titleformat{\subsection}[display]
+	  {\SUF@lr@SUBSECswitch}
+	  {\textnormal\thesubsection}
+	  {0ex}
+	  {\SUF@SUBSEC@StyleSwitch}
+	\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
 \titleformat{\subsection}[hang]
-	  {}
+	  {\SUF@lr@SUBSECswitch}
 	  {\textnormal\thesubsection}
-	  {.5em}
-	  {\itshape}
+	  {1em}
+	  {\SUF@SUBSEC@StyleSwitch}
 	\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\subsubsection}
+%    \begin{macrocode}
+\ifsuftesi@numparsubsubsec
+\titleformat{\subsubsection}[display]
+	  {\SUF@lr@SUBSUBSECswitch}
+	  {\textnormal\thesubsubsection}
+	  {0ex}
+	  {\SUF@SUBSUBSEC@StyleSwitch}
+	\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
+\else
 \titleformat{\subsubsection}[hang]
-	  {}
+	  {\SUF@lr@SUBSUBSECswitch}
 	  {\textnormal\thesubsubsection}
-	  {.5em}
-	  {\itshape}
-	\titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex]  
+	  {1em}
+	  {\SUF@SUBSUBSEC@StyleSwitch}
+	\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
+  \fi
 \fi
+%    \end{macrocode}
+% \DescribeMacro{\paragraph}
+%    \begin{macrocode}
 \titleformat{\paragraph}[runin]
   {}
   {\theparagraph}
@@ -871,6 +1542,9 @@
   {\itshape}
   [{.}\hspace*{1em}]
 \titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
+%    \end{macrocode}
+% \DescribeMacro{\subparagraph}
+%    \begin{macrocode}
 \titleformat{\subparagraph}[runin]
   {}
   {\thesubparagraph}
@@ -879,9 +1553,13 @@
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 %    \end{macrocode}
-% \paragraph{\sty{biblatex} settings}
+% \subsubsection{\sty{biblatex} settings}
+% The \sty{biblatex} package uses the \sty{book} class
+% definitions of bibliography and list of shorthands,
+% so we must redefine them according to the styles of \sty{suftesi},
+% which does not use uppercase letters in the headings.
 %    \begin{macrocode}
-\ifsuftesi@article				%ARTICLE
+\ifsuftesi@article			
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
@@ -913,7 +1591,7 @@
     \subsection{#1}}}%
     {\relax}%
 }%
-\else								%BOOK
+\else							
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
@@ -949,134 +1627,12 @@
 }%
 \fi
 %    \end{macrocode}
-% \subsubsection{TOC, LOF, LOT}
-%    \begin{macrocode}
-\RequirePackage{titletoc}
-%    \end{macrocode}
-% Settings for \opt{dottedtoc} and \opt{raggedtoc} options:
-%    \begin{macrocode}
-\ifsuftesi@dottedtoc
-   \newcommand{\suftesi@titlerule}{\titlerule*{\footnotesize .\ }}
-    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
-      \else
-\ifsuftesi@raggedtoc
-    \newcommand{\suftesi@titlerule}{\hspace{1.5em}}
-    \newcommand{\suftesi@chaptitlerule}{\hspace{1.5em}}
-    \else
-    \newcommand{\suftesi@titlerule}{\titlerule*{}}
-    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
-    \fi
-\fi
-%    \end{macrocode}
-% \opt{article} mode:
-%    \begin{macrocode}
-\ifsuftesi@article 
-\renewcommand\tableofcontents{%
-	\thispagestyle{empty}
-	    \section*{\contentsname
-	        \@mkboth{\contentsname}{\contentsname}}%
-	    \@starttoc{toc}%
-    \vspace{2ex}%
-	    }
-\renewcommand\listoffigures{%
-    \section*{\listfigurename}%
-      \@mkboth{\listfigurename}%
-              {\listfigurename}%
-    \@starttoc{lof}%
-    \vspace{2ex}%
-    }
-\renewcommand\listoftables{%
-    \section*{\listtablename}%
-      \@mkboth{%
-          \listtablename}%
-         {\listtablename}%
-    \@starttoc{lot}%
-    \vspace{2ex}%
-    }
-\else
-%    \end{macrocode}
-% \opt{book} mode:
-%    \begin{macrocode}
-\renewcommand\tableofcontents{%
-    \if@twocolumn
-      \@restonecoltrue\onecolumn
-    \else
-      \@restonecolfalse
-    \fi
-    \chapter*{\contentsname
-        \@mkboth{\contentsname}{\contentsname}}%
-    \@starttoc{toc}%
-    \if@restonecol\twocolumn\fi
-    }
- \fi
-\titlecontents{part}                                                  
-  [0em]                                                                    
-  {\addvspace{3ex}\partname~}                                                 
-  {\thecontentslabel\hspace*{1em}}                                                    
-  {}                                                                      
-  {}
-  [\addvspace{1ex}]
-\titlecontents{chapter}
-  [0em]                                                                    
-  {\addvspace{2ex}}                                                 
-  {\thecontentslabel\hspace*{1em}}                                                    
-  {}                                                                       
-  {\suftesi@chaptitlerule\contentspage}
-  [\addvspace{1ex}]
-\titlecontents{section}
-  [1.5em]
-  {} 
-  {\thecontentslabel\hspace*{1em}}
-  {} 
-  {\ifsuftesi@article\suftesi@chaptitlerule%
-       \else\suftesi@titlerule\fi\contentspage}
-\titlecontents{subsection}
-  [3em]
-  {} 
-  {\thecontentslabel\hspace*{1em}}
-  {} 
-  {\suftesi@titlerule\contentspage}
-\titlecontents{subsubsection}
-  [4.5em]
-  {} 
-  {\thecontentslabel\hspace*{1em}}
-  {} 
-  {\suftesi@titlerule\contentspage}
-\titlecontents{paragraph}
-  [6em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{subparagraph}
-  [7.5em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{figure}
-  [0em]
-  {} 
-  {\thecontentslabel\hspace*{1em}}
-  {} 
-  {\suftesi@titlerule\contentspage}
-\titlecontents{table}
-  [0em]
-  {} 
-  {\thecontentslabel\hspace*{1em}}
-  {} 
-  {\suftesi@titlerule\contentspage}
-\ifsuftesi@article
-\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{3}
-\else
-\fi
-%    \end{macrocode}
-% \subsubsection{Title page}
+% \subsection{Title page}
 % \DescribeMacro{\title}
-% New \cmd{title} command with an optional argument for headings.
+% The new \cmd{title} command has an optional argument 
+% which can be used in the headers.
 %    \begin{macrocode}
-    \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
     \edef\title{\noexpand\@dblarg
   \expandafter\noexpand\csname\string\title\endcsname}
     \def\@headtitle{--missing title--%
@@ -1108,8 +1664,20 @@
   \null\vfil
   \vskip 60\p@
   \begin{center}%
-    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-    \suftesi@titlesmallcaps{\@title}\else\@title\fi \par}%
+    {\SUF@chaptersize\color{sufred}\sffamily%
+    \ifsuftesi@smallcapschap%
+     \SUF@titlesmallcaps{\@title}
+      \else
+      \ifsuftesi@article
+       \ifsuftesi@smallcapssec
+        \SUF@titlesmallcaps{\@title}
+         \else
+          \@title
+        \fi
+       \else
+      \@title
+     \fi
+    \fi\par}%
     \vskip 3em%
     {\small\lineskip .75em%
       \begin{tabular}[t]{c}%
@@ -1130,6 +1698,10 @@
   \global\let\and\relax
 }
 \else
+%    \end{macrocode}
+% \DescribeMacro{\maketitle} 
+% For |notitlepage| option:
+%    \begin{macrocode}
 \renewcommand\maketitle{\par
    \begingroup
      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
@@ -1164,8 +1736,20 @@
    \vskip 2em%
    \begin{center}%
    \let \footnote \thanks
-     {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-     \suftesi@titlesmallcaps{\@title}\else\@title\fi\par}%
+     {\SUF@chaptersize\color{sufred}\sffamily%
+    \ifsuftesi@smallcapschap%
+     \SUF@titlesmallcaps{\@title}
+      \else
+      \ifsuftesi@article
+       \ifsuftesi@smallcapssec
+        \SUF@titlesmallcaps{\@title}
+         \else
+          \@title
+        \fi
+       \else
+      \@title
+     \fi
+  \fi\par}%
      \vskip 1.5em%
      {\small\lineskip .5em%
        \begin{tabular}[t]{c}%
@@ -1178,13 +1762,12 @@
    \vskip 1.5em}
 \fi
 %    \end{macrocode}
-% \subsubsection{The frontispiece}
+% \subsection{The frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
 \@ifpackageloaded{frontespizio}{%
       \ifsuftesi@periodical
-          \Margini{1cm}{7cm}{5cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {5.5cm}{7cm}{4.5cm}{1cm}
         \else
       \ifsuftesi@compact
           \Margini{1cm}{7cm}{6cm}{1cm}%
@@ -1203,32 +1786,31 @@
 % \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}}
-\renewcommand\@idxitem{\par\hangindent 15\p@}
+               {\if@twocolumn
+                  \@restonecolfalse
+                \else
+                  \@restonecoltrue
+                \fi
+                \twocolumn[\@makeschapterhead{\indexname}]%
+                \@mkboth{\indexname}{\indexname}%
+                \thispagestyle{plain}%
+                \raggedright\small%
+                \parindent\z@
+                \parskip\z@ \@plus .3\p@\relax
+                \columnseprule \z@
+                \columnsep 35\p@
+                \let\item\@idxitem}
+               {\if@restonecol\onecolumn\else\clearpage\fi}
 %    \end{macrocode}
 % \end{environment}
-% \subsubsection{Appendix}
-% \begin{macro}{\appendicesname}
-% \begin{macro}{\appendixpage}
+% \subsection{Appendix}
+% \DescribeMacro{\appendicesname}
+% \DescribeMacro{\appendixpage}
 %    \begin{macrocode}
-\newcommand{\appendicesname}[1]{\def\suff@appendices{#1}}
+\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
     \appendicesname{Appendici}
-    \newcommand{\appendixpage}{\@appendixpage}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%    \begin{macrocode}
-\def\@appendixpage{%
+    \newcommand{\appendixpage}{\SUF@appendixpage}
+\def\SUF@appendixpage{%
   \@mainmattertrue
     \titlecontents{part}                                                  
       [0em]                                                                    
@@ -1240,18 +1822,18 @@
 \let\contentspage\relax
     \cleardoublepage
        \thispagestyle{empty}
-         \addcontentsline{toc}{part}{\suff@appendices}
+         \addcontentsline{toc}{part}{\SUF@appendices}
      \begingroup
        \centering
           \null\vfil
-        {\LARGE\suff@appendices\par}
+        {\LARGE\SUF@appendices\par}
           \vfil
    \endgroup
     \cleardoublepage
 \titlecontents{part}                                                  
    [0em]                                                                    
   {\addvspace{3ex}\partname~}                                                 
-  {\thecontentslabel\hspace*{1em}}                                                    
+  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}                                                    
   {}                                                                      
   {}
   [\addvspace{1ex}]
@@ -1267,16 +1849,11 @@
     \gdef\thechapter{\@Alph\c@chapter}
     \titleformat{\chapter}[block]
       {\vskip-22pt}%
-      {\small\suftesi@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+      {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
       {0pt}
-      {\small\suftesi@titlesmallcaps}
+      {\small\SUF@titlesmallcaps}
       [\rule{\textwidth}{.4pt}]
-  \titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
-  \titlecontents{chapter}[1em]                                                                  
-    {\filright\hskip.5em}                                   
-    {\suftesi@titlesmallcaps{\appendixname~\thecontentslabel:}\hskip1em}                                                                   
-    {}                                                       
-    {\contentspage\vspace{5pt}}}
+      \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]}
     \else
       \ifsuftesi@article
           \renewcommand\appendix{\par
@@ -1298,135 +1875,125 @@
   \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt} 
   \renewcommand{\footnoterule}{}
+\def\SUF@versionstring{\texttt{Version of \today}}
 %    \end{macrocode}
-% \paragraph{The \opt{elements} headings}
+% \paragraph{The \opt{elements} headers}
 %    \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}}%
-  }%
+  \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
+  \renewcommand{\sectionmark}[1]{\markright{#1}}
+		 \fancypagestyle{elements}{%
+		  \setlength{\unitlength}{1pt}
+		   \fancyhf{}
+		   \fancyfoot[LE,RO]{\thepage} 
+		   \fancyhead[RO]{%
+		    \begin{picture}(0,0)
+		      \put(0,-104){%
+		      \hskip\marginparsep
+		      \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
+		    \end{picture}}
+		   \fancyhead[LE]{%
+		     \begin{picture}(0,0)
+		       \put(0,-104){%
+		       \hskip-\dimexpr(\marginparwidth+\marginparsep)
+		       \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
+		    \end{picture}}%
+		  }%
 \else
 %    \end{macrocode}
-% \paragraph{The \opt{default} headings}
+% \paragraph{The \opt{default} headers}
 %    \begin{macrocode}
- \renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
- \renewcommand{\sectionmark}[1]{}
+	\renewcommand{\chaptermark}[1]{%
+	    \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+	\ifsuftesi@article
+	  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+	    \else
+	  \renewcommand{\sectionmark}[1]{}
+	\fi
 \fi
 %    \end{macrocode}
 % \subparagraph{The \opt{plain} style}
 %    \begin{macrocode}
-\fancypagestyle{plain}{%
- \fancyhf{}
- \fancyfoot[C]{}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}}
+\fancypagestyle{plain}{\pagestyle{sufplain}}
 %    \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}}
+ \fancyfoot[RE,LO]{%
+   \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}}
 %    \end{macrocode}
-% \subparagraph{The \opt{centerheadings} style}
+% \subparagraph{The \opt{centerheader} 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%
+\def\SUF@LR@MarkSwitch{%
    \ifsuftesi@article
      \ifsuftesi@authortitle
-       \suf@leftmark
+       \SUF@leftmark
          \else
-           \suf@rightmark
+           \SUF@rightmark
          \fi
-     \else
-       \suf@leftmark
-     \fi} 
-  \fancyfoot[C]{\footnotesize\sufthepage}%
+       \else
+     \SUF@leftmark
+   \fi}
+\fancypagestyle{centerheader}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{%
+    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+  \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark} 
+  \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+    \SUF@LR@MarkSwitch} 
+  \fancyfoot[C]{\footnotesize\SUF@thepage}%
   }%
 %    \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}
+  \fancyfoot[RE,LO]{%
+    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+  \fancyhead[LE,RO]{\footnotesize\SUF@thepage} 
+  \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
   \fancyhead[RE]{\footnotesize\xheadbreakfalse%
-   \ifsuftesi@article
-     \ifsuftesi@authortitle
-       \suf@leftmark
-         \else
-           \suf@rightmark
-          \fi
-     \else
-       \suf@leftmark
-     \fi}
+    \SUF@LR@MarkSwitch}
   }%
-%    \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}}
+\ifsuftesi@italicRhead
+  \def\SUF@Rheadstyle{\itshape}
+    \else
+      \ifsuftesi@smallcapsRhead
+        \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
       \else
-    \def\suf@rightmark{\suftesi@headingsmallcaps{\rightmark}}
+    \def\SUF@Rheadstyle{}
   \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}}
+\ifsuftesi@italicLhead
+  \def\SUF@Lheadstyle{\itshape}
     \else
-      \def\suf@leftmark{\nouppercase{\suf@leftrightmark}}
+      \ifsuftesi@smallcapsLhead
+        \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
+      \else
+    \def\SUF@Lheadstyle{}
   \fi
 \fi
-\ifsuftesi@sctitles
-  \def\sufthepage{\suftesi@headingsmallcaps{\thepage}}
+    \ifsuftesi@authortitle
+      \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+        \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+          \else
+        \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+      \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+    \fi
+\ifsuftesi@smallcapsheader
+  \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
     \else
-      \def\sufthepage{\thepage}
+  \def\SUF@thepage{\thepage}
 \fi
-\def\suf@leftrightmark{%
+\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@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
   \ifsuftesi@elements\pagestyle{elements}\else\fi
 %    \end{macrocode}
@@ -1460,102 +2027,126 @@
 %    \end{macrocode}
 % \subsubsection{Lists}
 %    \begin{macrocode}
-\RequirePackage{enumitem}
-    \setlist{labelsep=0.6em,noitemsep,font=\normalfont}
+\RequirePackage[inline]{enumitem}
+    \setlist{labelsep=0.5\parindent,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} 
- \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}
+\ifsuftesi@alignlist
+    \setenumerate[1]{leftmargin=1\parindent,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 1.5\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 1.5\parindent,label=\roman*.}
+    \setitemize[1]{leftmargin=1\parindent}
+    \setitemize[2]{leftmargin=1.5\parindent}
+    \setitemize[3]{leftmargin=1.5\parindent} 
+\else
+\ifsuftesi@indentlist    
+    \setenumerate[1]{leftmargin=2\parindent,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 2.5\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 2.5\parindent,label=\roman*.}
+    \setitemize[1]{leftmargin=2\parindent}
+    \setitemize[2]{leftmargin=2.5\parindent}
+    \setitemize[3]{leftmargin=2.5\parindent}
  \else
-    \setenumerate[1]{leftmargin=0pt,label=\arabic*}
-    \setenumerate[2]{leftmargin= 1.3em,label=\arabic*}
-    \setenumerate[3]{leftmargin= 1.3em,label=\arabic*}
+    \setenumerate[1]{leftmargin=0pt,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 1.3\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.}
     \setitemize[1]{leftmargin=0pt}
-    \setitemize[2]{leftmargin=1.3em}
-    \setitemize[3]{leftmargin=1.3em}
-   \fi
+    \setitemize[2]{leftmargin=1.3\parindent}
+    \setitemize[3]{leftmargin=1.3\parindent}
+  \fi
 \fi
 \renewcommand\labelitemii{\normalfont \textendash}
 %    \end{macrocode}
 % \subsubsection{Block Quotations}
-% \begin{environment}{quotation}
-% \begin{environment}{quote}
-% New \env{quotation} and \env{quote} environments according to a popular italian style. The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
+% \DescribeEnv{quotation}
+% \DescribeEnv{quote}
+% \DescribeEnv{verse}
+% New \env{quotation} and \env{quote} environments according to a popular Italian style. 
+% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
 %    \begin{macrocode}
 \renewenvironment{quotation}
-               {\list{}{\listparindent\parindent%
-                        \itemindent    \listparindent
+            {\list{}{\listparindent\parindent%
+                     \itemindent    \listparindent
+                     \leftmargin     \parindent
+                     \ifsuftesi@ralignquotation
+                      \else
                         \rightmargin   \parindent
-                        \leftmargin     \parindent
+                       \fi
                         \parsep        \z@ \@plus\p@}%
-               \item\relax\footnotesize\noindent\ignorespaces}
+               \item\relax%
+                 \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi\noindent\ignorespaces}
                {\endlist}
 \renewenvironment{quote}
-               {\list{}{\rightmargin \parindent
-                         \leftmargin    \parindent}%
-                \item\relax\footnotesize}
+            {\list{}{\leftmargin \parindent
+                     \ifsuftesi@ralignquotation\
+                      \else
+                        \rightmargin   \parindent
+                       \fi}%
+               \item\relax%
+                 \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi}%\ignorespaces?
                {\endlist}
-%    \end{macrocode}
-% \end{environment}
-% \end{environment}
-% \begin{environment}{verse}
-%    \begin{macrocode}
 \renewenvironment{verse}
                {\let\\\@centercr
-                \list{}{\footnotesize%
-                    \itemsep      \z@
+                \list{}{\itemsep      \z@
                         \itemindent   -1.5em%
                         \listparindent\itemindent
                         \rightmargin  \leftmargin
                         \advance\leftmargin 1.5em}%
-                \item\relax}
+                \item\relax
+                  \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi}
                {\endlist}  
 %    \end{macrocode}
-% \end{environment}
 % \subsubsection{Notes}
-% \begin{macro}{\@makefntext}
-% Renew the |\@makefntext| command according to the look \emph{The Elements of Typographic Styles} by R. Bringhurst:
+% \DescribeMacro{\@makefntext}
+%    \begin{macrocode}
+\ifsuftesi@standardfootnote
+  \relax
+    \else
+      \ifsuftesi@dottedfootnote
+        \renewcommand\@makefntext{\@thefnmark.\hskip.5em}
+         \else
+%    \end{macrocode}
+%  By default the footnotes are printed in the style of 
+% \emph{The Elements of Typographic Styles} by R. Bringhurst:
 %    \begin{macrocode}
-\renewcommand\@makefntext{%
-  \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+       \renewcommand\@makefntext{%
+     \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+  \fi
+\fi
 %    \end{macrocode}
-%\end{macro}
-% \begin{macro}{\marginpar}
-% Renew the |\marginpar| command according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
+% \DescribeMacro{\marginpar}
+% The |\marginpar| command is redefined according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
 %    \begin{macrocode}
-\def\sufmpsetup@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio
-    \itshape\footnotesize%
+\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio
+    \ifsuftesi@elements\relax
+      \else\itshape\fi
+    \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
-\long\def\@xmpar[#1]#2{% 
-    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% 
-    \@savemarbox\@currbox{\sufmpsetup@setup\raggedright\hspace{0pt}#2}% 
-    \@xympar}
-\long\def\@ympar#1{% 
-    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% 
-    \global\setbox\@currbox\copy\@marbox \@xympar}
+\let\oldmarginpar\marginpar
+\renewcommand{\marginpar}[1]{\oldmarginpar%
+ [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
+ {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
 \ifsuftesi@nomarginpar
     \renewcommand\marginpar[2][]{}
      \else
   \fi
 %    \end{macrocode}
-% \end{macro}
 % \subsubsection{Abstract}
-% This is the macro that defines the \env{abstract} environment in \sty{article} class. In \sty{suftesi} it simply prints the abstract name in normal font:
+% This is the macro that defines the \env{abstract} environment in \sty{article} class. In \sty{suftesi} it simply prints the abstract name in roman font:
 %    \begin{macrocode}
 \if@titlepage
   \newenvironment{abstract}{%
@@ -1583,9 +2174,9 @@
 \newcommand\abstractname{Abstract}
 %    \end{macrocode}
 % \subsubsection{Colophon} 
-% Some useful commands to print a colophon or a coyright notice.
+% Some useful commands to print a colophon or a copyright notice.
 %    \begin{macrocode}
-\edef\sufengine{% 
+\edef\SUF@engine{% 
   \ifxetex 
   \noexpand\XeLaTeX 
   \else 
@@ -1596,7 +2187,7 @@
       \fi 
   \fi}
 %    \end{macrocode}
-% \begin{macro}{\colophon}
+% \DescribeMacro{\colophon}
 %    \begin{macrocode}
 \newcommand{\colophon}[3][]{%
   \thispagestyle{empty}
@@ -1605,18 +2196,17 @@
      \def\next{#2}
          \ifx\next\@empty\else
             \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          All rights reserved
+          Tutti i diritti riservato
         \fi
   \vfill  
-  {\small\noindent This work has been typeset with \sufengine{}%
+  {\small\noindent Questo lavoro è stato composto con \SUF@engine{}%
      \def\next{#1}
-        \ifx\next\@empty\else on #1 
-      \fi using the \textsf{suftesi} class by 
+        \ifx\next\@empty\else su #1 
+      \fi usando la classe \textsf{suftesi} di 
       Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
       \cleardoublepage}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\bookcolophon}
+% \DescribeMacro{\bookcolophon}
 %    \begin{macrocode}
 \newcommand{\bookcolophon}[2]{%
   \thispagestyle{empty}
@@ -1627,8 +2217,7 @@
   {\small\noindent #2\par}
       \cleardoublepage}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\artcolophon}
+% \DescribeMacro{\artcolophon}
 %    \begin{macrocode}
 \newcommand{\artcolophon}[1]{%
 \thispagestyle{empty}
@@ -1636,8 +2225,7 @@
     \vfill
   {\small\noindent #1\par}}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\finalcolophon}
+% \DescribeMacro{\finalcolophon}
 %    \begin{macrocode}
 \newcommand{\finalcolophon}[1]{%
 \thispagestyle{empty}
@@ -1650,44 +2238,434 @@
     \vspace*{\stretch{6}}  
   }
 %    \end{macrocode}
-% \end{macro}
-% \subsection{Commands}
-% \begin{macro}{\chapterintro}
+% \subsection{TOC, LOF, LOT}
+%    \begin{macrocode}
+\RequirePackage{titletoc}
+%    \end{macrocode}
+% \subsubsection{The \opt{dottedtoc} and \opt{raggedtoc} options}
+% \DescribeMacro{\SUF@titlerule}
+% \DescribeMacro{\SUF@chaptitlerule}
+%    \begin{macrocode}
+\ifsuftesi@elements
+  \def\SUF@tochapsize{}
+    \else
+  \def\SUF@tochapsize{\large}
+\fi
+\ifsuftesi@dottedtoc
+   \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+    \def\SUF@chaptitlerule{\titlerule*{}}
+      \else
+        \ifsuftesi@raggedtoc
+           \def\SUF@titlerule{\hspace{1.5em}}
+          \def\SUF@chaptitlerule{\hspace{1.5em}}
+        \else
+      \def\SUF@titlerule{\titlerule*{}}
+    \def\SUF@chaptitlerule{\titlerule*{}}
+  \fi
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\SUF@label@chapter}
+% All the lengths depend on |\SUF@label@chapter| 
+% so we define this first.
+%    \begin{macrocode}
+\newlength\SUF@label@chapter
+\setlength\SUF@label@chapter{.5em}
+%    \end{macrocode}
+% \DescribeMacro{\toclabelwidth}
+% |\toclabelwidth| is providet to
+% adjust the label width:
+%    \begin{macrocode}
+\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}} 
+%    \end{macrocode}
+% \DescribeMacro{\SUF@tochang}
+% This macro controls the space between page number and chapter
+% label using the \opt{tocpageleft} option:  
+%    \begin{macrocode}
+\newlength{\SUF@tochang}
+\setlength{\SUF@tochang}{3em}
+\AtBeginDocument{
+\newlength\SUF@label@part
+\newlength\SUF@label@section
+\newlength\SUF@label@subsection
+\newlength\SUF@label@subsubsection
+\newlength\SUF@label@paragraph
+\newlength\SUF@label@subparagraph
+\newlength\SUF@label@figure
+\newlength\SUF@label@table
+\setlength\SUF@label@part         
+    {\SUF@label@chapter}
+\setlength\SUF@label@section      
+    {\dimexpr(\SUF@label@chapter+.5em)}
+\setlength\SUF@label@subsection   
+    {\dimexpr(\SUF@label@section+.5em)}
+\setlength\SUF@label@subsubsection
+    {\dimexpr(\SUF@label@subsection+.5em)}
+\setlength\SUF@label@paragraph    
+    {\dimexpr(\SUF@label@subsubsection+.5em)}
+\setlength\SUF@label@subparagraph 
+    {\dimexpr(\SUF@label@paragraph+.5em)}
+\setlength\SUF@label@figure       
+    {\SUF@label@chapter}
+\setlength\SUF@label@table        
+    {\SUF@label@chapter}
+}
+%    \end{macrocode}
+% The part entry is the same in both default and
+% \opt{topcpageleft} style.
+%    \begin{macrocode}
+\titlecontents{part}
+  [0em]
+  {\addvspace{3ex}\SUF@tocchapsize\partname~}
+  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+  [\addvspace{1ex}]
+%    \end{macrocode}
+% \subsubsection{The \opt{tocpageleft} table of contents}
+%    \begin{macrocode}
+\ifsuftesi@tocpageleft
+%    \end{macrocode}
+% \DescribeMacro{\contentsmargin}
+% First we reset the right margin to zero:
+%    \begin{macrocode}
+\contentsmargin{0pt}
+%    \end{macrocode}
+% \DescribeMacro{\SUF@tochang@\meta{level}}
+% \DescribeMacro{\SUF@addto@tochang@\meta{level}}
+%    \begin{macrocode}
+\AtBeginDocument{
+\newlength\SUF@tochang@chap
+\newlength\SUF@tochang@sec
+\newlength\SUF@tochang@subsec
+\newlength\SUF@tochang@subsubsec
+\newlength\SUF@tochang@par
+\newlength\SUF@tochang@subpar
+\newlength\SUF@tochang@fig
+\newlength\SUF@tochang@tab
+\newlength\SUF@addto@tochang@chap
+\newlength\SUF@addto@tochang@sec
+\newlength\SUF@addto@tochang@subsec
+\newlength\SUF@addto@tochang@subsubsec
+\newlength\SUF@addto@tochang@par
+\newlength\SUF@addto@tochang@subpar
+\newlength\SUF@addto@tochang@fig
+\newlength\SUF@addto@tochang@tab
+\setlength\SUF@tochang@chap     
+    {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+\setlength\SUF@tochang@sec      
+    {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+\setlength\SUF@tochang@subsec   
+    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tochang@subsubsec
+    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tochang@par   
+    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tochang@subpar   
+    {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tochang@fig       
+    {\SUF@tochang@chap}
+\setlength\SUF@tochang@tab       
+    {\SUF@tochang@chap}
+\setlength\SUF@addto@tochang@chap      
+    {\SUF@tochang}
+\setlength\SUF@addto@tochang@sec       
+    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+\setlength\SUF@addto@tochang@subsec    
+    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+\setlength\SUF@addto@tochang@subsubsec 
+    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+\setlength\SUF@addto@tochang@par       
+    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+\setlength\SUF@addto@tochang@subpar       
+    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+\setlength\SUF@addto@tochang@fig       
+    {\SUF@addto@tochang@chap}
+\setlength\SUF@addto@tochang@tab       
+    {\SUF@addto@tochang@chap}
+}
+%    \end{macrocode}
+% \paragraph{TOC entries}
+%    \begin{macrocode}
+\titlecontents{chapter}
+  [\SUF@tochang@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tochang@chap%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap%
+     \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@chap%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap}
+  {}
+  [\addvspace{1ex}]
+\titlecontents{section}
+  [\SUF@tochang@sec]
+  {}
+  {\hskip-\SUF@tochang@sec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@sec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subsection}
+  [\SUF@tochang@subsec]
+  {}
+  {\hskip-\SUF@tochang@subsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subsubsection}
+  [\SUF@tochang@subsubsec]
+  {}
+  {\hskip-\SUF@tochang@subsubsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subsubsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{paragraph}
+  [\SUF@tochang@par]
+  {}
+  {\hskip-\SUF@tochang@par%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@par%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subparagraph}
+  [\SUF@tochang@subpar]
+  {}
+  {\hskip-\SUF@tochang@subpar%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subpar%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{figure}
+  [\SUF@tochang@fig]
+  {}
+  {\hskip-\SUF@tochang@fig%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
+     \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+\titlecontents{table}
+  [\SUF@tochang@tab]
+  {}
+  {\hskip-\SUF@tochang@tab%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
+     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+\else
+%    \end{macrocode}
+% \subsubsection{The default table of contents}
+%    \begin{macrocode}
+\AtBeginDocument{
+\newlength\SUF@tocindent@chap
+\newlength\SUF@tocindent@sec
+\newlength\SUF@tocindent@subsec
+\newlength\SUF@tocindent@subsubsec
+\newlength\SUF@tocindent@par
+\newlength\SUF@tocindent@subpar
+\newlength\SUF@tocindent@fig
+\newlength\SUF@tocindent@tab
+\setlength\SUF@tocindent@chap
+    {\dimexpr(\SUF@label@chapter+1em)}
+\setlength\SUF@tocindent@sec
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+\setlength\SUF@tocindent@subsec
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tocindent@subsubsec
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tocindent@par
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tocindent@subpar
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tocindent@fig
+    {\SUF@tocindent@chap}
+\setlength\SUF@tocindent@tab
+    {\SUF@tocindent@chap}
+}
+%    \end{macrocode}
+% \paragraph{TOC entries}
+%    \begin{macrocode}
+\titlecontents{chapter}
+  [\SUF@tocindent@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tocindent@chap%
+    \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}\SUF@tochapsize}
+  {\hskip-\SUF@tocindent@chap\SUF@tochapsize}
+  {\SUF@chaptitlerule\contentspage}
+  [\addvspace{1ex}]
+\titlecontents{section}
+  [\SUF@tocindent@sec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@section+1em)%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@section+1em)%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\ifsuftesi@article\SUF@chaptitlerule%
+       \else\SUF@titlerule\fi\contentspage}
+\titlecontents{subsection}
+  [\SUF@tocindent@subsec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{subsubsection}
+  [\SUF@tocindent@subsubsec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{paragraph}
+  [\SUF@tocindent@par]
+  {}
+  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{subparagraph}
+  [\SUF@tocindent@subpar]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{figure}
+  [\SUF@tocindent@fig]
+  {}
+  {\hskip-\dimexpr(\SUF@label@figure+1em)%
+    \makebox[\SUF@label@figure][l]{\thecontentslabel}}
+  {}
+  {\SUF@titlerule\contentspage}
+\titlecontents{table}
+  [\SUF@tocindent@tab]
+  {}
+  {\hskip-\dimexpr(\SUF@label@table+1em)%
+    \makebox[\SUF@label@table][l]{\thecontentslabel}}
+  {}
+  {\SUF@titlerule\contentspage}
+\fi
+%    \end{macrocode}
+% \DescribeMacro{\tableofcontents}
+% \DescribeMacro{\listoffigures}
+% \DescribeMacro{\listoftables}
+% With \opt{article} option the toc, lof and lot 
+% are printed as sections.
+%    \begin{macrocode}
+\ifsuftesi@article 
+\renewcommand\tableofcontents{%
+	\thispagestyle{empty}
+	    \section*{\contentsname
+	        \@mkboth{\contentsname}{\contentsname}}%
+	    \@starttoc{toc}%
+    \vspace{2ex}%
+   }
+\renewcommand\listoffigures{%
+    \section*{\listfigurename}%
+      \@mkboth{\listfigurename}%
+              {\listfigurename}%
+    \@starttoc{lof}%
+    \vspace{2ex}%
+    }
+\renewcommand\listoftables{%
+    \section*{\listtablename}%
+      \@mkboth{%
+          \listtablename}%
+         {\listtablename}%
+    \@starttoc{lot}%
+    \vspace{2ex}%
+    }
+\else
+%    \end{macrocode}
+% The default toc, lof and lot are treated as chapters. 
+%    \begin{macrocode}
+\renewcommand\tableofcontents{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\contentsname
+        \@mkboth{%
+            \contentsname}
+           {\contentsname}}%
+    \@starttoc{toc}%
+    \if@restonecol\twocolumn\fi
+   }
+\renewcommand\listoffigures{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\listfigurename}%
+      \@mkboth{\listfigurename}%
+              {\listfigurename}%
+    \@starttoc{lof}%
+    \if@restonecol\twocolumn\fi
+    }
+\renewcommand\listoftables{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\listtablename}%
+      \@mkboth{%
+          \listtablename}%
+         {\listtablename}%
+    \@starttoc{lot}%
+    \if@restonecol\twocolumn\fi
+    }
+\fi
+%    \end{macrocode}
+% \subsection{New commands}
+% \DescribeMacro{\chapterintro}
 % A command to typeset an unnumbered section:
 %    \begin{macrocode}
 \def\chapterintro{
   \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
 \def\@chapterintro{\phantomsection
-  \if@tempswa\section*{\suffchapterintroname}\fi
-  \addcontentsline{toc}{section}{\suffchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\suffchapterintroname{#1}}
+  \if@tempswa\section*{\SUF@fchapterintroname}\fi
+  \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
 \chapterintroname{Introduzione}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\headbreak}
-%Active in the table of contents but not in the text or in the headings
+% \DescribeMacro{\headbreak}
+%Active in the table of contents but not in the text.
 %    \begin{macrocode}
 \newif\ifheadbreak\headbreakfalse
   \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.
+% \DescribeMacro{\xheadbreak}
+% Active in the text but not in the table of contents.
 %    \begin{macrocode}
 \newif\ifxheadbreak\xheadbreaktrue
   \DeclareRobustCommand{\xheadbreak} 
     {\ifxheadbreak\\\else\fi}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\tableofcontents}
+% \DescribeMacro{\tableofcontents}
 %    \begin{macrocode}
 \let\origtableofcontents\tableofcontents
   \renewcommand{\tableofcontents}{%
     \begingroup\headbreaktrue\xheadbreakfalse%
   \origtableofcontents\endgroup}
 %    \end{macrocode}
-% \end{macro}
 % Renew  |\frontmatter| to have arabic page numbering:
 %    \begin{macrocode}
 \renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse} 
@@ -1731,19 +2709,33 @@
   {\endlist}
 %    \end{macrocode}
 % \end{environment}
+% \DescribeMacro{\hemph}
+% In a previous version the \cmd{hemph} command was provided
+% to fix a bug in the hyphenation of some italian expressions
+% like ``dell'\emph{encyclopaedia}''. The bug has been fixed by Claudio Beccari
+% so the \cmd{hemph} command is provided only for 
+% backward compatibility:
 %    \begin{macrocode}
 \let\hemph\emph
 %    \end{macrocode}
-% \paragraph{Final settings}
+% \subsection{Final settings}
+% The first line of all sections is indented by default
+% using \XeLaTeX{} with italian as main language. Anyway this is 
+% incongruous with the \LaTeX{} default.
+%    \begin{macrocode}
+\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
+%    \end{macrocode}
 % Just one touch of french typography:
 %    \begin{macrocode}
 \frenchspacing
-%</class>
 %    \end{macrocode}
+%</class>
 %
 % \subsection{The bibliography file}
 %
+% \iffalse
 %<*bib>
+% \fi
 % \begin{verbatim}
 @book{Morison:1111,
   Author = {Stanley Morison},
@@ -1850,6 +2842,583 @@
   Volume = {6},
   Year = {2008}}
 % \end{verbatim}
+% \iffalse
 %</bib>
-%
+% \fi
+% \iffalse
+%<*fakelogo>
+prologues:=3;
+outputtemplate:="%j.mps";
+input boxes;
+beginfig(1);
+draw fullcircle scaled (2.5cm + 1pt) withcolor white;
+draw fullcircle scaled 2.5cm;
+draw fullcircle scaled 2.3cm;
+draw thelabel(btex \vbox{\sevenrm\halign{\hfil#\hfil\cr University of\cr
+      Verona\cr Seal\cr}} etex, origin);
+endfig;
+end
+%</fakelogo>
+% \fi
+% \iffalse
+%<*rmstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle1>
+% \fi
+% \iffalse
+%<*rmstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle2>
+% \fi
+% \iffalse
+%<*rmstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle3>
+% \fi
+% \iffalse
+%<*rmstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle4>
+% \fi
+% \iffalse
+%<*rmstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle5>
+% \fi
+% \iffalse
+%<*rmstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle6>
+% \fi
+% \iffalse
+%<*itstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle1>
+% \fi
+% \iffalse
+%<*itstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle2>
+% \fi
+% \iffalse
+%<*itstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle3>
+% \fi
+% \iffalse
+%<*itstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle4>
+% \fi
+% \iffalse
+%<*itstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle5>
+% \fi
+% \iffalse
+%<*itstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle6>
+% \fi
+% \iffalse
+%<*itstyle7>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle7]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle7>
+% \fi
+% \iffalse
+%<*itstyle8>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle8]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle8>
+% \fi
+% \iffalse
+%<*itstyle9>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle9]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle9>
+% \fi
+% \iffalse
+%<*itstyle10>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle10]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle10>
+% \fi
+% \iffalse
+%<*itstyle11>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle11]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle11>
+% \fi
+% \iffalse
+%<*itstyle12>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle12]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle12>
+% \fi
+% \iffalse
+%<*scstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle1>
+% \fi
+% \iffalse
+%<*scstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle2>
+% \fi
+% \iffalse
+%<*scstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle3>
+% \fi
+% \iffalse
+%<*scstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle4>
+% \fi
+% \iffalse
+%<*scstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle5>
+% \fi
+% \iffalse
+%<*scstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle6>
+% \fi
+% \iffalse
+%<*scstyle7>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle7]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle7>
+% \fi
+% \iffalse
+%<*scstyle8>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle8]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle8>
+% \fi
+% \iffalse
+%<*scstyle9>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle9]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle9>
+% \fi
+% \iffalse
+%<*scstyle10>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle10]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle10>
+% \fi
+% \iffalse
+%<*scstyle11>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle11]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle11>
+% \fi
+% \iffalse
+%<*scstyle12>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle12]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle12>
+% \fi
+% \iffalse
+%<*collect-examples>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = pdfLaTeX
+\documentclass[a4paper]{book}
+\usepackage{graphicx,xcolor}
+\usepackage[margin=1cm]{geometry}
+\parindent0pt
+\pagestyle{empty}
+\newcommand{\inputex}[1]{%
+\vbox{\centering
+  \fbox{\includegraphics[width=.95\textwidth]{#1.pdf}}\\
+    \begin{picture}(0,0)
+      \put (-185,90) {%
+        \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#1}}}}
+    \end{picture}}
+}
+\begin{document}
+\inputex{rmstyle1}
+\inputex{rmstyle2}
+\inputex{rmstyle3}
+\inputex{rmstyle4}
+\inputex{rmstyle5}
+\inputex{rmstyle6}
+\inputex{itstyle1}
+\inputex{itstyle2}
+\inputex{itstyle3}
+\inputex{itstyle4}
+\inputex{itstyle5}
+\inputex{itstyle6}
+\inputex{itstyle7}
+\inputex{itstyle8}
+\inputex{itstyle9}
+\inputex{itstyle10}
+\inputex{itstyle11}
+\inputex{itstyle12}
+\inputex{scstyle1}
+\inputex{scstyle2}
+\inputex{scstyle3}
+\inputex{scstyle4}
+\inputex{scstyle5}
+\inputex{scstyle6}
+\inputex{scstyle7}
+\inputex{scstyle8}
+\inputex{scstyle9}
+\inputex{scstyle10}
+\inputex{scstyle11}
+\inputex{scstyle12}
+\end{document}
+%</collect-examples>
+% \fi
 % \Finale
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
index 297fb8113e3..1c7fb4f8ff8 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
@@ -45,6 +45,38 @@
 \generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
           \nopreamble\nopostamble
           \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
+          \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
+          \file{rmstyle1.tex}{\from{suftesi.dtx}{rmstyle1}}
+          \file{rmstyle2.tex}{\from{suftesi.dtx}{rmstyle2}}
+          \file{rmstyle3.tex}{\from{suftesi.dtx}{rmstyle3}}
+          \file{rmstyle4.tex}{\from{suftesi.dtx}{rmstyle4}}
+          \file{rmstyle5.tex}{\from{suftesi.dtx}{rmstyle5}}
+          \file{rmstyle6.tex}{\from{suftesi.dtx}{rmstyle6}}
+          \file{itstyle1.tex}{\from{suftesi.dtx}{itstyle1}}
+          \file{itstyle2.tex}{\from{suftesi.dtx}{itstyle2}}
+          \file{itstyle3.tex}{\from{suftesi.dtx}{itstyle3}}
+          \file{itstyle4.tex}{\from{suftesi.dtx}{itstyle4}}
+          \file{itstyle5.tex}{\from{suftesi.dtx}{itstyle5}}
+          \file{itstyle6.tex}{\from{suftesi.dtx}{itstyle6}}
+          \file{itstyle7.tex}{\from{suftesi.dtx}{itstyle7}}
+          \file{itstyle8.tex}{\from{suftesi.dtx}{itstyle8}}
+          \file{itstyle9.tex}{\from{suftesi.dtx}{itstyle9}}
+         \file{itstyle10.tex}{\from{suftesi.dtx}{itstyle10}}
+         \file{itstyle11.tex}{\from{suftesi.dtx}{itstyle11}}
+         \file{itstyle12.tex}{\from{suftesi.dtx}{itstyle12}}
+          \file{scstyle1.tex}{\from{suftesi.dtx}{scstyle1}}
+          \file{scstyle2.tex}{\from{suftesi.dtx}{scstyle2}}
+          \file{scstyle3.tex}{\from{suftesi.dtx}{scstyle3}}
+          \file{scstyle4.tex}{\from{suftesi.dtx}{scstyle4}}
+          \file{scstyle5.tex}{\from{suftesi.dtx}{scstyle5}}
+          \file{scstyle6.tex}{\from{suftesi.dtx}{scstyle6}}
+          \file{scstyle7.tex}{\from{suftesi.dtx}{scstyle7}}
+          \file{scstyle8.tex}{\from{suftesi.dtx}{scstyle8}}
+          \file{scstyle9.tex}{\from{suftesi.dtx}{scstyle9}}
+         \file{scstyle10.tex}{\from{suftesi.dtx}{scstyle10}}
+         \file{scstyle11.tex}{\from{suftesi.dtx}{scstyle11}}
+         \file{scstyle12.tex}{\from{suftesi.dtx}{scstyle12}}
+         \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
  }
 
 \Msg{***********************************************************}
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 36aa0fc4a3e..527ac390668 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,19 +19,16 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2012/04/22 v0.9 A class for typesetting theses, books and articles]
-\newif\ifsuftesi@centertitle
-\newif\ifsuftesi@sctitles
+    [2012/08/31 v0.9a A class for typesetting theses, books and articles]
 \newif\ifsuftesi@artemisia
 \newif\ifsuftesi@porson
-\newif\ifsuftesi@defaultfont
 \newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@centerheadings
+\newif\ifsuftesi@defaultfont
+\newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@bozza
 \newif\ifsuftesi@article
 \newif\ifsuftesi@authortitle
-\newif\ifsuftesi@nofront
 \newif\ifsuftesi@periodical
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
@@ -41,44 +38,355 @@
 \newif\ifsuftesi@nomarginpar
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\DeclareOption{centertitle}{\suftesi@centertitletrue}
-\DeclareOption{sctitles}{\suftesi@sctitlestrue}
-\DeclareOption{disablefront}{\suftesi@nofronttrue}
-\DeclareOption{defaultfont}{\suftesi@defaultfonttrue\suftesi@defaultgreektrue}
-\DeclareOption{artemisia}{\suftesi@artemisiatrue\suftesi@porsonfalse
-\suftesi@defaultgreekfalse}
-\DeclareOption{porson}{\suftesi@porsontrue\suftesi@artemisiafalse
-\suftesi@defaultgreekfalse}
-\DeclareOption{defaultgreek}{\suftesi@defaultgreektrue
-\suftesi@artemisiafalse\suftesi@porsonfalse}
-\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
-\suftesi@supercompactfalse\suftesi@compactfalse}
-\DeclareOption{sufelements}{\suftesi@sufelementstrue\suftesi@sctitlestrue}
-\DeclareOption{nocrop}{\suftesi@nocroptrue}
-\DeclareOption{nomarginpar}{\suftesi@nomarginpartrue}
-\DeclareOption{article}{\suftesi@articletrue}
-\DeclareOption{authortitle}{\suftesi@authortitletrue}
-\DeclareOption{dottedtoc}{\suftesi@dottedtoctrue}
-\DeclareOption{raggedtoc}{\suftesi@raggedtoctrue}
+\newif\ifsuftesi@tocpageleft
+\newif\ifsuftesi@defaultparindent
+\newif\ifsuftesi@standardfootnote
+\newif\ifsuftesi@dottedfootnote
+\newif\ifsuftesi@alignlist
+\newif\ifsuftesi@indentlist
+\newif\ifsuftesi@ralignquotation
+\newif\ifsuftesi@smallquotation
+\newif\ifsuftesi@romanchap
+\newif\ifsuftesi@centerpart
+\newif\ifsuftesi@centerchap
+\newif\ifsuftesi@centersec
+\newif\ifsuftesi@centersubsec
+\newif\ifsuftesi@rightpart
+\newif\ifsuftesi@rightchap
+\newif\ifsuftesi@rightsec
+\newif\ifsuftesi@rightsubsec
+\newif\ifsuftesi@centersubsubsec
+\newif\ifsuftesi@rightsubsubsec
+\newif\ifsuftesi@numparpart
+\newif\ifsuftesi@numparchap
+\newif\ifsuftesi@numparsec
+\newif\ifsuftesi@numparsubsec
+\newif\ifsuftesi@numparsubsubsec
+\newif\ifsuftesi@dottedpart
+\newif\ifsuftesi@dottedchap
+\newif\ifsuftesi@italicpart
+\newif\ifsuftesi@italicchap
+\newif\ifsuftesi@italicsec
+\newif\ifsuftesi@italicsubsec
+\newif\ifsuftesi@italicsubsubsec
+\newif\ifsuftesi@smallcapspart
+\newif\ifsuftesi@smallcapschap
+\newif\ifsuftesi@smallcapssec
+\newif\ifsuftesi@smallcapssubsec
+\newif\ifsuftesi@smallcapssubsubsec
+\newif\ifsuftesi@italicLhead
+\newif\ifsuftesi@italicRhead
+\newif\ifsuftesi@italicheader
+\newif\ifsuftesi@smallcapsRhead
+\newif\ifsuftesi@smallcapsLhead
+\newif\ifsuftesi@smallcapsheader
+\DeclareOption{defaultfont}{
+    \suftesi@defaultfonttrue
+    \suftesi@defaultgreektrue}
+\DeclareOption{artemisia}{
+    \suftesi@artemisiatrue
+    \suftesi@porsonfalse
+  \suftesi@defaultgreekfalse}
+\DeclareOption{porson}{
+    \suftesi@porsontrue
+    \suftesi@artemisiafalse
+  \suftesi@defaultgreekfalse}
+\DeclareOption{defaultgreek}{
+    \suftesi@defaultgreektrue
+    \suftesi@artemisiafalse
+    \suftesi@porsonfalse}
+\DeclareOption{centerheader}{
+    \suftesi@centerheadertrue}
+\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
+    \suftesi@articlefalse
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@raggedtoctrue
+    }
+\DeclareOption{sufelements}{
+    \suftesi@sufelementstrue
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@compactfalse
+    \suftesi@supercompactfalse}
+\DeclareOption{nocrop}{
+    \suftesi@nocroptrue}
+\DeclareOption{nomarginpar}{
+    \suftesi@nomarginpartrue}
+\DeclareOption{article}{
+    \suftesi@articletrue}
+\DeclareOption{authortitle}{
+    \suftesi@authortitletrue}
+\DeclareOption{dottedtoc}{
+    \suftesi@dottedtoctrue}
+\DeclareOption{raggedtoc}{
+    \suftesi@raggedtoctrue}
+\DeclareOption{tocpageleft}{
+    \suftesi@tocpagelefttrue}
+\DeclareOption{defaultparindent}{
+    \suftesi@defaultparindenttrue}
+\DeclareOption{standardfootnote}{
+    \suftesi@standardfootnotetrue}
+\DeclareOption{dottedfootnote}{
+    \suftesi@dottedfootnotetrue}
+\DeclareOption{alignlist}{
+    \suftesi@alignlisttrue}
+\DeclareOption{indentlist}{
+    \suftesi@indentlisttrue}
+\DeclareOption{ralignquotation}{
+    \suftesi@ralignquotationtrue}
+\DeclareOption{smallquotation}{
+    \suftesi@smallquotationtrue}
+\DeclareOption{centerpart}{
+    \suftesi@centerparttrue}
+\DeclareOption{centerchap}{
+    \suftesi@centerchaptrue}
+\DeclareOption{centersec}{
+    \suftesi@centersectrue}
+\DeclareOption{rightpart}{
+    \suftesi@rightparttrue}
+\DeclareOption{rightchap}{
+    \suftesi@rightchaptrue}
+\DeclareOption{rightsec}{
+    \suftesi@rightsectrue}
+\DeclareOption{numparpart}{
+    \suftesi@numparparttrue}
+\DeclareOption{numparchap}{
+    \suftesi@numparchaptrue}
+\DeclareOption{numparsec}{
+    \suftesi@numparsectrue}
+\DeclareOption{smallcapspart}{
+    \suftesi@smallcapsparttrue}
+\DeclareOption{smallcapschap}{
+    \suftesi@smallcapschaptrue}
+\DeclareOption{smallcapssec}{
+    \suftesi@smallcapssectrue}
+\DeclareOption{italicpart}{
+    \suftesi@italicparttrue}
+\DeclareOption{italicchap}{
+    \suftesi@italicchaptrue}
+\DeclareOption{italicsec}{
+    \suftesi@italicsectrue}
+\DeclareOption{italicsubsec}{
+    \suftesi@italicsubsectrue}
+\DeclareOption{romanchap}{
+    \suftesi@romanchaptrue}
+\DeclareOption{dottedpart}{
+    \suftesi@dottedparttrue}
+\DeclareOption{dottedchap}{
+    \suftesi@dottedchaptrue}
+\DeclareOption{italicheader}{
+  \suftesi@italicLheadtrue
+  \suftesi@italicRheadtrue}
+\DeclareOption{smallcapsheader}{
+  \suftesi@smallcapsLheadtrue
+  \suftesi@smallcapsRheadtrue}
+\DeclareOption{rmstyle1}{
+        \suftesi@italicsectrue}
+\DeclareOption{rmstyle2}{
+        \suftesi@italicsectrue
+        \suftesi@centerchaptrue}
+\DeclareOption{rmstyle3}{
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue}
+\DeclareOption{rmstyle4}{
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue}
+\DeclareOption{rmstyle5}{
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue}
+\DeclareOption{rmstyle6}{
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue}
+\DeclareOption{itstyle1}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle2}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle3}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle4}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle5}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle6}{
+    \suftesi@italicchaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle7}{
+    \suftesi@italicchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicsubsectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle8}{
+    \suftesi@italicchaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle9}{
+    \suftesi@italicchaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle10}{
+    \suftesi@italicchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle11}{
+    \suftesi@italicchaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{itstyle12}{
+    \suftesi@italicchaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicLheadtrue
+    \suftesi@italicRheadtrue}
+\DeclareOption{scstyle1}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle2}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle3}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle4}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle5}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@centerchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle6}{
+    \suftesi@smallcapschaptrue
+    \suftesi@italicsectrue
+    \suftesi@rightchaptrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle7}{
+    \suftesi@smallcapschaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle8}{
+    \suftesi@smallcapschaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle9}{
+    \suftesi@smallcapschaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle10}{
+    \suftesi@smallcapschaptrue
+    \suftesi@numparchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle11}{
+    \suftesi@smallcapschaptrue
+    \suftesi@centerchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle12}{
+    \suftesi@smallcapschaptrue
+    \suftesi@rightchaptrue
+    \suftesi@italicsubsectrue
+    \suftesi@numparchaptrue
+    \suftesi@smallcapssectrue
+    \suftesi@smallcapsLheadtrue
+    \suftesi@smallcapsRheadtrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ExecuteOptions{artemisia}
+\ExecuteOptions{artemisia,rmstyle1}
 \ProcessOptions
 \relax
-\LoadClass[a4paper]{book}
+\LoadClass{book}
 \RequirePackage{color}
     \definecolor{sufred}{rgb}{0.5,0,0}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{ifxetex,ifluatex}
-\ifxetex\relax
-  \else
-    \RequirePackage{microtype}
-    \fi
+\ifxetex
+  \relax
+    \else
+  \RequirePackage{microtype}
+\fi
 \RequirePackage{textcase}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
@@ -97,10 +405,10 @@
     \renewcommand{\sfdefault}{iwona}
   \fi
 \ifsuftesi@artemisia
-\def\suftesi@greekfamily{artemisiaeuler}
+\def\SUF@greekfamily{artemisiaeuler}
     \fi
 \ifsuftesi@defaultgreek
-\def\suftesi@greekfamily{cmr}
+\def\SUF@greekfamily{cmr}
     \fi
 \ifsuftesi@porson
 \sbox\z@{\fontsize{10}{10}\normalfont A}
@@ -109,105 +417,98 @@
 \dimexpr(0.001\dimexpr\numexpr(\dimexpr(1000\ht\z@)/\ht\tw@)\p@)
 \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}{}
-\DeclareFontShape{LGR}{porson}{b}{n}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{b}{it}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{m}{sl}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{b}{sl}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{m}{sc}{<-> ssub * porson/m/n}{}
-\DeclareFontShape{LGR}{porson}{bx}{n}{<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{m}{n}  {<-> s * [\art@scale] gporsonrg6a}{}
+\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{b}{n}  {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{}
+\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{}
 \DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
 \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
-      \def\suftesi@greekfamily{porson}
+      \def\SUF@greekfamily{porson}
    \fi
 \AtBeginDocument{
   \DeclareRobustCommand{\greektext}{%
-    \fontencoding{LGR}\fontfamily{\suftesi@greekfamily}\selectfont
+    \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont
     \def\encodingdefault{LGR}}}
 \fi
 \RequirePackage{geometry}
+\ifsuftesi@defaultparindent
+  \relax
+    \else
   \parindent1em
-\ifcase\@ptsize\relax
-\geometry{%
-  textwidth=312pt,
-  textheight=624pt}\or
-\geometry{%
-  textwidth=324pt,
-  textheight=648pt}\or
-\geometry{%
-  textwidth=324pt,
-  textheight=648pt}
-  \fi
-\geometry{%
-  marginparsep=12pt,
-  includehead,
-  hmarginratio=1:2,
-  vmarginratio=1:2,
-  heightrounded,
-  marginparwidth=82pt}
+\fi
+  \geometry{heightrounded}
 \ifsuftesi@nocrop
-     \relax
-       \else
-          \RequirePackage[a4,cam,center]{crop}
+  \relax
+    \else
+  \RequirePackage[a4,cam,center]{crop}
 \fi
 \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}
+  \geometry{
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     170mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 75pt,
+    marginparsep=   10pt}
 \else
 \ifsuftesi@compact
-    \geometry{
-    textheight=16.5cm,
-    textwidth=11cm,
-    paperwidth=16cm,
-    paperheight=24cm,
-    hmarginratio=2:3,
-    vmarginratio=2:3,
-    includefoot,
-    includehead,
-    heightrounded,
-    marginparwidth=65pt,
-    marginparsep=10pt}
+  \geometry{
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     160mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 65pt,
+    marginparsep=   10pt}
 \else
 \ifsuftesi@supercompact
-    \geometry{
-    textheight=15cm,
-    textwidth=10cm,
-    paperwidth=14cm,
-    paperheight=21cm,
-    hmarginratio=2:3,
-    vmarginratio=2:3,
-    includefoot,
-    includehead,
-    heightrounded,
-    marginparwidth=50pt,
-    marginparsep=9pt}
+  \geometry{
+    textheight=     150mm,
+    textwidth=      100mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    2:3,
+    marginparwidth= 50pt,
+    marginparsep=   9pt}
 \else
 \ifsuftesi@elements
-    \geometry{%
-    textwidth=251pt,
-    textheight=502pt,
-    marginparwidth=60pt,
-    marginparsep=18pt,
-    paperwidth=378pt,
-    paperheight=654pt,
-    heightrounded,
-    outer=91.2pt,
-    top=64pt}
+  \geometry{%
+    textwidth=      251pt,
+    textheight=     502pt,
+    paperwidth=     374pt,
+    paperheight=    648pt,
+    marginparwidth= 60pt,
+    marginparsep=   18pt,
+    outer=          90pt,
+    top=            64pt}
    \else
+\ifcase\@ptsize\relax
+\geometry{%
+  textwidth=      312pt,
+  textheight=     624pt}\or
+\geometry{%
+  textwidth=      324pt,
+  textheight=     648pt}\or
+\geometry{%
+  textwidth=      324pt,
+  textheight=     648pt}
+  \fi
+\geometry{%
+  a4paper,
+  includehead,
+  heightrounded,
+  marginparwidth=  82pt,
+  marginparsep=    12pt,
+  hmarginratio=    1:2,
+  vmarginratio=    1:2}
+      \fi
+    \fi
   \fi
- \fi
-\fi
 \fi
  \if@twoside
    \relax
@@ -217,144 +518,312 @@
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifsuftesi@supercompact
-  \DeclareRobustCommand{\sufchaptersize}{\large}
+\ifsuftesi@periodical
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
     \else
       \ifsuftesi@compact
-       \DeclareRobustCommand{\sufchaptersize}{\Large}
+       \DeclareRobustCommand{\SUF@chaptersize}{\large}
          \else
-           \DeclareRobustCommand{\sufchaptersize}{\Large}
-     \fi
+           \ifsuftesi@supercompact
+          \DeclareRobustCommand{\SUF@chaptersize}{\large}
+        \else
+      \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+    \fi
+  \fi
 \fi
 \ifxetex
-  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
-  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
-      \def\@chapnumfont{\fontspec{#1}}}
+      \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}}
       \chapnumfont{Palatino}
 \else
-  \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
-  \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+  \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
   \newcommand{\chapnumfont}[1]{%
-    \def\@chapnumfont{\fontfamily{#1}}}
+    \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
 \fi
-\ifsuftesi@article
-\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
-\titleformat{\part}[display]
-  {\LARGE\filcenter}
-  {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
-  {3ex}
-  {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+\ifsuftesi@romanchap
+  \def\SUF@thechapter{\Roman{chapter}}
+    \else
+  \def\SUF@thechapter{\arabic{chapter}}
+\fi
+\ifsuftesi@centerpart
+  \def\SUF@lr@PARTSwitch{\filcenter}
+    \else
+      \ifsuftesi@rightpart
+        \def\SUF@lr@PARTSwitch{\filleft}
+      \else
+    \def\SUF@lr@PARTSwitch{\filright}
+  \fi
 \fi
+\ifsuftesi@centerchap
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+    \else
+      \ifsuftesi@rightchap
+        \def\SUF@lr@CHAPSwitch{\filleft}
+      \else
+    \def\SUF@lr@CHAPSwitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersec
+  \def\SUF@lr@SECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsec
+        \def\SUF@lr@SECswitch{\filleft}
+      \else
+    \def\SUF@lr@SECswitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersubsec
+  \def\SUF@lr@SUBSECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsubsec
+        \def\SUF@lr@SUBSECswitch{\filleft}
+      \else
+    \def\SUF@lr@SUBSECswitch{\filright}
+  \fi
+\fi
+\ifsuftesi@centersubsubsec
+  \def\SUF@lr@SUBSUBSECswitch{\filcenter}
+    \else
+      \ifsuftesi@rightsubsubsec
+        \def\SUF@lr@SUBSUBSECswitch{\filleft}
+      \else
+    \def\SUF@lr@SUBSUBSECswitch{\filright}
+  \fi
+\fi
+\ifsuftesi@dottedchap
+  \def\SUF@dotchap{.}
+   \else
+  \def\SUF@dotchap{}
+\fi
+\ifsuftesi@dottedpart
+  \def\SUF@dotpart{.}
+   \else
+  \def\SUF@dotpart{}
+\fi
+\def\SUF@chapnumpos{-73}
 \ifsuftesi@sufelements
    \titleformat{\chapter}[block]
      {}%
      {\begin{picture}(0,0)
      \setlength{\unitlength}{1pt}
-     \@chapnumfont%
+     \SUF@chapnumfont%
      \ifsuftesi@elements
-       \fontsize{64}{64}\selectfont%
-       \put(0,-73){%
-       \hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}%
+       \ifsuftesi@periodical
+         \fontsize{80}{80}\selectfont%
+           \def\SUF@chapnumpos{-83}
+         \else
+       \ifsuftesi@compact
+         \fontsize{80}{80}\selectfont%
+           \def\SUF@chapnumpos{-83}
+         \else
+       \ifsuftesi@supercompact
+         \fontsize{64}{64}\selectfont%
+           \def\SUF@chapnumpos{-73}
+         \else
+         \fontsize{64}{64}\selectfont%
+           \def\SUF@chapnumpos{-73}
+       \fi\fi\fi
      \else
        \fontsize{95}{95}\selectfont%
-       \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)%
-       \textcolor{sufgray}{\thechapter}}%
+       \def\SUF@chapnumpos{-83}
      \fi
+     \put(0,\SUF@chapnumpos){%
+       \hskip\dimexpr(\textwidth+\marginparsep)%
+       \textcolor{sufgray}{\SUF@thechapter}}%
    \end{picture}}%
   {0pt}
-  {\suftesi@titlesmallcaps}
+  {\Large\SUF@titlesmallcaps}
   [\rule{\textwidth}{.1pt}]
-\else
-\ifsuftesi@centertitle
-  \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}
-    \else
-      \ifsuftesi@supercompact
-        \titlespacing*{\chapter}{0em}{0ex}{18ex}
-         \else
-           \ifsuftesi@elements
-             \titlespacing*{\chapter}{0em}{-45pt}{10pt}[0em]
-               \else
-                 \ifsuftesi@sufelements
-                \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em]
-              \else
-            \titlespacing*{\chapter}{0em}{6ex}{18ex}
-         \fi
-      \fi
-   \fi
-\fi
-\ifsuftesi@elements
-\titleformat{\section}[hang]
-  {\raggedright}
+  \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]
+\titleformat{\section}[block]
+  {\filright}
   {\textnormal\thesection}
   {1em}
-  {\small\suftesi@titlesmallcaps}
-\titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em]
+  {\SUF@titlesmallcaps}
+\titlespacing*{\section}{0em}{1em}{1em}[0em]
 \titleformat{\subsection}[block]
   {\filright\normalsize\itshape}
   {\textnormal\thesubsection}
   {1em}
   {}
-\titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em]
+  \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em]
 \titleformat{\subsubsection}[block]
-  {\filright\normalsize\itshape}
+  {\filright\normalsize}
   {\textnormal\thesubsubsection}
   {1em}
   {}
-\titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
-\else
+  \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
+   \else
+\def\SUF@PART@StyleSwitch{%
+  \ifsuftesi@smallcapspart
+    \expandafter\SUF@titlesmallcaps
+      \else
+        \ifsuftesi@italicpart
+      \itshape
+    \else
+  \fi
+\fi}
+\def\SUF@CHAP@StyleSwitch{%
+  \ifsuftesi@smallcapschap
+    \expandafter\SUF@titlesmallcaps
+      \else
+        \ifsuftesi@italicchap
+      \itshape
+    \else
+  \fi
+\fi}
+\def\SUF@SEC@StyleSwitch{%
+        \ifsuftesi@smallcapssec
+          \expandafter\SUF@titlesmallcaps
+         \else
+        \ifsuftesi@italicsec
+      \itshape
+    \else
+  \fi
+\fi}
+\def\SUF@SUBSEC@StyleSwitch{%
+  \ifsuftesi@smallcapssubsec
+    \expandafter
+      \SUF@titlesmallcaps
+        \else
+         \ifsuftesi@italicsubsec
+      \itshape
+    \else
+  \fi
+\fi
+}
+\def\SUF@SUBSUBSEC@StyleSwitch{%
+  \ifsuftesi@smallcapssubsubsec
+    \expandafter
+      \SUF@titlesmallcaps
+        \else
+         \ifsuftesi@italicsubsubsec
+      \itshape
+    \else
+  \fi
+\fi}
 \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}
+\def\chapter#1{\ClassError{suftesi}
+  {\noexpand\chapter level is not defined using 'article' option}
+  {\noexpand\chapter level is not defined using 'article' option}}
+  \setcounter{tocdepth}{3}
+    \setcounter{secnumdepth}{3}
+    \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}
+\titleclass{\part}{straight}
+\titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\else
+\fi
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
 \else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+  {3em}
+  {\SUF@PART@StyleSwitch}
+\fi
+\ifsuftesi@numparchap
+  \titleformat{\chapter}[display]
+    {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+    {\SUF@thechapter\SUF@dotchap}
+    {2ex}
+    {\SUF@CHAP@StyleSwitch}
+  \else
+  \titleformat{\chapter}[hang]
+    {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+    {\SUF@thechapter\SUF@dotchap}
+    {3em}
+    {\SUF@CHAP@StyleSwitch}
+  \fi
+\ifsuftesi@numparchap
+  \def\SUF@ADJnumparchap{-2.5\baselineskip}
+    \else
+  \def\SUF@ADJnumparchap{0pt}
+\fi
+\ifsuftesi@periodical
+  \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+  \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+    \else
+      \ifsuftesi@compact
+        \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+        \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+         \else
+           \ifsuftesi@supercompact
+            \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+            \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+           \else
+        \titlespacing*{\chapter}{0em}{%
+     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+        \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
+    \fi
+  \fi
 \fi
+\ifsuftesi@numparsec
+\titleformat{\section}[display]
+  {\SUF@lr@SECswitch}
+  {\thesection}
+  {0ex}
+  {\SUF@SEC@StyleSwitch}
+\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
 \titleformat{\section}[hang]
-  {\filright}
+  {\SUF@lr@SECswitch}
   {\thesection}
-  {.5em}
-  {\unskip\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\itshape\fi}
+  {1em}
+  {\SUF@SEC@StyleSwitch}
 \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+\fi
+\ifsuftesi@numparsubsec
+\titleformat{\subsection}[display]
+  {\SUF@lr@SUBSECswitch}
+  {\textnormal\thesubsection}
+  {0ex}
+  {\SUF@SUBSEC@StyleSwitch}
+\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
 \titleformat{\subsection}[hang]
-  {}
+  {\SUF@lr@SUBSECswitch}
   {\textnormal\thesubsection}
-  {.5em}
-  {\itshape}
+  {1em}
+  {\SUF@SUBSEC@StyleSwitch}
 \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+\fi
+\ifsuftesi@numparsubsubsec
+\titleformat{\subsubsection}[display]
+  {\SUF@lr@SUBSUBSECswitch}
+  {\textnormal\thesubsubsection}
+  {0ex}
+  {\SUF@SUBSUBSEC@StyleSwitch}
+\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
 \titleformat{\subsubsection}[hang]
-  {}
+  {\SUF@lr@SUBSUBSECswitch}
   {\textnormal\thesubsubsection}
-  {.5em}
-  {\itshape}
-\titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex]
+  {1em}
+  {\SUF@SUBSUBSEC@StyleSwitch}
+\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+  \fi
 \fi
 \titleformat{\paragraph}[runin]
   {}
@@ -370,7 +839,7 @@
   {}
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article %ARTICLE
+\ifsuftesi@article
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
@@ -402,7 +871,7 @@
     \subsection{#1}}}%
     {\relax}%
 }%
-\else %BOOK
+\else
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
@@ -437,118 +906,7 @@
     {\relax}%
 }%
 \fi
-\RequirePackage{titletoc}
-\ifsuftesi@dottedtoc
-   \newcommand{\suftesi@titlerule}{\titlerule*{\footnotesize .\ }}
-    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
-      \else
-\ifsuftesi@raggedtoc
-    \newcommand{\suftesi@titlerule}{\hspace{1.5em}}
-    \newcommand{\suftesi@chaptitlerule}{\hspace{1.5em}}
-    \else
-    \newcommand{\suftesi@titlerule}{\titlerule*{}}
-    \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
-    \fi
-\fi
-\ifsuftesi@article
-\renewcommand\tableofcontents{%
-\thispagestyle{empty}
-    \section*{\contentsname
-        \@mkboth{\contentsname}{\contentsname}}%
-    \@starttoc{toc}%
-    \vspace{2ex}%
-    }
-\renewcommand\listoffigures{%
-    \section*{\listfigurename}%
-      \@mkboth{\listfigurename}%
-              {\listfigurename}%
-    \@starttoc{lof}%
-    \vspace{2ex}%
-    }
-\renewcommand\listoftables{%
-    \section*{\listtablename}%
-      \@mkboth{%
-          \listtablename}%
-         {\listtablename}%
-    \@starttoc{lot}%
-    \vspace{2ex}%
-    }
-\else
-\renewcommand\tableofcontents{%
-    \if@twocolumn
-      \@restonecoltrue\onecolumn
-    \else
-      \@restonecolfalse
-    \fi
-    \chapter*{\contentsname
-        \@mkboth{\contentsname}{\contentsname}}%
-    \@starttoc{toc}%
-    \if@restonecol\twocolumn\fi
-    }
- \fi
-\titlecontents{part}
-  [0em]
-  {\addvspace{3ex}\partname~}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {}
-  [\addvspace{1ex}]
-\titlecontents{chapter}
-  [0em]
-  {\addvspace{2ex}}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@chaptitlerule\contentspage}
-  [\addvspace{1ex}]
-\titlecontents{section}
-  [1.5em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\ifsuftesi@article\suftesi@chaptitlerule%
-       \else\suftesi@titlerule\fi\contentspage}
-\titlecontents{subsection}
-  [3em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{subsubsection}
-  [4.5em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{paragraph}
-  [6em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{subparagraph}
-  [7.5em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{figure}
-  [0em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\titlecontents{table}
-  [0em]
-  {}
-  {\thecontentslabel\hspace*{1em}}
-  {}
-  {\suftesi@titlerule\contentspage}
-\ifsuftesi@article
-\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{3}
-\else
-\fi
-    \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
     \edef\title{\noexpand\@dblarg
   \expandafter\noexpand\csname\string\title\endcsname}
     \def\@headtitle{--missing title--%
@@ -573,8 +931,20 @@
   \null\vfil
   \vskip 60\p@
   \begin{center}%
-    {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-    \suftesi@titlesmallcaps{\@title}\else\@title\fi \par}%
+    {\SUF@chaptersize\color{sufred}\sffamily%
+    \ifsuftesi@smallcapschap%
+     \SUF@titlesmallcaps{\@title}
+      \else
+      \ifsuftesi@article
+       \ifsuftesi@smallcapssec
+        \SUF@titlesmallcaps{\@title}
+         \else
+          \@title
+        \fi
+       \else
+      \@title
+     \fi
+    \fi\par}%
     \vskip 3em%
     {\small\lineskip .75em%
       \begin{tabular}[t]{c}%
@@ -629,8 +999,20 @@
    \vskip 2em%
    \begin{center}%
    \let \footnote \thanks
-     {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
-     \suftesi@titlesmallcaps{\@title}\else\@title\fi\par}%
+     {\SUF@chaptersize\color{sufred}\sffamily%
+    \ifsuftesi@smallcapschap%
+     \SUF@titlesmallcaps{\@title}
+      \else
+      \ifsuftesi@article
+       \ifsuftesi@smallcapssec
+        \SUF@titlesmallcaps{\@title}
+         \else
+          \@title
+        \fi
+       \else
+      \@title
+     \fi
+  \fi\par}%
      \vskip 1.5em%
      {\small\lineskip .5em%
        \begin{tabular}[t]{c}%
@@ -645,8 +1027,7 @@
 \AtBeginDocument{%
 \@ifpackageloaded{frontespizio}{%
       \ifsuftesi@periodical
-          \Margini{1cm}{7cm}{5cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {5.5cm}{7cm}{4.5cm}{1cm}
         \else
       \ifsuftesi@compact
           \Margini{1cm}{7cm}{6cm}{1cm}%
@@ -662,22 +1043,25 @@
   }%
 {\relax}}
 \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}}
-\renewcommand\@idxitem{\par\hangindent 15\p@}
-\newcommand{\appendicesname}[1]{\def\suff@appendices{#1}}
+               {\if@twocolumn
+                  \@restonecolfalse
+                \else
+                  \@restonecoltrue
+                \fi
+                \twocolumn[\@makeschapterhead{\indexname}]%
+                \@mkboth{\indexname}{\indexname}%
+                \thispagestyle{plain}%
+                \raggedright\small%
+                \parindent\z@
+                \parskip\z@ \@plus .3\p@\relax
+                \columnseprule \z@
+                \columnsep 35\p@
+                \let\item\@idxitem}
+               {\if@restonecol\onecolumn\else\clearpage\fi}
+\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
     \appendicesname{Appendici}
-    \newcommand{\appendixpage}{\@appendixpage}
-\def\@appendixpage{%
+    \newcommand{\appendixpage}{\SUF@appendixpage}
+\def\SUF@appendixpage{%
   \@mainmattertrue
     \titlecontents{part}
       [0em]
@@ -689,18 +1073,18 @@
 \let\contentspage\relax
     \cleardoublepage
        \thispagestyle{empty}
-         \addcontentsline{toc}{part}{\suff@appendices}
+         \addcontentsline{toc}{part}{\SUF@appendices}
      \begingroup
        \centering
           \null\vfil
-        {\LARGE\suff@appendices\par}
+        {\LARGE\SUF@appendices\par}
           \vfil
    \endgroup
     \cleardoublepage
 \titlecontents{part}
    [0em]
   {\addvspace{3ex}\partname~}
-  {\thecontentslabel\hspace*{1em}}
+  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
@@ -713,16 +1097,11 @@
     \gdef\thechapter{\@Alph\c@chapter}
     \titleformat{\chapter}[block]
       {\vskip-22pt}%
-      {\small\suftesi@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+      {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
       {0pt}
-      {\small\suftesi@titlesmallcaps}
+      {\small\SUF@titlesmallcaps}
       [\rule{\textwidth}{.4pt}]
-  \titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
-  \titlecontents{chapter}[1em]
-    {\filright\hskip.5em}
-    {\suftesi@titlesmallcaps{\appendixname~\thecontentslabel:}\hskip1em}
-    {}
-    {\contentspage\vspace{5pt}}}
+      \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]}
     \else
       \ifsuftesi@article
           \renewcommand\appendix{\par
@@ -741,111 +1120,104 @@
   \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footnoterule}{}
+\def\SUF@versionstring{\texttt{Version of \today}}
 \ifsuftesi@elements%
-   \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
-   \renewcommand{\sectionmark}[1]{\markright{#1}}
+  \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
+  \renewcommand{\sectionmark}[1]{\markright{#1}}
  \fancypagestyle{elements}{%
+  \setlength{\unitlength}{1pt}
    \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}}%
+      \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}}%
+       \put(0,-104){%
+       \hskip-\dimexpr(\marginparwidth+\marginparsep)
+       \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
+    \end{picture}}%
   }%
 \else
- \renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
- \renewcommand{\sectionmark}[1]{}
+\renewcommand{\chaptermark}[1]{%
+    \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+\ifsuftesi@article
+  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+    \else
+  \renewcommand{\sectionmark}[1]{}
+\fi
 \fi
-\fancypagestyle{plain}{%
- \fancyhf{}
- \fancyfoot[C]{}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}}
+\fancypagestyle{plain}{\pagestyle{sufplain}}
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
- \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
- \fancyfoot[C]{\footnotesize\sufthepage}}
-\fancypagestyle{centerheadings}{%
-  \fancyhf{}%
-  \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
-  \fancyhead[CO]{\footnotesize\xheadbreakfalse\suf@rightmark}
-  \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+ \fancyfoot[RE,LO]{%
+   \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}}
+\def\SUF@LR@MarkSwitch{%
    \ifsuftesi@article
      \ifsuftesi@authortitle
-       \suf@leftmark
+       \SUF@leftmark
          \else
-           \suf@rightmark
+           \SUF@rightmark
          \fi
-     \else
-       \suf@leftmark
-     \fi}
-  \fancyfoot[C]{\footnotesize\sufthepage}%
+       \else
+     \SUF@leftmark
+   \fi}
+\fancypagestyle{centerheader}{%
+  \fancyhf{}%
+  \fancyfoot[RE,LO]{%
+    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+  \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
+  \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+    \SUF@LR@MarkSwitch}
+  \fancyfoot[C]{\footnotesize\SUF@thepage}%
   }%
 \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}
+  \fancyfoot[RE,LO]{%
+    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+  \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
+  \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
   \fancyhead[RE]{\footnotesize\xheadbreakfalse%
-   \ifsuftesi@article
-     \ifsuftesi@authortitle
-       \suf@leftmark
-         \else
-           \suf@rightmark
-          \fi
-     \else
-       \suf@leftmark
-     \fi}
+    \SUF@LR@MarkSwitch}
   }%
-\ifsuftesi@article
-    \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
-      \else
-    \fi
-\ifsuftesi@sctitles
-  \ifsuftesi@authortitle
-    \def\suf@rightmark{\suftesi@headingsmallcaps{\@headtitle}}
+\ifsuftesi@italicRhead
+  \def\SUF@Rheadstyle{\itshape}
+    \else
+      \ifsuftesi@smallcapsRhead
+        \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
       \else
-    \def\suf@rightmark{\suftesi@headingsmallcaps{\rightmark}}
+    \def\SUF@Rheadstyle{}
   \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}}
+\ifsuftesi@italicLhead
+  \def\SUF@Lheadstyle{\itshape}
     \else
-      \def\suf@leftmark{\nouppercase{\suf@leftrightmark}}
+      \ifsuftesi@smallcapsLhead
+        \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
+      \else
+    \def\SUF@Lheadstyle{}
   \fi
 \fi
-\ifsuftesi@sctitles
-  \def\sufthepage{\suftesi@headingsmallcaps{\thepage}}
+    \ifsuftesi@authortitle
+      \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+        \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+          \else
+        \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+      \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+    \fi
+\ifsuftesi@smallcapsheader
+  \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
     \else
-      \def\sufthepage{\thepage}
+  \def\SUF@thepage{\thepage}
 \fi
-\def\suf@leftrightmark{%
+\def\SUF@leftrightmark{%
  \if@mainmatter\leftmark\else\rightmark\fi}
 \pagestyle{sufdefault}
-  \ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
+  \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
   \ifsuftesi@elements\pagestyle{elements}\else\fi
 \RequirePackage{caption}
@@ -869,72 +1241,99 @@
     \renewcommand{\epigraphsize}{\footnotesize}
   \fi
 \fi
-\RequirePackage{enumitem}
-    \setlist{labelsep=0.6em,noitemsep,font=\normalfont}
+\RequirePackage[inline]{enumitem}
+    \setlist{labelsep=0.5\parindent,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}
- \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}
+\ifsuftesi@alignlist
+    \setenumerate[1]{leftmargin=1\parindent,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 1.5\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 1.5\parindent,label=\roman*.}
+    \setitemize[1]{leftmargin=1\parindent}
+    \setitemize[2]{leftmargin=1.5\parindent}
+    \setitemize[3]{leftmargin=1.5\parindent}
+\else
+\ifsuftesi@indentlist
+    \setenumerate[1]{leftmargin=2\parindent,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 2.5\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 2.5\parindent,label=\roman*.}
+    \setitemize[1]{leftmargin=2\parindent}
+    \setitemize[2]{leftmargin=2.5\parindent}
+    \setitemize[3]{leftmargin=2.5\parindent}
  \else
-    \setenumerate[1]{leftmargin=0pt,label=\arabic*}
-    \setenumerate[2]{leftmargin= 1.3em,label=\arabic*}
-    \setenumerate[3]{leftmargin= 1.3em,label=\arabic*}
+    \setenumerate[1]{leftmargin=0pt,label=\arabic*.}
+    \setenumerate[2]{leftmargin= 1.3\parindent,label=\alph*.}
+    \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.}
     \setitemize[1]{leftmargin=0pt}
-    \setitemize[2]{leftmargin=1.3em}
-    \setitemize[3]{leftmargin=1.3em}
-   \fi
+    \setitemize[2]{leftmargin=1.3\parindent}
+    \setitemize[3]{leftmargin=1.3\parindent}
+  \fi
 \fi
 \renewcommand\labelitemii{\normalfont \textendash}
 \renewenvironment{quotation}
-               {\list{}{\listparindent\parindent%
-                        \itemindent    \listparindent
+            {\list{}{\listparindent\parindent%
+                     \itemindent    \listparindent
+                     \leftmargin     \parindent
+                     \ifsuftesi@ralignquotation
+                      \else
                         \rightmargin   \parindent
-                        \leftmargin     \parindent
+                       \fi
                         \parsep        \z@ \@plus\p@}%
-               \item\relax\footnotesize\noindent\ignorespaces}
+               \item\relax%
+                 \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi\noindent\ignorespaces}
                {\endlist}
 \renewenvironment{quote}
-               {\list{}{\rightmargin \parindent
-                         \leftmargin    \parindent}%
-                \item\relax\footnotesize}
+            {\list{}{\leftmargin \parindent
+                     \ifsuftesi@ralignquotation\
+                      \else
+                        \rightmargin   \parindent
+                       \fi}%
+               \item\relax%
+                 \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi}%\ignorespaces?
                {\endlist}
 \renewenvironment{verse}
                {\let\\\@centercr
-                \list{}{\footnotesize%
-                    \itemsep      \z@
+                \list{}{\itemsep      \z@
                         \itemindent   -1.5em%
                         \listparindent\itemindent
                         \rightmargin  \leftmargin
                         \advance\leftmargin 1.5em}%
-                \item\relax}
+                \item\relax
+                  \ifsuftesi@smallquotation
+                   \small
+                     \else
+                   \footnotesize
+                 \fi}
                {\endlist}
-\renewcommand\@makefntext{%
-  \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
-\def\sufmpsetup@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio
-    \itshape\footnotesize%
+\ifsuftesi@standardfootnote
+  \relax
+    \else
+      \ifsuftesi@dottedfootnote
+        \renewcommand\@makefntext{\@thefnmark.\hskip.5em}
+         \else
+       \renewcommand\@makefntext{%
+     \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+  \fi
+\fi
+\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio
+    \ifsuftesi@elements\relax
+      \else\itshape\fi
+    \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
-\long\def\@xmpar[#1]#2{%
-    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}%
-    \@savemarbox\@currbox{\sufmpsetup@setup\raggedright\hspace{0pt}#2}%
-    \@xympar}
-\long\def\@ympar#1{%
-    \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}%
-    \global\setbox\@currbox\copy\@marbox \@xympar}
+\let\oldmarginpar\marginpar
+\renewcommand{\marginpar}[1]{\oldmarginpar%
+ [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
+ {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
 \ifsuftesi@nomarginpar
     \renewcommand\marginpar[2][]{}
      \else
@@ -963,7 +1362,7 @@
       {\if@twocolumn\else\endquotation\fi}
 \fi
 \newcommand\abstractname{Abstract}
-\edef\sufengine{%
+\edef\SUF@engine{%
   \ifxetex
   \noexpand\XeLaTeX
   \else
@@ -980,13 +1379,13 @@
      \def\next{#2}
          \ifx\next\@empty\else
             \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          All rights reserved
+          Tutti i diritti riservato
         \fi
   \vfill
-  {\small\noindent This work has been typeset with \sufengine{}%
+  {\small\noindent Questo lavoro è stato composto con \SUF@engine{}%
      \def\next{#1}
-        \ifx\next\@empty\else on #1
-      \fi using the \textsf{suftesi} class by
+        \ifx\next\@empty\else su #1
+      \fi usando la classe \textsf{suftesi} di
       Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
       \cleardoublepage}
 \newcommand{\bookcolophon}[2]{%
@@ -1012,12 +1411,350 @@
   \end{center}
     \vspace*{\stretch{6}}
   }
+\RequirePackage{titletoc}
+\ifsuftesi@elements
+  \def\SUF@tochapsize{}
+    \else
+  \def\SUF@tochapsize{\large}
+\fi
+\ifsuftesi@dottedtoc
+   \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+    \def\SUF@chaptitlerule{\titlerule*{}}
+      \else
+        \ifsuftesi@raggedtoc
+           \def\SUF@titlerule{\hspace{1.5em}}
+          \def\SUF@chaptitlerule{\hspace{1.5em}}
+        \else
+      \def\SUF@titlerule{\titlerule*{}}
+    \def\SUF@chaptitlerule{\titlerule*{}}
+  \fi
+\fi
+\newlength\SUF@label@chapter
+\setlength\SUF@label@chapter{.5em}
+\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}}
+\newlength{\SUF@tochang}
+\setlength{\SUF@tochang}{3em}
+\AtBeginDocument{
+\newlength\SUF@label@part
+\newlength\SUF@label@section
+\newlength\SUF@label@subsection
+\newlength\SUF@label@subsubsection
+\newlength\SUF@label@paragraph
+\newlength\SUF@label@subparagraph
+\newlength\SUF@label@figure
+\newlength\SUF@label@table
+\setlength\SUF@label@part
+    {\SUF@label@chapter}
+\setlength\SUF@label@section
+    {\dimexpr(\SUF@label@chapter+.5em)}
+\setlength\SUF@label@subsection
+    {\dimexpr(\SUF@label@section+.5em)}
+\setlength\SUF@label@subsubsection
+    {\dimexpr(\SUF@label@subsection+.5em)}
+\setlength\SUF@label@paragraph
+    {\dimexpr(\SUF@label@subsubsection+.5em)}
+\setlength\SUF@label@subparagraph
+    {\dimexpr(\SUF@label@paragraph+.5em)}
+\setlength\SUF@label@figure
+    {\SUF@label@chapter}
+\setlength\SUF@label@table
+    {\SUF@label@chapter}
+}
+\titlecontents{part}
+  [0em]
+  {\addvspace{3ex}\SUF@tocchapsize\partname~}
+  {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+  [\addvspace{1ex}]
+\ifsuftesi@tocpageleft
+\contentsmargin{0pt}
+\AtBeginDocument{
+\newlength\SUF@tochang@chap
+\newlength\SUF@tochang@sec
+\newlength\SUF@tochang@subsec
+\newlength\SUF@tochang@subsubsec
+\newlength\SUF@tochang@par
+\newlength\SUF@tochang@subpar
+\newlength\SUF@tochang@fig
+\newlength\SUF@tochang@tab
+\newlength\SUF@addto@tochang@chap
+\newlength\SUF@addto@tochang@sec
+\newlength\SUF@addto@tochang@subsec
+\newlength\SUF@addto@tochang@subsubsec
+\newlength\SUF@addto@tochang@par
+\newlength\SUF@addto@tochang@subpar
+\newlength\SUF@addto@tochang@fig
+\newlength\SUF@addto@tochang@tab
+\setlength\SUF@tochang@chap
+    {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+\setlength\SUF@tochang@sec
+    {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+\setlength\SUF@tochang@subsec
+    {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tochang@subsubsec
+    {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tochang@par
+    {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tochang@subpar
+    {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tochang@fig
+    {\SUF@tochang@chap}
+\setlength\SUF@tochang@tab
+    {\SUF@tochang@chap}
+\setlength\SUF@addto@tochang@chap
+    {\SUF@tochang}
+\setlength\SUF@addto@tochang@sec
+    {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+\setlength\SUF@addto@tochang@subsec
+    {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+\setlength\SUF@addto@tochang@subsubsec
+    {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+\setlength\SUF@addto@tochang@par
+    {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+\setlength\SUF@addto@tochang@subpar
+    {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+\setlength\SUF@addto@tochang@fig
+    {\SUF@addto@tochang@chap}
+\setlength\SUF@addto@tochang@tab
+    {\SUF@addto@tochang@chap}
+}
+\titlecontents{chapter}
+  [\SUF@tochang@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tochang@chap%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap%
+     \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@chap%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap}
+  {}
+  [\addvspace{1ex}]
+\titlecontents{section}
+  [\SUF@tochang@sec]
+  {}
+  {\hskip-\SUF@tochang@sec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@sec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subsection}
+  [\SUF@tochang@subsec]
+  {}
+  {\hskip-\SUF@tochang@subsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subsubsection}
+  [\SUF@tochang@subsubsec]
+  {}
+  {\hskip-\SUF@tochang@subsubsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subsubsec%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{paragraph}
+  [\SUF@tochang@par]
+  {}
+  {\hskip-\SUF@tochang@par%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@par%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{subparagraph}
+  [\SUF@tochang@subpar]
+  {}
+  {\hskip-\SUF@tochang@subpar%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\SUF@tochang@subpar%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+\titlecontents{figure}
+  [\SUF@tochang@fig]
+  {}
+  {\hskip-\SUF@tochang@fig%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
+     \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+\titlecontents{table}
+  [\SUF@tochang@tab]
+  {}
+  {\hskip-\SUF@tochang@tab%
+   \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
+     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+  {}
+  {}
+\else
+\AtBeginDocument{
+\newlength\SUF@tocindent@chap
+\newlength\SUF@tocindent@sec
+\newlength\SUF@tocindent@subsec
+\newlength\SUF@tocindent@subsubsec
+\newlength\SUF@tocindent@par
+\newlength\SUF@tocindent@subpar
+\newlength\SUF@tocindent@fig
+\newlength\SUF@tocindent@tab
+\setlength\SUF@tocindent@chap
+    {\dimexpr(\SUF@label@chapter+1em)}
+\setlength\SUF@tocindent@sec
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+\setlength\SUF@tocindent@subsec
+    {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tocindent@subsubsec
+    {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tocindent@par
+    {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tocindent@subpar
+    {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tocindent@fig
+    {\SUF@tocindent@chap}
+\setlength\SUF@tocindent@tab
+    {\SUF@tocindent@chap}
+}
+\titlecontents{chapter}
+  [\SUF@tocindent@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tocindent@chap%
+    \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}\SUF@tochapsize}
+  {\hskip-\SUF@tocindent@chap\SUF@tochapsize}
+  {\SUF@chaptitlerule\contentspage}
+  [\addvspace{1ex}]
+\titlecontents{section}
+  [\SUF@tocindent@sec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@section+1em)%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@section+1em)%
+    \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+  {\ifsuftesi@article\SUF@chaptitlerule%
+       \else\SUF@titlerule\fi\contentspage}
+\titlecontents{subsection}
+  [\SUF@tocindent@subsec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+    \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{subsubsection}
+  [\SUF@tocindent@subsubsec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+    \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{paragraph}
+  [\SUF@tocindent@par]
+  {}
+  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+    \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{subparagraph}
+  [\SUF@tocindent@subpar]
+  {}
+  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+    \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+  {\SUF@titlerule\contentspage}
+\titlecontents{figure}
+  [\SUF@tocindent@fig]
+  {}
+  {\hskip-\dimexpr(\SUF@label@figure+1em)%
+    \makebox[\SUF@label@figure][l]{\thecontentslabel}}
+  {}
+  {\SUF@titlerule\contentspage}
+\titlecontents{table}
+  [\SUF@tocindent@tab]
+  {}
+  {\hskip-\dimexpr(\SUF@label@table+1em)%
+    \makebox[\SUF@label@table][l]{\thecontentslabel}}
+  {}
+  {\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@article
+\renewcommand\tableofcontents{%
+\thispagestyle{empty}
+    \section*{\contentsname
+        \@mkboth{\contentsname}{\contentsname}}%
+    \@starttoc{toc}%
+    \vspace{2ex}%
+   }
+\renewcommand\listoffigures{%
+    \section*{\listfigurename}%
+      \@mkboth{\listfigurename}%
+              {\listfigurename}%
+    \@starttoc{lof}%
+    \vspace{2ex}%
+    }
+\renewcommand\listoftables{%
+    \section*{\listtablename}%
+      \@mkboth{%
+          \listtablename}%
+         {\listtablename}%
+    \@starttoc{lot}%
+    \vspace{2ex}%
+    }
+\else
+\renewcommand\tableofcontents{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\contentsname
+        \@mkboth{%
+            \contentsname}
+           {\contentsname}}%
+    \@starttoc{toc}%
+    \if@restonecol\twocolumn\fi
+   }
+\renewcommand\listoffigures{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\listfigurename}%
+      \@mkboth{\listfigurename}%
+              {\listfigurename}%
+    \@starttoc{lof}%
+    \if@restonecol\twocolumn\fi
+    }
+\renewcommand\listoftables{%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\listtablename}%
+      \@mkboth{%
+          \listtablename}%
+         {\listtablename}%
+    \@starttoc{lot}%
+    \if@restonecol\twocolumn\fi
+    }
+\fi
 \def\chapterintro{
   \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
 \def\@chapterintro{\phantomsection
-  \if@tempswa\section*{\suffchapterintroname}\fi
-  \addcontentsline{toc}{section}{\suffchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\suffchapterintroname{#1}}
+  \if@tempswa\section*{\SUF@fchapterintroname}\fi
+  \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
 \chapterintroname{Introduzione}
 \newif\ifheadbreak\headbreakfalse
   \DeclareRobustCommand{\headbreak}
@@ -1059,6 +1796,7 @@
       \let\makelabel\itlabel}}
   {\endlist}
 \let\hemph\emph
+\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
 \frenchspacing
 \endinput
 %%
author	Karl Berry <karl@freefriends.org>	2012-09-02 22:45:43 +0000
committer	Karl Berry <karl@freefriends.org>	2012-09-02 22:45:43 +0000
commit	5842ef917f7cbd5553126d78cfab16ebb0ca4e8f (patch)
tree	9f1c9b817708fe6f63ef5de02adeeb7e976f61bb /Master
parent	2878c13fb8496ecd8f401ed4102176941c485292 (diff)