suftesi (24sep12)

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

19 files changed, 2555 insertions, 6453 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.pdf b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.pdf
new file mode 100644
index 00000000000..fd3adb13fb1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex
index 4122cafe34a..480cb16df13 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi-frn.tex
@@ -9,6 +9,7 @@
 \usepackage[nowrite,infront,suftesi]{frontespizio}
 \nofiles 
 \fontoptionnormal 
+\Margini {5.5cm}{7cm}{4.5cm}{0cm}
 \Universita {Paperopoli}
 \Logo [1.5cm]{logo}
 \Facolta {Pennutologia}
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux b/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux
deleted file mode 100644
index 9b11e536db6..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.aux
+++ /dev/null
@@ -1,117 +0,0 @@
-\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
deleted file mode 100644
index 5203fe0e536..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.bcf
+++ /dev/null
@@ -1,2039 +0,0 @@
-<?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
deleted file mode 100644
index a13c446025a..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.idx
+++ /dev/null
@@ -1 +0,0 @@
-\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
deleted file mode 100644
index ee7e3d4d5fa..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.lof
+++ /dev/null
@@ -1,22 +0,0 @@
-\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
deleted file mode 100644
index 09521fd0774..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.log
+++ /dev/null
@@ -1,1802 +0,0 @@
-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
deleted file mode 100644
index ace6c45c7e7..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.lot
+++ /dev/null
@@ -1,22 +0,0 @@
-\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
deleted file mode 100644
index be5d28062e7..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.out
+++ /dev/null
@@ -1,28 +0,0 @@
-\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
index 76a16d13dfd..df32d14f119 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.pdf
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml b/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml
deleted file mode 100644
index 91fea9a4e28..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.run.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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
deleted file mode 100644
index 0daa290b436..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.synctex.gz
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
index a36d3f37cb7..f0da43fe924 100644
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
+++ b/Master/texmf-dist/doc/latex/suftesi/example/tesi.tex
@@ -7,13 +7,8 @@
 % !TEX root = tesi.tex
 
 \documentclass[
-%rmstyle1,%2,...,6
-%itstyle1,%2,...12
-%scstyle1,%2,...12
-%dottedtoc,
-%raggedtoc,
-%tocpageleft,
-%<altre opzioni>...
+pagelayout=periodical,
+%crop=false
 ]{suftesi}
 
 \usepackage[T1]{fontenc}                
@@ -47,7 +42,7 @@
 % Servono con l'opzione ``authortitle'':
 \author{Nome Cognome}
 \title[Titolo per le testatine]{Titolo per la pagina del titolo}
-
+%\let\chapter\section
 \begin{document}
 % decommenta le seguent line se si usa ''babel'' con l'opzione ''french'':
 %\selectlanguage{italian}
@@ -71,6 +66,8 @@ difficilissimi e complicatissimi}
 \Correlatore{Ubaldo Kutuzu} 
 \end{frontespizio}
 
+%\crop[off]
+
 % COLOPHON
 \colophon[<sistema operativo>]{Nome Cognome}{<specifiche sui font utilizzati e/o sulla data di discussione della tesi, ecc.>}
 
@@ -90,7 +87,7 @@ difficilissimi e complicatissimi}
 \input{MaterialeInizialeFinale/Introduzione}
 % Materiale centrale
 \mainmatter
-\part{uno}
+\part{Uno}
  \input{Capitoli/primo}
  \input{Capitoli/secondo}
  \input{Capitoli/terzo}
@@ -107,7 +104,7 @@ difficilissimi e complicatissimi}
 \lipsum
 % 		BIBLIOGRAFIA
 %***************************
-\cleardoublepage
+
 \phantomsection % solo con hyperref
 \addcontentsline{toc}{chapter}{\bibname}
 \printbibheading
diff --git a/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc b/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc
deleted file mode 100644
index cf168767220..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/example/tesi.toc
+++ /dev/null
@@ -1,68 +0,0 @@
-\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 78a60ce7b98..c065e4d06e4 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
deleted file mode 100644
index 6f29b453855..00000000000
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-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 c8afabc9651..fd2a6e67958 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,7 +23,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2012/08/31 v0.9a A class for typesetting theses, books and articles]
+    [2012/09/23 v0.9b A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \PassOptionsToClass{a4paper}{article}
@@ -35,6 +35,9 @@
 \let\cmd\relax
 %\usepackage[paperwidth=17cm,paperheight=24cm,right=1cm,left=3cm]{geometry}
 \usepackage{ltxdockit}
+\renewcommand*{\optionlistfont}{\spotcolor\sffamily\displayverbfont}
+\renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont}
+
 \usepackage{array,booktabs,multirow}
 \usepackage{microtype}
 \usepackage{siunitx}
@@ -43,6 +46,19 @@
 \usepackage[style=philosophy-classic]{biblatex}
   \addbibresource{suftesi.bib}
 \usepackage[suftesi]{frontespizio}
+\usepackage{xcolor}
+
+\usepackage{fourier}
+\renewcommand{\sfdefault}{lmss}
+\usepackage{sectsty}
+	\sectionfont{\spotcolor\sffamily}
+	\subsectionfont{\spotcolor}
+	\subsubsectionfont{\spotcolor} 
+	\paragraphfont{\spotcolor}
+	\subparagraphfont{\spotcolor} 
+
+
+
 \usepackage{hyperref}
 \hypersetup{%
     pdftitle={User's Guide to \textsf{suftesi}},
@@ -72,8 +88,15 @@
     #1}
   {\par\addvspace{\quoteskip}\noindent\ignorespacesafterend}
 \newenvironment{ttquote}
-  {\genquote[\ttfamily\microtypesetup{activate=false}]}
-  {\endgenquote}
+  {\begin{mdframed}[backgroundcolor=blue!10]
+  \ttfamily\small\microtypesetup{activate=false}
+  %\genquote[\ttfamily\microtypesetup{activate=false}]
+  }
+  {
+  %\endgenquote
+  \end{mdframed}}
+  
+\usepackage{mdframed}
   
 \EnableCrossrefs         
 \CodelineIndex
@@ -86,7 +109,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2826}
+% \CheckSum{2973}
 %
 % \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
@@ -104,61 +127,29 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v0.9b}{2012/09/23}{Restored \opt{11pt} and \opt{12pt} option 
+% to default}
 % \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}
+% \sty{enumitem} package. Deleted \opt{centertitle} option. 
+% Deleted \opt{sctitles} option. 
+% Changed code for toc, lot and lof elements. }
+% \changes{v0.9}{2012/04/22}{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.}
 % \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template}
 % \changes{v0.6c}{2011/11/16}{Maintenance release, no changes}
 % \changes{v0.6b}{2011/11/07}{Improved full compatibility with \XeLaTeX. 
 % \sty{varioref} and \sty{footmisc} packages are no longer loaded}
 % \changes{v0.6a}{2011/10/24}{Maintenance release, no changes}
-% \changes{v0.6}{2011/10/21}{Added commands \cmd{bookcolophon}, \cmd{artcolophon}. Added option \opt{authortitle}. Renamed options \opt{plain} and \opt{fullplain} to \opt{centerheadings} and \opt{sufplain}. New english documentation.}
-% \changes{v0.5}{2011/10/21}{First public release. The frontispiece of \sty{suftesi}{} is now
-% included in the package \sty{frontespizio}. New command \cmd{chapnumfont}. 
-% Added options \opt{article}, \opt{fullplain}, \opt{elements}, \opt{sufelements}, 
-% \opt{supercompact}, \opt{compact}, \opt{nocrop}, \opt{nomarginpar}. 
-% Changed option \opt{Roma}.}
+% \changes{v0.6}{2011/10/21}{English documentation. Renamed options \opt{plain} and \opt{fullplain} to \opt{centerheadings} and \opt{sufplain}.}
+% \changes{v0.5}{2011/10/21}{First public release. 
+% The frontispiece of \sty{suftesi}{} is now
+% included in the package \sty{frontespizio}. 
+% New option \opt{fullplain} 
+% Changed option \opt{sctitles}.}
 % \GetFileInfo{suftesi.dtx}
 %
-% \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ }
+% \DoNotIndex{\hskip,\newcommand,\newenvironment,\def,\begin,\vskip,\ }
 % \DoNotIndex{\DeclareOption,\ExecuteOptions,\RequirePackage}
 % \DoNotIndex{\@@end,\@empty,\@ifclassloaded,\@nameuse,\@nil}
 % \DoNotIndex{\@undefined,\\,\`,\addtocounter,\advance,\bfseries}
@@ -166,7 +157,7 @@
 % \DoNotIndex{\edef,\else,\end,\endinput,\endtitlepage,\expandafter}
 % \DoNotIndex{\extracolsep,\fi,\fill,\fontsize,\g@addto@macro,\toks}
 % \DoNotIndex{\hrule,\hspace,\if,\if@twoside,\ifcase,\ifdefined}
-% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate,\setcounter}
+% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate}
 % \DoNotIndex{\jobname,\let,\long,\MakeUppercase,\MessageBreak}
 % \DoNotIndex{\newcount,\newif,\newpage,\newtoks,\newwrite,\next}
 % \DoNotIndex{\noexpand,\nofiles,\normalfont,\normalsize,\null}
@@ -175,16 +166,18 @@
 % \DoNotIndex{\parbox,\parindent,\relax,\scshape,\selectfont,\setkeys}
 % \DoNotIndex{\sffamily,\space,\stretch,\string,\textheight,\textwidth}
 % \DoNotIndex{\the,\thispagestyle,\unexpanded,\unless,\unskip,\upshape}
-% \DoNotIndex{\usepackage,\vbox,\vfill,\vspace,\write,\z@}
+% \DoNotIndex{\usepackage,\vbox,\vfill,\vfil,\vspace,\write,\z@}
+% \DoNotIndex{\addvspace,\setcounter,\addcontentsline}
+% \DoNotIndex{\filleft,\filcenter,\filright,\geometry}
 % \DoNotIndex{\CurrentOption,\AtEndDocument,\@ne,\c@page,\m@ne}
 % \DoNotIndex{\@firstofone,\@gobble,\@makeother,\begingroup,\endgroup}
 % \DoNotIndex{\eTeXversion,\hbox,\hsize,\includegraphics,\newlinechar}
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
-% \title{\bfseries User's Guide to \textsf{suftesi}\thanks{This
+% \title{\color{spot}\bfseries User's Guide to \textsf{suftesi}\thanks{This
 % document corresponds to \textsf{suftesi}~\fileversion{} dated \filedate}\\
-% \large A document class for typesetting theses, books and articles}
+% \large\itshape A document class for typesetting theses, books and articles}
 % \author{Ivan Valbusa \\
 %   \texttt{ivan dot valbusa at univr dot it}}
 % \date{\filedate}
@@ -198,6 +191,7 @@
 % \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}
@@ -230,15 +224,15 @@
 %
 %
 % \subsection*{Loaded packages}
-%
-%
-% The class loads the following packages: \sty{beramono}, \sty{calc},
-% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage},
-% \sty{epigraph}, \sty{fancyhdr}, \sty{fontenc}, \sty{geometry},
-% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, \sty{microtype}, 
-% \sty{mparhack}, \sty{multicol},
-% \sty{textcase}, \sty{titlesec}, \sty{titletoc}.
-%
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. 
+% It is not compatible with \sty{crop}}
+%
+% The class loads the following packages: \sty{beramono},
+% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, 
+% \sty{fancyhdr}, \sty{fontenc}, \sty{geometry},
+% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, 
+% \sty{microtype}, \sty{multicol}, \sty{titlesec}, \sty{titletoc}.
+% \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 % \section{Class features}
 %
 % \subsection{Layout}
@@ -252,26 +246,33 @@
 % \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
 % \textcite{Morison:1111}. Table~\ref{tab:gabbia} summarizes the main
 % features of the styles provided by \sty{suftesi}.
-% \begin{table}[h]
-% \small\centering
-% \caption[The layout]{The layouts of \sty{suftesi}}
-% \label{tab:gabbia}
-% \begin{tabular}{p{2cm}cccccc}
+% \begin{table*}[t]
+% \footnotesize\centering
+% \begin{tabular}{p{3cm}ccccc}
 % \toprule
-% & \multicolumn{5}{c}{Option (pt)}\\\cmidrule{2-7}
-% & (default) 				& \opt{11pt} & \opt{compact} & \opt{supercompact} & \opt{elements} & \opt{periodical}  \\\cmidrule(lr){1-1}\cmidrule(lr){2-7}
-% Text width                & $312$ & $324$ & $312$ & $284$ & $251$ & $312$\\
-% Text height          		& $624$ & $648$ & $470$ &  $430$ & $502$& $470$\\
-% Marginal notes width & $82$  &	$82$	 & $65$ & $50$ & $60$& $70$\\[4ex]
-% Margins &\multicolumn{6}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-7}
-% \multirow{2}*{{\parbox{2cm}{top/bottom\\inner/outer}}}
-%         & $1/2$ & $1/2$ & $2/3$ & $2/3$& $2/5$& $2/3$ \\
-% &$1/2$&$1/2$ & $2/3$ & $2/3$  & $1/2$& $2/3$\\\cmidrule(lr){1-1}
-% Text block  &   $1/2$& $1/2$ & $2/3$ & $2/3$ & $1/2$& $2/3$\\
-% Page & $1/\sqrt{2}$& $1/\sqrt{2}$ & $2/3$ & $2/3$ & $1/\sqrt{3}$& $1/\sqrt{2}$\\
+%                      & \multicolumn{5}{c}{Options}\\\cmidrule{2-6}
+%                      & (mm) \opt{standard} & \opt{periodical} & \opt{compact} & \opt{supercompact} & (pt) \opt{elements}  \\
+% \cmidrule(lr){1-1}\cmidrule(lr){2-6}
+% Text width      & $110$              & $110$ & $110$ & $100$ & $251$\\
+% Text height        & $220$              & $165$ & $165$ & $150$ & $502$\\
+% Page width     & $210$              & $170$ & $160$  & $140$ & $374$\\
+% Page height       & $297$              & $240$ & $240$ & $210$ & $648$\\[2ex]
+%                      &\multicolumn{5}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-6}
+% \multirow{2}*{%
+% \parbox{1.2cm}{Margins} 
+% \parbox{1.9cm}{
+% top/bottom\\
+% inner/outer}}
+%                      & $1/2$       & $2/3$ & $2/3$& $2/3$& $1/2$ \\
+%                      & $1/2$       & $2/3$ & $2/3$  & $2/3$& $2/5$\\\cmidrule(lr){1-1}
+% Text block     & $1/2$       & $2/3$ & $2/3$ & $2/3$& $1/2$\\
+% Page               & $1/\sqrt{2}$& $2/3$ & $2/3$ & $2/3$& $1/\sqrt{3}$\\
 % \bottomrule
 % \end{tabular}
-% \end{table}
+% \caption{The layouts of \sty{suftesi}}
+% \label{tab:gabbia}
+
+% \end{table*}
 %
 % \subsection{Font}
 %
@@ -284,16 +285,16 @@
 %
 % \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 \opt{defaultfont} class option 
-% which turns off the \sty{suftesi}{} font settings. Moreover pay particular attention 
-% in choosing the Greek font.
+% If you prefer to use other fonts (such as those provided by \sty{fourier} or \sty{libertine} packages), remember to load the \opt{defaultfont=cmodern} class option 
+% which turns off the default font settings. 
+% Moreover pay particular attention in choosing the Greek font.
 %
 % \subsubsection{Greek alphabet}
 %
 % The default font for the Greek text is Artemisia by the Greek Font Society  
 % which is particularly suitable for Palatino:
 % \begin{quotation}
+% \fontfamily{ppl}\selectfont
 % Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{polutonikogreek}%
 % \fontfamily{artemisia}\selectfont
@@ -305,6 +306,7 @@
 % \end{quotation}
 % With the \opt{porson} option you can use the Porson font by the Greek Font Society:
 % \begin{quotation}
+% \fontfamily{ppl}\selectfont
 % Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{greek}%
 % \fontfamily{porson}\selectfont
@@ -318,6 +320,7 @@
 % font:\footnote{This option is also activated by the \opt{defaultfont} option 
 % (see section \ref{sec:options}).}
 % \begin{quotation}
+% \fontfamily{ppl}\selectfont
 % Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
 % \begin{otherlanguage*}{greek}%
 % \fontfamily{lmr}\selectfont
@@ -330,41 +333,15 @@
 % 
 % \subsection{Frontispiece} 
 %
-% The class has an original frontispiece now directly available loading the 
-% \sty{frontespizio} package \parencite{Gregorio:frontespizio}\footnote{Version 1.4 or later.} 
-% with the \opt{suftesi} option (see the \file{tesi.tex} template file in the \file{example} folder):
+% The class has an original frontispiece now directly available 
+% loading the \sty{frontespizio} package 
+% \parencite{Gregorio:frontespizio}\footnote{Version 1.4 or later.} 
+% with the \opt{suftesi} option (see the \file{tesi.tex} template 
+% file in the \file{example} folder):
 % \begin{ttquote}
 % \cmd{usepackage}[suftesi]\ar{frontespizio}
 % \end{ttquote}
 %
-% \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 layouts}
-% \begin{ltxsyntax}
-% \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). 
-% 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{elements} 
-% Reproduces the layout of \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} 
-% (see table \ref{tab:gabbia} for details).
-% \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} 
@@ -394,143 +371,282 @@
 % \put (-3.5,-22) {\line(10,0){16}}
 % \end{picture}
 % \clearpage
+%
+% \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 Styles}
+%
+%\begin{optionlist}
+% \optitem[book]{documentstructure}{\opt{book}, \opt{article}}
+% \begin{valuelist}
+% \item[book] For typesetting texts with chapters
+% \item[article] This option is particularly suitable 
+% to typeset articles or short theses (that is  without 
+% chapter division).
+% \end{valuelist}
+%\optitem[default]{pagelayout}{\opt{default}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}}
+% \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
+%\begin{valuelist}
+%\item[standard]
+% Prints an A4 typeblock (see \ref{tab:gabbia} for details).
+%\item[periodical]
+% Prints a typeblock  of $17 \si{cm} \times 24 \si{cm}$ on an A4 paper, 
+% showing the crop marks  (see table \ref{tab:gabbia} for details). 
+% This style is expecially meant for theses.
+% The \opt{crop=false} option disables the crop marks. 
+%\item[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). 
+%\item[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).
+% \item[elements] Prints a typeblock with the layout of 
+% \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} 
+% (see table \ref{tab:gabbia} for details).. 
+%\end{valuelist}
+%\boolitem[true]{crop}
+% \begin{valuelist}
+% \item[true] Prints the output on a A4 paper, showing the crop marks.
+% \item[false] Prints a \textsc{pdf} with page dimensions 
+% according to the \opt{pagelayout} option.
+% \end{valuelist}
+%\end{optionlist}
+%
+% 	\subsection{Titles}
+%
+% \begin{optionlist}
+% \optitem[roman]{<level>font}{\opt{roman}, \opt{italic}, 
+% \opt{smallcaps}}
+%   \begin{valuelist}
+%     \item[roman] Prints the <level> title in roman
+%     \item[italic] Prints the <level> title in \emph{italic}
+%     \item[smallcaps] Prints the <level> title 
+%      in \textsc{small caps}
+%   \end{valuelist}
+%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec},
+%   \opt{subsec}, \opt{subsubsec}.
+% \optitem[left]{<level>style}{\opt{left}, \opt{center}, 
+% \opt{right}, \opt{parleft}, \opt{parcenter}, 
+% \opt{parright}}
+%   \begin{valuelist}
+%     \item[left] Aligns the <level> title on the left
+%     \item[center] Centers the <level> title 
+%     \item[right] Aligns the <level> title on the right
+%   \end{valuelist}
+%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}
+%   \opt{subsec}, \opt{subsubsec}.
+%   \begin{valuelist}
+%     \item[parleft] As \opt{left} but with the title below the number
+%     \item[parcenter] As \opt{center} but with the title below the number
+%     \item[parright] As \opt{right} but with the title below the number
+%   \end{valuelist}
+%   \begin{valuelist}
+%     \item[elements] Print a chapter number in the style of the 
+%                     \emph{Elements of Typographic Style} by
+%                     Robert Bringhurst.
+%   \end{valuelist}
+%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}.
+% \optitem[Roman/arabic/arabic]{<level>numstyle}{\opt{arabic}, 
+% \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, 
+% \opt{dotRoman}}
+%   \begin{valuelist}
+%     \item[arabic] Arabic <level> number
+%     \item[roman] Small caps lowercase roman <level> number
+%     \item[Roman] Uppercase roman <level> number
+%     \item[dotarabic] As \opt{arabic} but followed by a dot
+%     \item[dotroman] As \opt{roman} but followed by a dot
+%     \item[dotRoman] As \opt{Roman} but followed by a dot
+%   \end{valuelist}
+%   Where <level> can be \opt{part}, \opt{chap}, \opt{sec}.
+% \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, 
+% \opt{ragged}, \opt{pageleft}}
+% \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
+%	\begin{valuelist}
+%		\item[standard] Prints a standard table of contents with
+%   page numbers on the right margin
+%		\item[dotted] As the previous one but with dotted lines.
+%		\item[ragged] Aligns the table of contents on the left 
+%			as suggested by \textcite{Bringhurst:1996}.
+%		\item[pageleft] Prints a table of contents with page numbers 
+%     on the left margin.
+%	\end{valuelist}
+% \end{optionlist}
+% \subsection{Headings}
+%
+% \begin{optionlist}
+% \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
+% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
+%   \begin{valuelist}
+%     \item[inner] Prints the chapter title and the string ``Chapter~ 
+%     \emph{n}'' in the inner side 
+%      respectively of even and odd 
+%     headers, and the page number in the outer side.
+%     \item[center] Centers the header and footer and puts 
+%       the page number in the center of the footer
+%     \item[plain] Prints no headers and puts the page number 
+%       in the center of the footer.
+%     \item[authortitleinner]
+%       Prints the author's 
+%       name on the even pages and the title on the odd ones. 
+%       In order to use this option the \cmd{title} and 
+%       \cmd{author} commands are required
+%     \item[authortitlecenter]
+%       As the previous one but with centered headers and footers.
+%     \item[elements]
+%       Prints the chapter title and the section title in the margin 
+%       respectively of even pages and odd pages. The page number is 
+%       put in the outer side of the footer. This is the style loaded 
+%       by the option \opt{style=elements}.
+%   \end{valuelist}
+% \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, 
+% \opt{smallcaps}}
+%   \begin{valuelist}
+%     \item[roman] Prints the headers in roman
+%     \item[italic] Prints the headers in \emph{italic}
+%     \item[smallcaps] Prints the headers in \textsc{small caps}
+%   \end{valuelist}
+% \end{optionlist}
+%
 % \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}
+%
+% \begin{optionlist}
+% \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
+%  \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} 
+% \begin{valuelist}
+% \item[center] 
+% Indents the block quotations
+% on both the left and right margins
+% \item[right] 
+% Indents the block quotations
+% only on the left margin
+% \end{valuelist}
+% \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}}
+%  \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
+% \begin{valuelist}
+% \item[footnotesize] 
+% Prints the block quotations 
+% in \cmd{footnotesize} size
+% \item[small] 
 % Prints the block quotations 
 % in \cmd{small} size
-% \optitem{defaultparindent}
-% Set |\parinden| to the standard value of 1.5\,em.\new
-% \end{ltxsyntax}
+% \end{valuelist}
+% \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung}, 
+% \opt{dotted}, \opt{superscript}}
+% \changes{v0.9b}{2012/09/23}{Changed \opt{standardfootnote} option 
+% and renamed to \opt{footnotestyle}}
+% \begin{valuelist}
+% \item[bulged] The footnote number protrudes beyond the left margin.
+% \item[hung] 
+% Indents the footnote text, so it will ‘hang’ 
+% under the first line of the text. 
+% \item[dotted] 
+% The footnote number is aligned to the left margin
+% and followed by a dot. 
+% \item[superscript] 
+% Prints a superscript footnote number aligned to the left margin 
+% \end{valuelist}
+% \boolitem[false]{fewfootnotes}
+% \changes{v0.9b}{2012/09/23}{New option \opt{fewfootnotes}}
+% Uses symbols instead of numbers to mark footnotes
+% It is active only if your document has 
+% three footnotes per page maximum. 
+% The symbol sequence is: *, **, ***. 
+% With more footnotes you should not need this option.
+% \optitem[bulged]{liststyle}{\opt{bulged}, \opt{aligned}, \opt{indented}}
+% \begin{valuelist}
+% \item[bulged]
+% The item number or symbol protrudes beyond the left margin.
+% \item[aligned]
+%  Aligns the lists to the left margin
+% \item[indented]
+%  Prints standard indented lists
+% \end{valuelist}
+% \optitem[standard]{captionstyle}{\opt{standard}, \opt{elements}}
+% \begin{valuelist}
+% \item[standard] Prints a standard caption in small size.
+% \item[elements] As the previous one but in sanserif font.
+% \end{valuelist}
+% \end{optionlist}
 %
-% 	\subsection{Titles}
-% In the following options \texttt{<level>} stands for \opt{part}, 
-% \opt{chap}, \opt{sec}, \opt{subsec},\opt{subsubsec}
-% \begin{ltxsyntax}
-% \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 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} 
-% 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{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}
-% \optitem{artemisia} Loads the Artemisia font (default).
-% \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.
-% \end{ltxsyntax}
+%\begin{optionlist}
+% \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{lmodern}, 
+% \opt{cmodern}}
+%   \begin{valuelist}
+%     \item[palatino] Loads the Palatino font.
+%     \item[cmodern] Loads the \LaTeX{} standard Computer Modern.
+%   \end{valuelist}
+% \optitem[artemisia]{greekfont}{\opt{artemisia}, \opt{porson}, 
+% \opt{cbgreek}, \opt{cbgreeklmr}}
+% \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
+%   \begin{valuelist}
+%     \item[artemisia] Loads the Artemisia font.
+%     \item[porson] Loads the Porson font.
+%     \item[cbgreek] Loads the standard CB~Greek font.
+%   \end{valuelist}
+% \end{optionlist}
+%
+% \subsection{Other options}
+%
+%\begin{optionlist}
+%\boolitem[true]{marginpar}
+% \begin{valuelist}
+% \item[true] Prints the marginal notes.
+% \item[false] Hide the marginal notes.
+% \end{valuelist}
+%\boolitem[false]{partpage}
+% \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
+% This option is active only with \opt{documentstructure=article}.
+% \begin{valuelist}
+% \item[true] Prints the part title in a separate page as in 
+% \opt{documentstructure=book}
+% \item[false] Prints the part title as in \opt{article} class.
+% \end{valuelist}
+% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
+%  \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
+% \begin{valuelist}
+% \item[compact] 
+% Sets |\parindent| to 1\,em.
+% \item[wide] 
+% Sets |\parindent| to 1.5\,em.
+% \end{valuelist}
+%\end{optionlist}
 %
-% \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. 
+% \optitem{bozza} 
+% Prints ``Version of \meta{date}'' in the footer.
 % \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)}
+%
+% You can get up to 120 variants combining these styles
+% with \opt{dottedchap} and \opt{romanchapnum} options.
+%
+% \begin{optionlist}
+% \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
+% \opt{smallcaps(1-6)}, \opt{elements}, \opt{sufelements}}
+% \begin{valuelist}
+% \item[roman(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).
+% \item[italic(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)}
+% \item[smallcaps(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.
+% \item[elements] Reproduces the style of \textcite{Bringhurst:1996}
+% \item[sufelements] Loads \opt{headerstyle=smallcaps}, 
+% \opt{chapfont=smallcaps}, \opt{secfont=smallcaps} 
+% \opt{subsecfont=italic} and \opt{chaptstyle=elements} options.
+% \end{valuelist}% \end{optionlist}
 %
 % \section{New commands}\label{sec:commands}
 %
@@ -539,6 +655,7 @@
 % \begin{ltxsyntax}
 %
 % \cmditem{title}[short title for headers]{complete title for titlepage}
+% \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command}
 % 
 % This command is for use with option \opt{authortitle} if the title is too long
 % or has some breaks. 
@@ -561,41 +678,47 @@
 % or  the \cmd{thanks} command:
 % \begin{ttquote}
 % \cmd{author}\{\meta{Name Surname}\\
-% \cmd{thanks}\{This work has been typeset with \LaTeX{},\\
+% \cmd{thanks}\{This work has been typeset with \cmd{LaTeX},\\
 % using the  \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\}
 % \end{ttquote}
 %
 % \cmditem{bookcolophon}{copyright notice}{attribution notice and 
 % other informations}
+% \changes{v0.6}{2011/10/21}{New command \cmd{bookcolophon}}
 %
 % This command is similar to \cmd{colophon} but it is completely customizable. 
 % The first argument prints its content (usually the copyright notice) in the center of the page. 
 % The second argument prints its content at the bottom. For example:
 %
-% \begin{verbatim}
-% \bookcolophon{Copyright © 2007 by Ivan Valbusa}{This work has been 
-% typeset with \LaTeX,  using the \sty{suftesi} class by Ivan 
-% Valbusa\index{Valbusa, Ivan}. The normal font  is Palatino by Hermann 
-% Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.}
-% \end{verbatim}
+% \begin{ttquote}
+% \cmd{bookcolophon}\{Copyright © 2007 by Ivan Valbusa\}\{%\\
+% This work has been typeset with \cmd{LaTeX},  using the 
+% \cmd{sty}\{suftesi\} class by Ivan Valbusa\cmd{index}\{Valbusa, 
+% Ivan\}. The normal font  is Palatino by \\
+% Hermann Zapf.  The sans serif font is Iwona by Janusz M.~Nowacki.\}
+% \end{ttquote}
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
+% \changes{v0.6}{2011/10/21}{New command \cmd{artcolophon}}
 %
 % This command only has one argument. It simply prints its content at the 
 % bottom of the page. Here is an example:
 %
-% \begin{verbatim}
-% \artcolophon{This work is licensed under the Creative Commons 
+% \begin{ttquote}
+% \cmd{artcolophon}\{\\
+% This work is licensed under the Creative Commons\\ 
 % Attribution-NonCommercial-NoDerivs 3.0 Unported License. To view
-% a copy of this license, visit 
-% \begin{center}
-% \texttt{http://creativecommons.org/licenses/by-nc-nd/3.0/}
-% \end{center}
-% or send a letter to Creative Commons, 444 Castro Street, Suite 900, 
-% Mountain View, California, 94041, USA.\\[1ex]
+% a copy of this license, visit\\
+%
+% \cmd{begin}\{center\}\\
+% \cmd{texttt}{http://creativecommons.org/licenses/by-nc-nd/3.0/}\\
+% \cmd{end}\{center\}\\
 %
-% Typeset with \LaTeX,  using the \sty{suftesi} class by Ivan Valbusa.}
-% \end{verbatim}
+% or send a letter to Creative Commons, 444 Castro Street, Suite 900,\\ 
+% Mountain View, California, 94041, USA.\cmd{}\cmd{}[1ex]\\
+%
+% Typeset with \cmd{LaTeX},  using the \cmd{sty}{suftesi} class by Ivan Valbusa.\}
+% \end{ttquote}
 %
 % \cmditem{finalcolophon}{colophon content}
 %
@@ -626,22 +749,180 @@
 %
 % \cmditem{chapnumfont}{name}
 %
-% Sets the font for the number of the chapter (only with the \opt{sufelements} option). 
-% The default is ``\texttt{pplj}'' (\LaTeX) or ``Palatino''  (\XeLaTeX). 
-% 
+% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
+% Sets the font of the chapter number of \opt{style=elements} 
+% and  \opt{style=sufelements} styles. 
+% The default is ``\texttt{pplj}'' (\LaTeX) or ``Junicode''  (\XeLaTeX). 
+% \begin{ttquote}
+% \cmd{chapnumfont}\{pplj\}\\
+% \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Junicode\}\}
+% \end{ttquote}
 % \cmditem{toclabelspace}{level}{label-width}\new
+%  \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
 %
 % 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}
+% \begin{ttquote}
+% \cmd{toclabelwidth}\{part\}\{1em\}\\
+% \cmd{toclabelwidth}\{chapter\}\{1em\}\\
+% \cmd{toclabelwidth}\{section\}\{1.5em\}\\
+% \cmd{toclabelwidth}\{subsection\}\{2em\}\\
+% \cmd{toclabelwidth}\{subsubsection\}\{2.5em\}\\
+% \cmd{toclabelwidth}\{paragraph\}\{3em\}\\
+% \cmd{toclabelwidth}\{subparagraph\}\{3.5em\}
+% \end{ttquote}
+% \cmditem{xfootnote}{symbol}{footnote text}
+% \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
+%
+% A command to print a footnote with a discretionary
+% symbols instead of numbers to mark footnotes. It does not
+% increment the footnote counter.
+% \begin{ttquote}
+% \cmd{xfootnote}\{\cmd{dagger}\}\{The text of the footnote.\}
+% \end{ttquote}
 % \end{ltxsyntax}
+%
+% \subsection{Obsolete options}
+%
+% \begin{multicols}{2}
+% \footnotesize
+% \begin{ltxsyntax}
+% \optitem{defaultparindent}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{defaultparindent}} 
+% $\rightarrow$ \opt{parindent=compact}.
+% \optitem{ralignquotation}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{ralignquotation}}
+% $\rightarrow$ \opt{quotestyle=right}
+% \optitem{smallquotation}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallquotation}} 
+% $\rightarrow$ \opt{quotesize=small}
+% \optitem{standardfootnote} 
+% \changes{v0.9a}{2012/08/31}{New option \opt{standardfootnote}}
+% $\rightarrow$ \opt{footnotes=superscript}
+% \optitem{dottedfootnote}
+% \changes{v0.9a}{2012/08/31}{New option \opt{dottedfootnote}}
+% $\rightarrow$ \opt{footnotes=dot}
+% \optitem{indentlist} 
+%  \changes{v0.9a}{2012/08/31}{New option \opt{indentlist}} 
+% $\rightarrow$ \opt{liststyle=indented}
+% \optitem{alignlist} 
+%  \changes{v0.9a}{2012/08/31}{New option \opt{alignlist}} 
+% $\rightarrow$ \opt{liststyle=aligned}
+% \optitem{artemisia} $\rightarrow$ \opt{greekfont=artemisia}.
+% \optitem{porson} $\rightarrow$ \opt{greekfont=porson}.
+% \optitem{defaultgreek} $\rightarrow$ \opt{greekfont=cbgreek}.
+% \optitem{defaultfont} 
+% $\rightarrow$ \opt{defaultfont=cm}.
+% \optitem{centerpart}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{centerpart}} 
+% $\rightarrow$ \opt{partstyle=center}.
+% \optitem{centerchap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{centerchap}} 
+% $\rightarrow$ \opt{chapstyle=center}.
+% \optitem{centersec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{centersec}} 
+% $\rightarrow$ \opt{secstyle=center}.
+% \optitem{rightpart}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{rightpart}} 
+% $\rightarrow$ \opt{partstyle=right}.
+% \optitem{rightchap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{rightchap}} 
+% $\rightarrow$ \opt{chapstyle=right}.
+% \optitem{rightsec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{rightsec}} 
+% $\rightarrow$ \opt{secstyle=right}.
+% \optitem{numparpart}
+% \changes{v0.9a}{2012/08/31}{New option \opt{numparpart}} 
+% $\rightarrow$ \opt{partnumposition=above}.
+% \optitem{numparchap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{numparchap}} 
+% $\rightarrow$ \opt{chapnumposition=above}.
+% \optitem{numparsec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{numparsec}} 
+% $\rightarrow$ \opt{secnumposition=above}.
+% \optitem{smallcapspart}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapspart}} 
+% $\rightarrow$ \opt{partstyle=smallcaps}.
+% \optitem{smallcapschap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapschap}} 
+% $\rightarrow$ \opt{chapstyle=smallcaps}.
+% \optitem{smallcapssec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapssec}} 
+% $\rightarrow$ \opt{subsecstyle=smallcaps}.
+% \optitem{italicpart}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{italicpart}} 
+% $\rightarrow$ \opt{partstyle=italic}.
+% \optitem{italicchap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{italicchap}} 
+% $\rightarrow$ \opt{chapsecstyle=italic}.
+% \optitem{italicsec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{italicsec}} 
+% $\rightarrow$ \opt{secstyle=italic}.
+% \optitem{italicsubsec}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{italicsubsec}}
+% $\rightarrow$ \opt{subsecstyle=italic}.
+% \optitem{romanchapnum}
+% \changes{v0.9a}{2012/08/31}{New option \opt{romanchap}} 
+% $\rightarrow$ \opt{chapnumstyle=roman}.
+% \optitem{dottedchap}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{dottedchap}}
+% $\rightarrow$ \opt{chapnumstyle}.
+% \optitem{italicheader} 
+%  \changes{v0.9a}{2012/08/31}{New option \opt{italicheader}} 
+% $\rightarrow$ \opt{headerfont=italic}.
+% \optitem{smallcapsheader}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{smallcapsheader}} 
+% $\rightarrow$ \opt{headerfont=smallcaps}.
+% \optitem{centerheader}
+% $\rightarrow$ \opt{headerstyle=center}
+% \optitem{sufplain}
+% $\rightarrow$ \opt{headerstyle=plain}
+% \optitem{authortitle}
+% \changes{v0.6}{2011/10/21}{New option \opt{authortitle}}
+% $\rightarrow$ \opt{headerstyle}
+% \optitem{periodical} 
+% \changes{v0.8}{2012/03/19}{New option \opt{periodical}}
+% $\rightarrow$ \opt{pagestyle=periodical}
+% \optitem{compact} 
+% \changes{v0.5}{2011/10/21}{New option \opt{compact}}
+% $\rightarrow$ \opt{pagestyle=compact}
+% \optitem{supercompact} 
+% \changes{v0.5}{2011/10/21}{New option \opt{supercompact}}
+% $\rightarrow$ \opt{pagestyle=supercompact}
+% \optitem{dottedtoc} 
+% \changes{v0.9}{2012/04/22}{New option \opt{dottedtoc}}
+% $\rightarrow$ \opt{tocstyle=dotted}
+% \optitem{raggedtoc} 
+% \changes{v0.9}{2012/04/22}{New option \opt{raggedtoc}}
+% $\rightarrow$ \opt{tocstyle=ragged}
+% \optitem{tocpageleft}  
+%  \changes{v0.9a}{2012/08/31}{New option \opt{tocpageleft}}
+% $\rightarrow$ \opt{tocstyle=pageleft}
+% \optitem{dottedpart}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{dottedpart}} 
+% $\rightarrow$ \opt{partnumstyle=dotarabic}
+% \optitem{elements} 
+% \changes{v0.5}{2011/10/21}{New option \opt{elements}}
+% $\rightarrow$ \opt{documentstructure=elements}
+% \optitem{nomarginpar}
+% \changes{v0.5}{2011/10/21}{New option \opt{nomarginpar}}
+% $\rightarrow$ \opt{marginpar=false}.
+% \optitem{nocrop} 
+% \changes{v0.5}{2011/10/21}{New option \opt{nocrop}}
+% $\rightarrow$ \opt{crop=false}
+% \optitem{rmstyle(1-6)} 
+%  \changes{v0.9a}{2012/08/31}{New option \opt{rmstyle(1-6)}} 
+% An old name for \opt{style=roman(1-6)}
+% \optitem{itstyle(1-12)}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{itstyle(1-12)}} 
+% An old name for \opt{style=italic(1-6)}
+% \optitem{scstyle(1-12)}
+%  \changes{v0.9a}{2012/08/31}{New option \opt{scstyle(1-12)}}
+% An old name for \opt{style=smallcaps(1-6)}
+% \optitem{sufelements} 
+% \changes{v0.5}{2011/10/21}{New option \opt{sufelements}}
+% An old name for \opt{style=sufelements}
+% \end{ltxsyntax}
+% \end{multicols}
 % \appendix
 % \label{predefined-styles}
 % \includepdf[pages=1-]{collect-examples}
@@ -653,11 +934,10 @@
 % \StopEventually{\PrintChanges\PrintIndex}
 % \section{The Code}
 %<*class>
-%    \begin{macrocode}		
-\newif\ifsuftesi@artemisia 
+%    \begin{macrocode}
+\RequirePackage{xkeyval}
+\newif\ifsuftesi@cmfont 
 \newif\ifsuftesi@porson 
-\newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@defaultfont 
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@bozza
@@ -666,374 +946,705 @@
 \newif\ifsuftesi@periodical
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
-\newif\ifsuftesi@elements
 \newif\ifsuftesi@sufelements
 \newif\ifsuftesi@nocrop
-\newif\ifsuftesi@nomarginpar
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\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@pagelefttoc
+\newif\ifsuftesi@fewfootnotes
+\newif\ifsuftesi@partpage
 \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}
+\newif\ifsuftesi@elementschap
+\newif\ifsuftesi@elementsheader
+\newif\ifsuftesi@elementsstructure
+\newif\ifsuftesi@elementspagelayout
 %    \end{macrocode}
 % Execute options:
 %    \begin{macrocode}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ExecuteOptions{artemisia,rmstyle1} 
 \ProcessOptions
 \relax
 %    \end{macrocode}
 % \sty{suftesi} is based on the standard \sty{book} class!
 %    \begin{macrocode}
-\LoadClass{book}
+\LoadClass{book} 
+%    \end{macrocode}
+% \subsection{Document srtucture}
+%    \begin{macrocode}
+\define@choicekey{}{documentstructure}[\val\nr]
+    {book,article}[book]{%
+\ifcase\nr\relax
+\or
+\suftesi@articletrue
+\@titlepagefalse
+\fi}
+%    \end{macrocode}
+% \subsection{Page layout}
+%    \begin{macrocode}
+\RequirePackage{geometry}
+  \geometry{heightrounded}
+\define@choicekey{}{pagelayout}[\val\nr]
+    {standard,periodical,compact,supercompact,elements}[standard]{%
+\ifcase\nr\relax
+  \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+	\geometry{%
+	  a4paper,
+	  includeheadfoot=true,
+	  textwidth=      110mm,
+	  textheight=     220mm,
+	  marginratio=    1:2,
+	  marginparwidth= 30mm,
+	  	marginparsep=   12pt}
+\or
+\suftesi@periodicaltrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+	  includeheadfoot=false,
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     170mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 26mm,
+    marginparsep=   10pt}
+\or
+\suftesi@compacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+	  includeheadfoot=false,
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     160mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 22mm,
+    marginparsep=   9pt}
+\or
+\suftesi@supercompacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+	  includeheadfoot=false,
+    textheight=     150mm,
+    textwidth=      100mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    2:3,
+    marginparwidth= 18mm,
+    marginparsep=   8pt}
+\or
+\suftesi@elementspagelayouttrue
+  \geometry{%
+    includeheadfoot=false,
+    textwidth=      251pt,
+    textheight=     502pt,
+    paperwidth=     374pt,
+    paperheight=    648pt,
+    vmarginratio=   1:2,
+    marginparwidth= 60pt,
+    marginparsep=   18pt,
+    outer=          90pt}
+\fi}
+%    \end{macrocode}
+% \subsection{Sections style}
+% \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 titles and numbers of parts, 
+% chapters, sections, subsections and subsubsection.
+%    \begin{macrocode}
+\define@choicekey{}{partstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@PARTSwitch{\filright}
+\or
+  \def\SUF@lr@PARTSwitch{\filcenter}
+\or
+  \def\SUF@lr@PARTSwitch{\filleft}
+\or%numpar
+  \def\SUF@lr@PARTSwitch{\filright}
+  \suftesi@numparparttrue
+\or
+  \def\SUF@lr@PARTSwitch{\filcenter}
+  \suftesi@numparparttrue
+\or
+  \def\SUF@lr@PARTSwitch{\filleft}
+  \suftesi@numparparttrue
+\fi}
+\define@choicekey{}{chapstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright,elements}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@CHAPSwitch{\filright}
+\or
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+\or
+  \def\SUF@lr@CHAPSwitch{\filleft}
+\or%numparchap
+  \def\SUF@lr@CHAPSwitch{\filright}
+  \suftesi@numparchaptrue
+\or
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+  \suftesi@numparchaptrue
+\or
+  \def\SUF@lr@CHAPSwitch{\filleft}
+  \suftesi@numparchaptrue
+\or
+  \suftesi@elementschaptrue
+\fi}
+\define@choicekey{}{secstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SECSwitch{\filright}
+\or
+  \def\SUF@lr@SECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SECSwitch{\filleft}
+\or%numparsec
+  \def\SUF@lr@SECSwitch{\filright}
+  \suftesi@numparsectrue
+\or
+  \def\SUF@lr@SECSwitch{\filcenter}
+  \suftesi@numparsectrue
+\or
+  \def\SUF@lr@SECSwitch{\filleft}
+  \suftesi@numparsectrue
+\fi}
+\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SUBSECSwitch{\filright}
+\or
+  \def\SUF@lr@SUBSECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SUBSECSwitch{\filleft}
+\fi}
+\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SUBSUBSECSwitch{\filright}
+\or
+  \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SUBSUBSECSwitch{\filleft}
+\fi}
+%    \end{macrocode}
+% \subsection{Sections font}
+% These macros control the style of part, chapter, section,
+% subsection and subsubsection levels.
+% \DescribeMacro{\SUF@PART@StyleSwitch}
+% \DescribeMacro{\SUF@CHAP@StyleSwitch}
+% \DescribeMacro{\SUF@SEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSUBSEC@StyleSwitch}
+%    \begin{macrocode}
+\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@PART@StyleSwitch{\relax}
+\or
+\def\SUF@PART@StyleSwitch{\itshape}
+\or
+\def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@CHAP@StyleSwitch{\relax}
+\or
+\def\SUF@CHAP@StyleSwitch{\itshape}
+\or
+\def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+\def\SUF@SEC@StyleSwitch{\relax}
+\or
+\def\SUF@SEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@SUBSEC@StyleSwitch{\relax}
+\or
+\def\SUF@SUBSEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@SUBSUBSEC@StyleSwitch{\relax}
+\or
+\def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+%    \end{macrocode}
+% \subsection{The number style for part, chapter and section}
+% \subsubsection{Part number style}
+%    \begin{macrocode}
+\define@choicekey{}{partnumstyle}[\val\nr]
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+  \def\SUF@thepart{\arabic{part}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\textsc{\roman{part}}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\Roman{part}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\arabic{part}}
+  \def\SUF@dotpart{.}
+\or
+  \def\SUF@thepart{\textsc{\roman{part}}}
+  \def\SUF@dotpart{.}
+\or
+  \def\SUF@thepart{\Roman{part}}
+  \def\SUF@dotpart{.}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Chapter number style}
+%    \begin{macrocode}
+\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+  \def\SUF@thechapter{\arabic{chapter}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\textsc{\roman{chapter}}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\Roman{chapter}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\arabic{chapter}}
+  \def\SUF@dotchap{.}
+\or
+  \def\SUF@thechapter{\textsc{\roman{chapter}}}
+  \def\SUF@dotchap{.}
+\or
+  \def\SUF@thechapter{\Roman{chapter}}
+  \def\SUF@dotchap{.}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Section number style}
+%    \begin{macrocode}
+\define@choicekey{}{secnumstyle}[\val\nr]
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifsuftesi@article
+\ifcase\nr\relax
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{.}
+\or
+  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@dotsec{.}
+\or
+  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@dotsec{.}
+\fi
+\else
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{}
+\fi}
+%    \end{macrocode}
+% \subsection{Headers}
+% \subsubsection{Header style}
+%    \begin{macrocode}
+\define@choicekey{}{headerstyle}[\val\nr]
+    {inner,center,plain,authortitleinner,
+     authortitlecenter,elements}[inner]{%
+\ifcase\nr\relax
+  \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+\or
+  \suftesi@centerheadertrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+\or
+  \suftesi@sufplaintrue
+\or
+  \suftesi@authortitletrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+\or
+  \suftesi@authortitletrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+  \suftesi@centerheadertrue
+\or
+  \suftesi@elementsheadertrue
+\fi}
+%    \end{macrocode}
+% \subsubsection{Header font}
+%    \begin{macrocode}
+\define@choicekey{}{headerfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@Rheadstyle{}
+  \def\SUF@Lheadstyle{}
+  \def\SUF@thepage{\thepage}
+\or
+  \def\SUF@Rheadstyle{\itshape}
+  \def\SUF@Lheadstyle{\itshape}
+  \def\SUF@thepage{\thepage}
+\or
+  \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
+  \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
+  \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
+\fi}
+%    \end{macrocode}
+% \subsection{Text elements}
+% \subsubsection{Lists}
+%    \begin{macrocode}
+\RequirePackage[inline]{enumitem}
+\renewcommand\labelitemi{\color{sufgray}\textbullet}
+\setlist{itemsep=.5ex,parsep=0pt}
+\setlist[description]{font=\normalfont\itshape}
+\define@choicekey{}{liststyle}[\val\nr]
+    {bulged,aligned,indented}[bulged]{%
+\ifcase\nr\relax
+    \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=0pt}
+    \setlist[itemize,2]{leftmargin=1.3\parindent}
+    \setlist[itemize,3]{leftmargin=1.3\parindent}
+\or
+    \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=1\parindent}
+    \setlist[itemize,2]{leftmargin=1.5\parindent}
+    \setlist[itemize,3]{leftmargin=1.5\parindent}
+\or
+    \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=2\parindent}
+    \setlist[itemize,2]{leftmargin=2.5\parindent}
+    \setlist[itemize,3]{leftmargin=2.5\parindent}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Block quotations}
+% \paragraph{Quotation style}
+%    \begin{macrocode}
+\define@choicekey{}{quotestyle}[\val\nr]
+    {center,right}[center]{%
+\ifcase\nr\relax
+\def\SUF@quote@style{\rightmargin=\parindent}
+\or
+\def\SUF@quote@style{}
+\fi}
+%    \end{macrocode}
+% \paragraph{Quotation size}
+%    \begin{macrocode}
+\define@choicekey{}{quotesize}[\val\nr]
+    {footnotesize,small}[footnotesize]{%
+\ifcase\nr\relax
+\def\SUF@quotation@size{\footnotesize}
+\or
+\def\SUF@quotation@size{\small}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Footnotes}
+%    \begin{macrocode}
+\define@choicekey{}{footnotestyle}[\val\nr]
+    {bulged,hung,dotted,superscript}[bulged]{%
+\ifcase\nr\relax
+    \renewcommand\@makefntext{%
+      \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+\or
+    \renewcommand\@makefntext{%
+      \leftskip=1em\hskip-1.5em%
+        \makebox[1em][r]{\@thefnmark}\hskip.5em}
+\or
+    \renewcommand\@makefntext{%
+         \@thefnmark.\hskip.5em}
+\or
+  \renewcommand\@makefntext{%
+    \textsuperscript{\@thefnmark}\hskip.3em}
+\fi}
+\define@choicekey{}{fewfootnotes}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@fewfootnotestrue
+\or
+  \relax
+\fi}
+%    \end{macrocode}
+% \subsubsection{Captions}
+%    \begin{macrocode}
+\RequirePackage{caption}
+\define@choicekey{}{captionstyle}[\val\nr]
+    {standard,elements}[standard]{%
+\ifcase\nr\relax
+   \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+\or
+   \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+   \captionsetup{font+=sf}
+\fi
+}
+%    \end{macrocode}
+% \subsubsection{Marginal notes}
+%    \begin{macrocode}
+\define@choicekey{}{marginpar}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \relax
+\or   
+  \renewcommand\marginpar[2][]{}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Table of contents}
+% \DescribeMacro{\SUF@titlerule}
+% \DescribeMacro{\SUF@chaptitlerule}
+%    \begin{macrocode}
+\define@choicekey{}{tocstyle}[\val\nr]{%
+    standard,dotted,ragged,leftpage}[standard]{%
+\ifcase\nr\relax
+  \def\SUF@titlerule{\titlerule*{}}
+  \def\SUF@chaptitlerule{\titlerule*{}}
+\or
+\suftesi@dottedtoctrue
+  \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+  \def\SUF@chaptitlerule{\titlerule*{}}
+\or
+\suftesi@raggedtoctrue
+  \def\SUF@titlerule{\hspace{1em}}
+  \def\SUF@chaptitlerule{\hspace{1em}}
+\or
+\suftesi@pagelefttoctrue
+\fi}
+%    \end{macrocode}
+% \subsection{Fonts}
+% \subsubsection{Roman fonts}
+%    \begin{macrocode}
+\define@choicekey{}{defaultfont}[\val\nr]{%
+    palatino,standard}[palatino]{%
+\ifcase\nr\relax
+\or
+  \suftesi@cmfonttrue
+  \setkeys{suftesi.cls}{greekfont=cbgreek}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Greek fonts}
+%    \begin{macrocode}
+\define@choicekey{}{greekfont}[\val\nr]{%
+    artemisia,porson,cbgreek}[artemisia]{%
+\ifcase\nr\relax
+	\def\SUF@greekfamily{artemisiaeuler}
+\or
+	\def\SUF@greekfamily{porson}
+\or
+	\def\SUF@greekfamily{lmr}
+\fi}
+%    \end{macrocode}
+% \subsection{Other options}
+% \subsubsection{\cmd{parindent} selection}
+%    \begin{macrocode}
+\define@choicekey{}{parindent}[\val\nr]
+    {compact,wide}[compact]{%
+\ifcase\nr\relax
+\setlength\parindent{1em}
+\or
+\setlength\parindent{1.5em}
+\fi}
+%    \end{macrocode}
+% \subsubsection{Part page}
+%    \begin{macrocode}
+\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@partpagetrue
+\or
+  \relax
+\fi}
+%    \end{macrocode}
+% \subsubsection{Crop marks}
+%    \begin{macrocode}
+\define@choicekey{}{crop}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+\or
+  \suftesi@nocroptrue
+\fi}
+%    \end{macrocode}
+% \subsubsection{Titlepage}
+%    \begin{macrocode}
+\define@choicekey{}{titlepage}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \@titlepagetrue
+\or
+  \@titlepagetrue
+\fi}
+%    \end{macrocode}
+% \subsubsection{Bozza}
+%    \begin{macrocode}
+\define@choicekey{}{bozza}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@bozzatrue
+\or
+\fi}
+%    \end{macrocode}
+% \subsubsection{Pre-defined styles}
+%    \begin{macrocode}
+\define@choicekey{}{style}[\val\nr]
+  {roman1,roman2,roman3,roman4,roman5,roman6,
+  italic1,italic2,italic3,italic4,italic5,italic6,
+  italic7,italic8,italic9,italic10,italic11,italic12,
+  smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
+  smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
+  elements,sufelements}  
+  [roman1]{%
+\ifcase\nr\relax
+%    \end{macrocode}
+% The 'roman' styles:
+%    \begin{macrocode}
+  \setkeys{}{chapstyle=left}
+\or
+  \setkeys{}{chapstyle=center}
+\or
+  \setkeys{}{chapstyle=right}
+\or
+  \setkeys{}{chapstyle=parleft}
+\or
+  \setkeys{}{chapstyle=parcenter}
+\or
+  \setkeys{}{chapstyle=parright}
+\or
+%    \end{macrocode}
+% The 'italic' styles:
+%    \begin{macrocode}
+  \setkeys{}{chapstyle=left,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=center,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=right,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps}
+\or
+%    \end{macrocode}
+% The 'smallcaps' styles:
+%    \begin{macrocode}
+  \setkeys{}{chapstyle=left,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps}
+\or
+%    \end{macrocode}
+% The 'elements' style:
+%    \begin{macrocode}
+  \setkeys{}{
+    pagelayout=elements,
+    headerstyle=elements,
+    chapstyle=elements,
+    secfont=smallcaps,
+    subsecfont=italic,    
+    captionstyle=elements}
+\disable@keys{}
+    {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle}
+\or
+%    \end{macrocode}
+% The 'sufelements' style:
+%    \begin{macrocode}
+  \setkeys{}{
+    chapstyle=elements,
+    headerfont=smallcaps,
+    secfont=smallcaps,
+    subsecfont=italic}
+\disable@keys{}
+    {headerstyle,chapstyle,secfont,subsecfont}
+\fi}
+%    \end{macrocode}
+% Execute and process options:
+%    \begin{macrocode}
+\ExecuteOptionsX<>{
+  marginpar=true,
+  captionstyle=standard,
+  parindent=compact,
+  tocstyle=standard,
+  greekfont=artemisia,
+  pagelayout=standard,
+  headerstyle=inner,
+  liststyle=bulged,
+  footnotestyle=bulged,
+  quotesize=footnotesize,
+  quotestyle=center,
+  partstyle=left,
+  chapstyle=left,
+  secstyle=left,
+  subsecstyle=left,
+  subsubsecstyle=left,
+  partfont=roman,
+  chapfont=roman,
+  secfont=italic,
+  subsecfont=roman,
+  subsubsecfont=roman,
+  headerfont=roman,
+  secnumstyle=arabic,
+  partnumstyle=Roman,
+  chapnumstyle=arabic}
+\ProcessOptionsX<>\relax
 %    \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
-\RequirePackage{textcase}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{mparhack}
+\RequirePackage{textcase}
+\RequirePackage{ifxetex,ifluatex}
 %    \end{macrocode}
 % \subsection{Greek fonts}
 % Thanks to Enrico Gregorio for these macros:
@@ -1041,22 +1652,19 @@
 \ifxetex
    \relax
       \else
+\RequirePackage{microtype}
 \RequirePackage[LGR,T1]{fontenc}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
-\ifsuftesi@defaultfont
+\ifsuftesi@cmfont
   \relax
-    \else
-\RequirePackage[osf,sc]{mathpazo}
-\RequirePackage[scaled=0.8]{beramono}
-   \linespread{1.05}
-    \renewcommand{\sfdefault}{iwona}
-  \fi
-\ifsuftesi@artemisia
-	\def\SUF@greekfamily{artemisiaeuler}
-    \fi
-\ifsuftesi@defaultgreek
-	\def\SUF@greekfamily{cmr}
-    \fi
+   \else
+     \RequirePackage[osf,sc]{mathpazo}
+     \RequirePackage[scaled=0.8]{beramono}
+       \renewcommand{\sfdefault}{iwona}
+\fi
+%    \end{macrocode}
+% Scale the Porson font:
+%    \begin{macrocode}
 \ifsuftesi@porson
 	\sbox\z@{\fontsize{10}{10}\normalfont A} 
 	\sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A} 
@@ -1074,7 +1682,6 @@
 	\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\SUF@greekfamily{porson}
    \fi
 \AtBeginDocument{
   \DeclareRobustCommand{\greektext}{%
@@ -1084,82 +1691,11 @@
 %    \end{macrocode}
 % \subsection{Page layout}
 %    \begin{macrocode}
-\RequirePackage{geometry}
-\ifsuftesi@defaultparindent
-  \relax
-    \else
-  \parindent1em
-\fi
-  \geometry{heightrounded}
 \ifsuftesi@nocrop
   \relax
     \else
   \RequirePackage[a4,cam,center]{crop}
 \fi
-\ifsuftesi@periodical
-  \geometry{
-    textheight=     165mm,
-    textwidth=      110mm,
-    paperwidth=     170mm,
-    paperheight=    240mm,
-    marginratio=    2:3,
-    marginparwidth= 75pt,
-    marginparsep=   10pt}
-\else
-\ifsuftesi@compact
-  \geometry{
-    textheight=     165mm,
-    textwidth=      110mm,
-    paperwidth=     160mm,
-    paperheight=    240mm,
-    marginratio=    2:3,
-    marginparwidth= 65pt,
-    marginparsep=   10pt}
-\else
-\ifsuftesi@supercompact
-  \geometry{
-    textheight=     150mm,
-    textwidth=      100mm,
-    paperwidth=     140mm,
-    paperheight=    210mm,
-    marginratio=    2:3,
-    marginparwidth= 50pt,
-    marginparsep=   9pt}
-\else
-\ifsuftesi@elements
-  \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
 %    \end{macrocode}
 % A trick to produce one-side documents:
 %    \begin{macrocode}
@@ -1174,21 +1710,10 @@
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifsuftesi@periodical
-  \DeclareRobustCommand{\SUF@chaptersize}{\large}
-    \else
-      \ifsuftesi@compact
-       \DeclareRobustCommand{\SUF@chaptersize}{\large}
-         \else
-           \ifsuftesi@supercompact
-          \DeclareRobustCommand{\SUF@chaptersize}{\large}
-        \else
-      \DeclareRobustCommand{\SUF@chaptersize}{\Large}
-    \fi
-  \fi
-\fi
 %    \end{macrocode}
 % \DescribeMacro{\SUF@titlesmallcaps} 
+% \DescribeMacro{\SUF@headingsmallcaps} 
+% \DescribeMacro{\SUF@chapnumfont} 
 %    \begin{macrocode}
 \ifxetex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
@@ -1196,8 +1721,8 @@
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
-      \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}}
-      \chapnumfont{Palatino}
+      \def\SUF@chapnumfont{#1}}
+      \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
 \else
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
@@ -1208,121 +1733,36 @@
     \chapnumfont{pplj}
 \fi
 %    \end{macrocode}
-% \DescribeMacro{\SUF@thechapter} 
+% \paragraph{The \opt{elements} style} 
 %    \begin{macrocode}
-\ifsuftesi@romanchap
-  \def\SUF@thechapter{\Roman{chapter}}
-    \else
-  \def\SUF@thechapter{\arabic{chapter}}
-\fi
-%    \end{macrocode}
-% \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
+\define@key[SUF]{elements}{chapsize}[90]{%
+  \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}}
+\define@key[SUF]{elements}{chapposition}[-83]{%
+  \def\cmdSUF@elements@chapposition{#1}}
 %    \end{macrocode}
-% \DescribeMacro{\SUF@dotchap} 
+% The chapter for \opt{elements} style:
 %    \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]
-     {}%
+\def\SUF@elements@CHAPTER{%
+  \titleformat{\chapter}[block]
+     {\Large}%
      {\begin{picture}(0,0)
      \setlength{\unitlength}{1pt}
-     \SUF@chapnumfont%
-     \ifsuftesi@elements
-       \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%
-       \def\SUF@chapnumpos{-83}
-     \fi
-     \put(0,\SUF@chapnumpos){%
-       \hskip\dimexpr(\textwidth+\marginparsep)%
-       \textcolor{sufgray}{\SUF@thechapter}}%
+	     \SUF@chapnumfont%
+	     \cmdSUF@elements@chapsize
+	      \put(0,\cmdSUF@elements@chapposition){%
+       \hskip\dimexpr(\textwidth+0.9\marginparsep)%
+        \textcolor{sufgray}{\SUF@thechapter}}%
    \end{picture}}%
   {0pt}
-  {\Large\SUF@titlesmallcaps}
-  [\rule{\textwidth}{.1pt}]
-  \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]
+  {\SUF@titlesmallcaps}
+  [\vspace*{-6pt}\rule{\textwidth}{.1pt}]
+  }
+%    \end{macrocode}
+% The sections for elements style:
+%    \begin{macrocode}
+\def\SUF@elements@SECTIONS{
 \titleformat{\section}[block]
-	  {\filright}
+	  {\extramarks{}{}\filright}
 	  {\textnormal\thesection}
 	  {1em}
 	  {\SUF@titlesmallcaps}
@@ -1339,108 +1779,12 @@
 	  {1em}
 	  {}
   \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}
-% \subparagraph{Redefinitions for \opt{`article'} mode}
-%    \begin{macrocode}
-\ifsuftesi@article
-\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}
+% Default styles:
 %    \begin{macrocode}
+\def\SUF@default@CHAPTER{
 \ifsuftesi@numparchap
   \titleformat{\chapter}[display]
     {\SUF@chaptersize\SUF@lr@CHAPSwitch}
@@ -1458,56 +1802,39 @@
   \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
+\fi}
 %    \end{macrocode}
 % \DescribeMacro{\section}
 %    \begin{macrocode}
+\def\SUF@default@SECTIONS{
 \ifsuftesi@numparsec
 \titleformat{\section}[display]
-	  {\SUF@lr@SECswitch}
-	  {\thesection}
+	  {\SUF@lr@SECSwitch}
+	  {\SUF@thesection\SUF@dotsec}
 	  {0ex}
 	  {\SUF@SEC@StyleSwitch}
 	\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]	 
 \else
 \titleformat{\section}[hang]
-	  {\SUF@lr@SECswitch}
-	  {\thesection}
+	  {\SUF@lr@SECSwitch}
+	  {\SUF@thesection\SUF@dotsec}
 	  {1em}
 	  {\SUF@SEC@StyleSwitch}
 	\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]	  
-\fi	 
+\fi
 %    \end{macrocode}
 % \DescribeMacro{\subsection}
 %    \begin{macrocode}
 \ifsuftesi@numparsubsec
 \titleformat{\subsection}[display]
-	  {\SUF@lr@SUBSECswitch}
+	  {\SUF@lr@SUBSECSwitch}
 	  {\textnormal\thesubsection}
 	  {0ex}
 	  {\SUF@SUBSEC@StyleSwitch}
 	\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\subsection}[hang]
-	  {\SUF@lr@SUBSECswitch}
+	  {\SUF@lr@SUBSECSwitch}
 	  {\textnormal\thesubsection}
 	  {1em}
 	  {\SUF@SUBSEC@StyleSwitch}
@@ -1518,20 +1845,135 @@
 %    \begin{macrocode}
 \ifsuftesi@numparsubsubsec
 \titleformat{\subsubsection}[display]
-	  {\SUF@lr@SUBSUBSECswitch}
+	  {\SUF@lr@SUBSUBSECSwitch}
 	  {\textnormal\thesubsubsection}
 	  {0ex}
 	  {\SUF@SUBSUBSEC@StyleSwitch}
 	\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
 \else
 \titleformat{\subsubsection}[hang]
-	  {\SUF@lr@SUBSUBSECswitch}
+	  {\SUF@lr@SUBSUBSECSwitch}
 	  {\textnormal\thesubsubsection}
 	  {1em}
 	  {\SUF@SUBSUBSEC@StyleSwitch}
 	\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
   \fi
+}
+\ifsuftesi@elementschap
+\RequirePackage{extramarks}
+  \SUF@elements@CHAPTER
+  \SUF@elements@SECTIONS
+\ifsuftesi@periodical
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
+\else
+\ifsuftesi@compact
+  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
+\else
+\ifsuftesi@supercompact
+  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
+\else
+\ifsuftesi@elementspagelayout
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=60,chapposition=-73}
+\else
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=90,chapposition=-83}
+      \fi
+    \fi
+  \fi
+\fi
+\else
+  \SUF@default@CHAPTER
+  \SUF@default@SECTIONS
+\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
+\fi
+%    \end{macrocode}
+% \subparagraph{Redefinitions for \opt{`article'} mode}
+%    \begin{macrocode}
+\ifsuftesi@article
+\def\chapter#1{\ClassError{suftesi}
+  {\noexpand\chapter level is not defined 
+     using 'documentstructure=article'}
+  {\noexpand\chapter level is not defined 
+     using 'documentstructure=article'}}
+  \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}
+%    \end{macrocode}
+% The \opt{partpage} options allows you to print a standard part page
+% in \opt{article} mode.
+%    \begin{macrocode}
+\ifsuftesi@partpage
+  \relax
+    \else
+%    \end{macrocode}
+% In \opt{article} mode the \cmd{part} command is similar to a 
+% \cmd{section} but with more vertical space before and after. 
+%    \begin{macrocode}  
+  \titleclass{\part}{straight}
+  \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\fi
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {1em}
+  {\SUF@PART@StyleSwitch}
+\fi
+\else
+%    \end{macrocode}
+% \subparagraph{The default \opt{`book'} mode}
+%    \begin{macrocode}
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {1em}
+  {\SUF@PART@StyleSwitch}
 \fi
+\fi
+
 %    \end{macrocode}
 % \DescribeMacro{\paragraph}
 %    \begin{macrocode}
@@ -1553,7 +1995,6 @@
   [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 %    \end{macrocode}
-% \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},
@@ -1699,7 +2140,6 @@
 }
 \else
 %    \end{macrocode}
-% \DescribeMacro{\maketitle} 
 % For |notitlepage| option:
 %    \begin{macrocode}
 \renewcommand\maketitle{\par
@@ -1762,26 +2202,36 @@
    \vskip 1.5em}
 \fi
 %    \end{macrocode}
-% \subsection{The frontispiece}
+% \subsection{Frontispiece}
 %    \begin{macrocode}
 \AtBeginDocument{%
-\@ifpackageloaded{frontespizio}{%
-      \ifsuftesi@periodical
-          \Margini {5.5cm}{7cm}{4.5cm}{1cm}
+\@ifpackagewith{frontespizio}{suftesi}
+     {\ifsuftesi@periodical
+          \Margini {5.5cm}{7cm}{4.5cm}{0cm}
         \else
       \ifsuftesi@compact
-          \Margini{1cm}{7cm}{6cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {4.5cm}{7cm}{4.5cm}{0cm}
         \else
           \ifsuftesi@supercompact
-          \Margini{1cm}{10cm}{8cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {4.5cm}{10cm}{6cm}{1cm}
         \else
      \fi
   \fi
-\fi
-  }%
-{\relax}}
+\fi}
+{\@ifpackageloaded{frontespizio}
+     {\ifsuftesi@periodical
+          \Margini {1cm}{7cm}{5cm}{1cm}
+        \else
+      \ifsuftesi@compact
+          \Margini {1cm}{7cm}{6cm}{1cm}
+        \else
+          \ifsuftesi@supercompact
+          \Margini {1cm}{10cm}{8cm}{1cm}
+        \else
+     \fi
+  \fi
+\fi}
+{\relax}}}
 %    \end{macrocode}
 % \begin{environment}{theindex}
 %    \begin{macrocode}
@@ -1791,10 +2241,14 @@
                 \else
                   \@restonecoltrue
                 \fi
+                \ifsuftesi@article
+                \twocolumn[\section*{\indexname}]%
+                \else
                 \twocolumn[\@makeschapterhead{\indexname}]%
+                \fi
                 \@mkboth{\indexname}{\indexname}%
                 \thispagestyle{plain}%
-                \raggedright\small%
+                \raggedright%
                 \parindent\z@
                 \parskip\z@ \@plus .3\p@\relax
                 \columnseprule \z@
@@ -1859,7 +2313,7 @@
           \renewcommand\appendix{\par
               \setcounter{section}{0}%
               \setcounter{subsection}{0}%
-              \gdef\thesection{\@Alph\c@section}}
+              \gdef\SUF@thesection{\@Alph\c@section}}
    \else
          \renewcommand\appendix{\par
              \setcounter{chapter}{0}%
@@ -1879,7 +2333,7 @@
 %    \end{macrocode}
 % \paragraph{The \opt{elements} headers}
 %    \begin{macrocode}
-\ifsuftesi@elements% 
+\ifsuftesi@elementsheader% 
   \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
   \renewcommand{\sectionmark}[1]{\markright{#1}}
 		 \fancypagestyle{elements}{%
@@ -1906,17 +2360,17 @@
 	\renewcommand{\chaptermark}[1]{%
 	    \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
 	\ifsuftesi@article
-	  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+	  \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}}
 	    \else
 	  \renewcommand{\sectionmark}[1]{}
 	\fi
 \fi
 %    \end{macrocode}
-% \subparagraph{The \opt{plain} style}
+% \paragraph{The \opt{plain} style}
 %    \begin{macrocode}
-\fancypagestyle{plain}{\pagestyle{sufplain}}
+\fancypagestyle{plain}{\fancyhf{}}
 %    \end{macrocode}
-% \subparagraph{The \opt{sufplain} style}
+% \paragraph{The \opt{sufplain} style}
 %    \begin{macrocode}
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
@@ -1924,18 +2378,8 @@
    \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
  \fancyfoot[C]{\footnotesize\SUF@thepage}}
 %    \end{macrocode}
-% \subparagraph{The \opt{centerheader} style}
+% \paragraph{The \opt{centerheader} style}
 %    \begin{macrocode}
-\def\SUF@LR@MarkSwitch{%
-   \ifsuftesi@article
-     \ifsuftesi@authortitle
-       \SUF@leftmark
-         \else
-           \SUF@rightmark
-         \fi
-       \else
-     \SUF@leftmark
-   \fi}
 \fancypagestyle{centerheader}{%
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
@@ -1946,7 +2390,7 @@
   \fancyfoot[C]{\footnotesize\SUF@thepage}%
   }%
 %    \end{macrocode}
-% \subparagraph{The \opt{sufdefault} style}
+% \paragraph{The \opt{sufdefault} style}
 %    \begin{macrocode}
 \fancypagestyle{sufdefault}{%
   \fancyhf{}%
@@ -1957,35 +2401,15 @@
   \fancyhead[RE]{\footnotesize\xheadbreakfalse%
     \SUF@LR@MarkSwitch}
   }%
-\ifsuftesi@italicRhead
-  \def\SUF@Rheadstyle{\itshape}
-    \else
-      \ifsuftesi@smallcapsRhead
-        \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
-      \else
-    \def\SUF@Rheadstyle{}
-  \fi
-\fi
-\ifsuftesi@italicLhead
-  \def\SUF@Lheadstyle{\itshape}
-    \else
-      \ifsuftesi@smallcapsLhead
-        \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
-      \else
-    \def\SUF@Lheadstyle{}
-  \fi
-\fi
-    \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\SUF@thepage{\thepage}
+%
+\ifsuftesi@article
+				\ifsuftesi@authortitle
+				\def\SUF@LR@MarkSwitch{\SUF@leftmark}
+				\else
+				\def\SUF@LR@MarkSwitch{\SUF@rightmark}
+				\fi
+\else
+        \def\SUF@LR@MarkSwitch{\SUF@leftmark}
 \fi
 \def\SUF@leftrightmark{%
  \if@mainmatter\leftmark\else\rightmark\fi} 
@@ -1995,68 +2419,12 @@
 \pagestyle{sufdefault}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
-  \ifsuftesi@elements\pagestyle{elements}\else\fi
+  \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
 %    \end{macrocode}
 % \subsection{Text elements}
-% \subsubsection{Captions}
-%    \begin{macrocode}
-\RequirePackage{caption}
-\ifsuftesi@elements
-  \captionsetup{labelsep=period,font={small,sf},singlelinecheck=false}
-\else
-  \captionsetup{labelsep=period,font=small,singlelinecheck=false}
-\fi
-%    \end{macrocode}
-% \subsubsection{Epigraphs}
-%    \begin{macrocode}
-\RequirePackage{epigraph}
-\ifsuftesi@elements
-  \relax
-    \else
-      \ifsuftesi@sufelements
-        \relax
-      \else
-    \setlength{\beforeepigraphskip}{-3\baselineskip}
-    \setlength{\afterepigraphskip}{2\baselineskip}
-    \setlength{\epigraphrule}{0pt}
-    \renewcommand{\textflush}{flushepinormal}
-    \renewcommand{\sourceflush}{flushepinormal}
-    \renewcommand{\epigraphsize}{\footnotesize}
-  \fi
-\fi
-%    \end{macrocode}
-% \subsubsection{Lists}
-%    \begin{macrocode}
-\RequirePackage[inline]{enumitem}
-    \setlist{labelsep=0.5\parindent,noitemsep,font=\normalfont}
-    \setdescription{font=\normalfont\itshape,noitemsep}
-\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.3\parindent,label=\alph*.}
-    \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.}
-    \setitemize[1]{leftmargin=0pt}
-    \setitemize[2]{leftmargin=1.3\parindent}
-    \setitemize[3]{leftmargin=1.3\parindent}
-  \fi
-\fi
-\renewcommand\labelitemii{\normalfont \textendash}
-%    \end{macrocode}
+%
 % \subsubsection{Block Quotations}
+%
 % \DescribeEnv{quotation}
 % \DescribeEnv{quote}
 % \DescribeEnv{verse}
@@ -2067,30 +2435,17 @@
             {\list{}{\listparindent\parindent%
                      \itemindent    \listparindent
                      \leftmargin     \parindent
-                     \ifsuftesi@ralignquotation
-                      \else
-                        \rightmargin   \parindent
-                       \fi
-                        \parsep        \z@ \@plus\p@}%
+                     \SUF@quote@style                       
+                     \parsep        \z@ \@plus\p@}%
                \item\relax%
-                 \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi\noindent\ignorespaces}
+                 \SUF@quotation@size%
+                 \noindent\ignorespaces}
                {\endlist}
 \renewenvironment{quote}
             {\list{}{\leftmargin \parindent
-                     \ifsuftesi@ralignquotation\
-                      \else
-                        \rightmargin   \parindent
-                       \fi}%
+            \SUF@quote@style}%
                \item\relax%
-                 \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi}%\ignorespaces?
+                 \SUF@quotation@size}%\ignorespaces?
                {\endlist}
 \renewenvironment{verse}
                {\let\\\@centercr
@@ -2100,36 +2455,54 @@
                         \rightmargin  \leftmargin
                         \advance\leftmargin 1.5em}%
                 \item\relax
-                  \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi}
+                 \SUF@quotation@size}
                {\endlist}  
 %    \end{macrocode}
-% \subsubsection{Notes}
-% \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:
+% \paragraph{The \opt{fewfootnotes} option}
+% Enable only with three footnotes per page maximum.
+%    \begin{macrocode}
+\let\oldfootnote\footnote
+\ifsuftesi@fewfootnotes
+\def\@fnsymbol#1{\ensuremath{\ifcase#1
+  \or * \or ** \or *** \ClassError{suftesi}
+  {Too many footnotes\MessageBreak
+  Use class option 'fewfootnote=false'}
+  {Too many footnotes\MessageBreak
+  Use class option 'fewfootnote=false'}
+  \else\@ctrerr\fi}}
+\renewcommand{\footnote}[1]{%
+  \begingroup
+    \@addtoreset{footnote}{page}
+      \renewcommand\thefootnote{\fnsymbol{footnote}}\oldfootnote{#1}
+  \endgroup}
+\else\fi
+%    \end{macrocode}
+% \DescribeMacro{\xfootnote}
+% Prints a footnote with discretionary
+% symbol give in the first argument.
+%    \begin{macrocode}
+\newcommand{\xfootnote}[2]{%
+  \begingroup
+    \addtocounter{footnote}{-1}
+    \@addtoreset{footnote}{page}
+      \renewcommand\thefootnote{\ensuremath{#1}}\oldfootnote{#2}
+  \endgroup}
+%    \end{macrocode}
+% \subsubsection{Marginal notes}
+% \DescribeMacro{\marginpar}
+% The |\marginpar| command is redefined according to the look 
+% of \emph{Classic Thesis} by André \textcite{Miede:2011}
+% \index{Miede, André}. Thanks to Lorenzo 
+% Pantieri\index{Pantieri, Lorenzo} and Enrico 
+% Gregorio\index{Gregorio, Enrico}.
 %    \begin{macrocode}
-       \renewcommand\@makefntext{%
-     \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
-  \fi
-\fi
+\def\SUF@mpsetup{%
 %    \end{macrocode}
-% \DescribeMacro{\marginpar}
-% The |\marginpar| command is redefined according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
+% In the \emph{Elements} (i.e. with \opt{elements} option) 
+% the marginal notes are printed in roman, 
+% but I prefer italic shape for the other options:
 %    \begin{macrocode}
-\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio
-    \ifsuftesi@elements\relax
+    \ifsuftesi@elementsheader\relax
       \else\itshape\fi
     \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
@@ -2140,10 +2513,6 @@
 \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}
 % \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 roman font:
@@ -2175,18 +2544,6 @@
 %    \end{macrocode}
 % \subsubsection{Colophon} 
 % Some useful commands to print a colophon or a copyright notice.
-%    \begin{macrocode}
-\edef\SUF@engine{% 
-  \ifxetex 
-  \noexpand\XeLaTeX 
-  \else 
-      \ifluatex 
-        Lua\noexpand\LaTeX 
-      \else 
-       \noexpand\LaTeX 
-      \fi 
-  \fi}
-%    \end{macrocode}
 % \DescribeMacro{\colophon}
 %    \begin{macrocode}
 \newcommand{\colophon}[3][]{%
@@ -2196,10 +2553,10 @@
      \def\next{#2}
          \ifx\next\@empty\else
             \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          Tutti i diritti riservato
+          Tutti i diritti riservati
         \fi
   \vfill  
-  {\small\noindent Questo lavoro è stato composto con \SUF@engine{}%
+  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
      \def\next{#1}
         \ifx\next\@empty\else su #1 
       \fi usando la classe \textsf{suftesi} di 
@@ -2235,35 +2592,12 @@
   \centering\small #1
   \end{minipage}
   \end{center}
-    \vspace*{\stretch{6}}  
-  }
+    \vspace*{\stretch{6}}}
 %    \end{macrocode}
 % \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.
@@ -2305,17 +2639,16 @@
 \setlength\SUF@label@subparagraph 
     {\dimexpr(\SUF@label@paragraph+.5em)}
 \setlength\SUF@label@figure       
-    {\SUF@label@chapter}
+    {\SUF@label@section}
 \setlength\SUF@label@table        
-    {\SUF@label@chapter}
+    {\SUF@label@section}
 }
 %    \end{macrocode}
-% The part entry is the same in both default and
-% \opt{topcpageleft} style.
+% Part in article mode
 %    \begin{macrocode}
 \titlecontents{part}
   [0em]
-  {\addvspace{3ex}\SUF@tocchapsize\partname~}
+  {\addvspace{3ex}\partname\hspace*{.5em}}
   {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
@@ -2323,7 +2656,7 @@
 %    \end{macrocode}
 % \subsubsection{The \opt{tocpageleft} table of contents}
 %    \begin{macrocode}
-\ifsuftesi@tocpageleft
+\ifsuftesi@pagelefttoc
 %    \end{macrocode}
 % \DescribeMacro{\contentsmargin}
 % First we reset the right margin to zero:
@@ -2379,9 +2712,9 @@
 \setlength\SUF@addto@tochang@subpar       
     {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
 \setlength\SUF@addto@tochang@fig       
-    {\SUF@addto@tochang@chap}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
 \setlength\SUF@addto@tochang@tab       
-    {\SUF@addto@tochang@chap}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
 }
 %    \end{macrocode}
 % \paragraph{TOC entries}
@@ -2390,10 +2723,13 @@
   [\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}}
+   \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}
+     \makebox[1em][l]{\thecontentspage}%
+       \hskip\SUF@addto@tochang@chap}
   {}
   [\addvspace{1ex}]
 \titlecontents{section}
@@ -2451,7 +2787,7 @@
   {}
   {\hskip-\SUF@tochang@fig%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
-     \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \titlecontents{table}
@@ -2488,9 +2824,9 @@
 \setlength\SUF@tocindent@subpar
     {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
 \setlength\SUF@tocindent@fig
-    {\SUF@tocindent@chap}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
 \setlength\SUF@tocindent@tab
-    {\SUF@tocindent@chap}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
 }
 %    \end{macrocode}
 % \paragraph{TOC entries}
@@ -2499,8 +2835,9 @@
   [\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}
+    \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
+    \hspace*{1em}}
+  {\hskip-\SUF@tocindent@chap}
   {\SUF@chaptitlerule\contentspage}
   [\addvspace{1ex}]
 \titlecontents{section}
@@ -2547,15 +2884,15 @@
 \titlecontents{figure}
   [\SUF@tocindent@fig]
   {}
-  {\hskip-\dimexpr(\SUF@label@figure+1em)%
-    \makebox[\SUF@label@figure][l]{\thecontentslabel}}
+  {\hskip-\SUF@tocindent@fig%
+    \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \titlecontents{table}
   [\SUF@tocindent@tab]
   {}
-  {\hskip-\dimexpr(\SUF@label@table+1em)%
-    \makebox[\SUF@label@table][l]{\thecontentslabel}}
+  {\hskip-\SUF@tocindent@tab%
+    \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \fi
@@ -2568,24 +2905,24 @@
 %    \begin{macrocode}
 \ifsuftesi@article 
 \renewcommand\tableofcontents{%
-	\thispagestyle{empty}
-	    \section*{\contentsname
-	        \@mkboth{\contentsname}{\contentsname}}%
+    \vspace{2ex}%
+	    \section*{\contentsname%
+	      \@mkboth{\contentsname}{\contentsname}}%
+        \thispagestyle{empty}
 	    \@starttoc{toc}%
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
-    \section*{\listfigurename}%
-      \@mkboth{\listfigurename}%
-              {\listfigurename}%
+    \section*{\listfigurename%
+       \@mkboth{\listfigurename}{\listfigurename}}%
+     \thispagestyle{empty}
     \@starttoc{lof}%
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
-    \section*{\listtablename}%
-      \@mkboth{%
-          \listtablename}%
-         {\listtablename}%
+    \section*{\listtablename%
+        \@mkboth{\listtablename}{\listtablename}}%
+      \thispagestyle{empty}
     \@starttoc{lot}%
     \vspace{2ex}%
     }
@@ -2599,10 +2936,11 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\contentsname
+    \chapter*{\contentsname%
         \@mkboth{%
             \contentsname}
            {\contentsname}}%
+      \thispagestyle{empty}
     \@starttoc{toc}%
     \if@restonecol\twocolumn\fi
    }
@@ -2612,9 +2950,10 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\listfigurename}%
+    \chapter*{\listfigurename%
       \@mkboth{\listfigurename}%
-              {\listfigurename}%
+              {\listfigurename}}%
+     \thispagestyle{empty}
     \@starttoc{lof}%
     \if@restonecol\twocolumn\fi
     }
@@ -2624,10 +2963,11 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\listtablename}%
+    \chapter*{\listtablename%
       \@mkboth{%
           \listtablename}%
-         {\listtablename}%
+         {\listtablename}}%
+     \thispagestyle{empty}
     \@starttoc{lot}%
     \if@restonecol\twocolumn\fi
     }
@@ -2731,12 +3071,8 @@
 %    \end{macrocode}
 %</class>
 %
-% \subsection{The bibliography file}
-%
 % \iffalse
 %<*bib>
-% \fi
-% \begin{verbatim}
 @book{Morison:1111,
   Author = {Stanley Morison},
   Booktitle = {First Principles of Typography},
@@ -2841,8 +3177,6 @@
   Title = {Gestire la bibliografia con {\LaTeX}},
   Volume = {6},
   Year = {2008}}
-% \end{verbatim}
-% \iffalse
 %</bib>
 % \fi
 % \iffalse
@@ -2861,13 +3195,14 @@ end
 %</fakelogo>
 % \fi
 % \iffalse
-%<*rmstyle1>
+%<*style-roman1>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle1]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman1]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2875,16 +3210,17 @@ rmstyle1]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle1>
+%</style-roman1>
 % \fi
 % \iffalse
-%<*rmstyle2>
+%<*style-roman2>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle2]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman2]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2892,16 +3228,17 @@ rmstyle2]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle2>
+%</style-roman2>
 % \fi
 % \iffalse
-%<*rmstyle3>
+%<*style-roman3>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle3]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman3]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2909,16 +3246,17 @@ rmstyle3]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle3>
+%</style-roman3>
 % \fi
 % \iffalse
-%<*rmstyle4>
+%<*style-roman4>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle4]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman4]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2926,16 +3264,17 @@ rmstyle4]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle4>
+%</style-roman4>
 % \fi
 % \iffalse
-%<*rmstyle5>
+%<*style-roman5>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle5]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman5]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2943,16 +3282,17 @@ rmstyle5]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle5>
+%</style-roman5>
 % \fi
 % \iffalse
-%<*rmstyle6>
+%<*style-roman6>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-rmstyle6]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=roman6]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2960,16 +3300,17 @@ rmstyle6]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</rmstyle6>
+%</style-roman6>
 % \fi
 % \iffalse
-%<*itstyle1>
+%<*style-italic1>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle1]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic1]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2977,16 +3318,17 @@ itstyle1]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle1>
+%</style-italic1>
 % \fi
 % \iffalse
-%<*itstyle2>
+%<*style-italic2>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle2]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic2]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -2994,16 +3336,17 @@ itstyle2]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle2>
+%</style-italic2>
 % \fi
 % \iffalse
-%<*itstyle3>
+%<*style-italic3>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle3]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic3]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3011,16 +3354,17 @@ itstyle3]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle3>
+%</style-italic3>
 % \fi
 % \iffalse
-%<*itstyle4>
+%<*style-italic4>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle4]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic4]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3028,16 +3372,17 @@ itstyle4]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle4>
+%</style-italic4>
 % \fi
 % \iffalse
-%<*itstyle5>
+%<*style-italic5>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle5]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic5]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3045,16 +3390,17 @@ itstyle5]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle5>
+%</style-italic5>
 % \fi
 % \iffalse
-%<*itstyle6>
+%<*style-italic6>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle6]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic6]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3062,16 +3408,17 @@ itstyle6]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle6>
+%</style-italic6>
 % \fi
 % \iffalse
-%<*itstyle7>
+%<*style-italic7>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle7]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic7]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3079,16 +3426,17 @@ itstyle7]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle7>
+%</style-italic7>
 % \fi
 % \iffalse
-%<*itstyle8>
+%<*style-italic8>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle8]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic8]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3096,16 +3444,17 @@ itstyle8]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle8>
+%</style-italic8>
 % \fi
 % \iffalse
-%<*itstyle9>
+%<*style-italic9>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle9]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic9]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3113,16 +3462,17 @@ itstyle9]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle9>
+%</style-italic9>
 % \fi
 % \iffalse
-%<*itstyle10>
+%<*style-italic10>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle10]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic10]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3130,16 +3480,17 @@ itstyle10]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle10>
+%</style-italic10>
 % \fi
 % \iffalse
-%<*itstyle11>
+%<*style-italic11>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle11]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic11]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3147,16 +3498,17 @@ itstyle11]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle11>
+%</style-italic11>
 % \fi
 % \iffalse
-%<*itstyle12>
+%<*style-italic12>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-itstyle12]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=italic12]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3164,16 +3516,17 @@ itstyle12]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</itstyle12>
+%</style-italic12>
 % \fi
 % \iffalse
-%<*scstyle1>
+%<*style-smallcaps1>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle1]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps1]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3181,16 +3534,17 @@ scstyle1]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle1>
+%</style-smallcaps1>
 % \fi
 % \iffalse
-%<*scstyle2>
+%<*style-smallcaps2>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle2]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps2]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3198,16 +3552,17 @@ scstyle2]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle2>
+%</style-smallcaps2>
 % \fi
 % \iffalse
-%<*scstyle3>
+%<*style-smallcaps3>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle3]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps3]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3215,16 +3570,17 @@ scstyle3]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle3>
+%</style-smallcaps3>
 % \fi
 % \iffalse
-%<*scstyle4>
+%<*style-smallcaps4>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle4]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps4]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3232,16 +3588,17 @@ scstyle4]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle4>
+%</style-smallcaps4>
 % \fi
 % \iffalse
-%<*scstyle5>
+%<*style-smallcaps5>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle5]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps5]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3249,16 +3606,17 @@ scstyle5]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle5>
+%</style-smallcaps5>
 % \fi
 % \iffalse
-%<*scstyle6>
+%<*style-smallcaps6>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle6]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps6]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3266,16 +3624,17 @@ scstyle6]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle6>
+%</style-smallcaps6>
 % \fi
 % \iffalse
-%<*scstyle7>
+%<*style-smallcaps7>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle7]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps7]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3283,16 +3642,17 @@ scstyle7]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle7>
+%</style-smallcaps7>
 % \fi
 % \iffalse
-%<*scstyle8>
+%<*style-smallcaps8>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle8]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps8]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3300,16 +3660,17 @@ scstyle8]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle8>
+%</style-smallcaps8>
 % \fi
 % \iffalse
-%<*scstyle9>
+%<*style-smallcaps9>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle9]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps9]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3317,16 +3678,17 @@ scstyle9]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle9>
+%</style-smallcaps9>
 % \fi
 % \iffalse
-%<*scstyle10>
+%<*style-smallcaps10>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle10]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps10]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3334,16 +3696,17 @@ scstyle10]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle10>
+%</style-smallcaps10>
 % \fi
 % \iffalse
-%<*scstyle11>
+%<*style-smallcaps11>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle11]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps11]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3351,16 +3714,17 @@ scstyle11]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle11>
+%</style-smallcaps11>
 % \fi
 % \iffalse
-%<*scstyle12>
+%<*style-smallcaps12>
 %% !TEX encoding = UTF-8 Unicode
 %% !TEX TS-program = XeLaTeX
-\documentclass[periodical,nocrop,
-scstyle12]{suftesi}
+\documentclass[pagelayout=periodical,crop=false,
+style=smallcaps12]{suftesi}
 \usepackage{lipsum,fontspec}
 \setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
 \begin{document}
 \chapter{Titolo del capitolo}
 \section{Dolor sit amet}
@@ -3368,7 +3732,7 @@ scstyle12]{suftesi}
 \subsection{Peniteitiagite}
 \lipsum[9]
 \end{document}
-%</scstyle12>
+%</style-smallcaps12>
 % \fi
 % \iffalse
 %<*collect-examples>
@@ -3387,37 +3751,38 @@ scstyle12]{suftesi}
         \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#1}}}}
     \end{picture}}
 }
+\setcounter{chapter}{2}
 \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}
+\inputex{style-roman1}
+\inputex{style-roman2}
+\inputex{style-roman3}
+\inputex{style-roman4}
+\inputex{style-roman5}
+\inputex{style-roman6}
+\inputex{style-italic1}
+\inputex{style-italic2}
+\inputex{style-italic3}
+\inputex{style-italic4}
+\inputex{style-italic5}
+\inputex{style-italic6}
+\inputex{style-italic7}
+\inputex{style-italic8}
+\inputex{style-italic9}
+\inputex{style-italic10}
+\inputex{style-italic11}
+\inputex{style-italic12}
+\inputex{style-smallcaps1}
+\inputex{style-smallcaps2}
+\inputex{style-smallcaps3}
+\inputex{style-smallcaps4}
+\inputex{style-smallcaps5}
+\inputex{style-smallcaps6}
+\inputex{style-smallcaps7}
+\inputex{style-smallcaps8}
+\inputex{style-smallcaps9}
+\inputex{style-smallcaps10}
+\inputex{style-smallcaps11}
+\inputex{style-smallcaps12}
 \end{document}
 %</collect-examples>
 % \fi
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
index 1c7fb4f8ff8..7090720d439 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
@@ -43,40 +43,40 @@
 
 \Msg{*** Generating the class file ***}
 \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}}
+   \nopreamble\nopostamble
+   \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
+   \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
+   \file{style-roman1.tex}{\from{suftesi.dtx}{style-roman1}}
+   \file{style-roman2.tex}{\from{suftesi.dtx}{style-roman2}}
+   \file{style-roman3.tex}{\from{suftesi.dtx}{style-roman3}}
+   \file{style-roman4.tex}{\from{suftesi.dtx}{style-roman4}}
+   \file{style-roman5.tex}{\from{suftesi.dtx}{style-roman5}}
+   \file{style-roman6.tex}{\from{suftesi.dtx}{style-roman6}}
+   \file{style-italic1.tex}{\from{suftesi.dtx}{style-italic1}}
+   \file{style-italic2.tex}{\from{suftesi.dtx}{style-italic2}}
+   \file{style-italic3.tex}{\from{suftesi.dtx}{style-italic3}}
+   \file{style-italic4.tex}{\from{suftesi.dtx}{style-italic4}}
+   \file{style-italic5.tex}{\from{suftesi.dtx}{style-italic5}}
+   \file{style-italic6.tex}{\from{suftesi.dtx}{style-italic6}}
+   \file{style-italic7.tex}{\from{suftesi.dtx}{style-italic7}}
+   \file{style-italic8.tex}{\from{suftesi.dtx}{style-italic8}}
+   \file{style-italic9.tex}{\from{suftesi.dtx}{style-italic9}}
+   \file{style-italic10.tex}{\from{suftesi.dtx}{style-italic10}}
+   \file{style-italic11.tex}{\from{suftesi.dtx}{style-italic11}}
+   \file{style-italic12.tex}{\from{suftesi.dtx}{style-italic12}}
+   \file{style-smallcaps1.tex}{\from{suftesi.dtx}{style-smallcaps1}}
+   \file{style-smallcaps2.tex}{\from{suftesi.dtx}{style-smallcaps2}}
+   \file{style-smallcaps3.tex}{\from{suftesi.dtx}{style-smallcaps3}}
+   \file{style-smallcaps4.tex}{\from{suftesi.dtx}{style-smallcaps4}}
+   \file{style-smallcaps5.tex}{\from{suftesi.dtx}{style-smallcaps5}}
+   \file{style-smallcaps6.tex}{\from{suftesi.dtx}{style-smallcaps6}}
+   \file{style-smallcaps7.tex}{\from{suftesi.dtx}{style-smallcaps7}}
+   \file{style-smallcaps8.tex}{\from{suftesi.dtx}{style-smallcaps8}}
+   \file{style-smallcaps9.tex}{\from{suftesi.dtx}{style-smallcaps9}}
+   \file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}}
+   \file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}}
+   \file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}}
+   \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 527ac390668..35cb7d84938 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,11 +19,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2012/08/31 v0.9a A class for typesetting theses, books and articles]
-\newif\ifsuftesi@artemisia
+    [2012/09/23 v0.9b A class for typesetting theses, books and articles]
+
+\RequirePackage{xkeyval}
+\newif\ifsuftesi@cmfont
 \newif\ifsuftesi@porson
-\newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@defaultfont
 \newif\ifsuftesi@centerheader
 \newif\ifsuftesi@sufplain
 \newif\ifsuftesi@bozza
@@ -32,384 +32,597 @@
 \newif\ifsuftesi@periodical
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
-\newif\ifsuftesi@elements
 \newif\ifsuftesi@sufelements
 \newif\ifsuftesi@nocrop
-\newif\ifsuftesi@nomarginpar
 \newif\ifsuftesi@dottedtoc
 \newif\ifsuftesi@raggedtoc
-\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@pagelefttoc
+\newif\ifsuftesi@fewfootnotes
+\newif\ifsuftesi@partpage
 \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}
+\newif\ifsuftesi@elementschap
+\newif\ifsuftesi@elementsheader
+\newif\ifsuftesi@elementsstructure
+\newif\ifsuftesi@elementspagelayout
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ExecuteOptions{artemisia,rmstyle1}
 \ProcessOptions
 \relax
 \LoadClass{book}
+\define@choicekey{}{documentstructure}[\val\nr]
+    {book,article}[book]{%
+\ifcase\nr\relax
+\or
+\suftesi@articletrue
+\@titlepagefalse
+\fi}
+\RequirePackage{geometry}
+  \geometry{heightrounded}
+\define@choicekey{}{pagelayout}[\val\nr]
+    {standard,periodical,compact,supercompact,elements}[standard]{%
+\ifcase\nr\relax
+  \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+\geometry{%
+  a4paper,
+  includeheadfoot=true,
+  textwidth=      110mm,
+  textheight=     220mm,
+  marginratio=    1:2,
+  marginparwidth= 30mm,
+   marginparsep=   12pt}
+\or
+\suftesi@periodicaltrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+  includeheadfoot=false,
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     170mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 26mm,
+    marginparsep=   10pt}
+\or
+\suftesi@compacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+  includeheadfoot=false,
+    textheight=     165mm,
+    textwidth=      110mm,
+    paperwidth=     160mm,
+    paperheight=    240mm,
+    marginratio=    2:3,
+    marginparwidth= 22mm,
+    marginparsep=   9pt}
+\or
+\suftesi@supercompacttrue
+  \DeclareRobustCommand{\SUF@chaptersize}{\large}
+  \geometry{
+  includeheadfoot=false,
+    textheight=     150mm,
+    textwidth=      100mm,
+    paperwidth=     140mm,
+    paperheight=    210mm,
+    marginratio=    2:3,
+    marginparwidth= 18mm,
+    marginparsep=   8pt}
+\or
+\suftesi@elementspagelayouttrue
+  \geometry{%
+    includeheadfoot=false,
+    textwidth=      251pt,
+    textheight=     502pt,
+    paperwidth=     374pt,
+    paperheight=    648pt,
+    vmarginratio=   1:2,
+    marginparwidth= 60pt,
+    marginparsep=   18pt,
+    outer=          90pt}
+\fi}
+\define@choicekey{}{partstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@PARTSwitch{\filright}
+\or
+  \def\SUF@lr@PARTSwitch{\filcenter}
+\or
+  \def\SUF@lr@PARTSwitch{\filleft}
+\or%numpar
+  \def\SUF@lr@PARTSwitch{\filright}
+  \suftesi@numparparttrue
+\or
+  \def\SUF@lr@PARTSwitch{\filcenter}
+  \suftesi@numparparttrue
+\or
+  \def\SUF@lr@PARTSwitch{\filleft}
+  \suftesi@numparparttrue
+\fi}
+\define@choicekey{}{chapstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright,elements}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@CHAPSwitch{\filright}
+\or
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+\or
+  \def\SUF@lr@CHAPSwitch{\filleft}
+\or%numparchap
+  \def\SUF@lr@CHAPSwitch{\filright}
+  \suftesi@numparchaptrue
+\or
+  \def\SUF@lr@CHAPSwitch{\filcenter}
+  \suftesi@numparchaptrue
+\or
+  \def\SUF@lr@CHAPSwitch{\filleft}
+  \suftesi@numparchaptrue
+\or
+  \suftesi@elementschaptrue
+\fi}
+\define@choicekey{}{secstyle}[\val\nr]{%
+    left,center,right,parleft,parcenter,parright}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SECSwitch{\filright}
+\or
+  \def\SUF@lr@SECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SECSwitch{\filleft}
+\or%numparsec
+  \def\SUF@lr@SECSwitch{\filright}
+  \suftesi@numparsectrue
+\or
+  \def\SUF@lr@SECSwitch{\filcenter}
+  \suftesi@numparsectrue
+\or
+  \def\SUF@lr@SECSwitch{\filleft}
+  \suftesi@numparsectrue
+\fi}
+\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SUBSECSwitch{\filright}
+\or
+  \def\SUF@lr@SUBSECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SUBSECSwitch{\filleft}
+\fi}
+\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
+\ifcase\nr\relax
+  \def\SUF@lr@SUBSUBSECSwitch{\filright}
+\or
+  \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+\or
+  \def\SUF@lr@SUBSUBSECSwitch{\filleft}
+\fi}
+\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@PART@StyleSwitch{\relax}
+\or
+\def\SUF@PART@StyleSwitch{\itshape}
+\or
+\def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@CHAP@StyleSwitch{\relax}
+\or
+\def\SUF@CHAP@StyleSwitch{\itshape}
+\or
+\def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+\def\SUF@SEC@StyleSwitch{\relax}
+\or
+\def\SUF@SEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@SUBSEC@StyleSwitch{\relax}
+\or
+\def\SUF@SUBSEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@SUBSUBSEC@StyleSwitch{\relax}
+\or
+\def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
+\or
+\def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{partnumstyle}[\val\nr]
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+  \def\SUF@thepart{\arabic{part}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\textsc{\roman{part}}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\Roman{part}}
+  \def\SUF@dotpart{}
+\or
+  \def\SUF@thepart{\arabic{part}}
+  \def\SUF@dotpart{.}
+\or
+  \def\SUF@thepart{\textsc{\roman{part}}}
+  \def\SUF@dotpart{.}
+\or
+  \def\SUF@thepart{\Roman{part}}
+  \def\SUF@dotpart{.}
+\fi}
+\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+  \def\SUF@thechapter{\arabic{chapter}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\textsc{\roman{chapter}}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\Roman{chapter}}
+  \def\SUF@dotchap{}
+\or
+  \def\SUF@thechapter{\arabic{chapter}}
+  \def\SUF@dotchap{.}
+\or
+  \def\SUF@thechapter{\textsc{\roman{chapter}}}
+  \def\SUF@dotchap{.}
+\or
+  \def\SUF@thechapter{\Roman{chapter}}
+  \def\SUF@dotchap{.}
+\fi}
+\define@choicekey{}{secnumstyle}[\val\nr]
+    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifsuftesi@article
+\ifcase\nr\relax
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@dotsec{}
+\or
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{.}
+\or
+  \def\SUF@thesection{\textsc{\roman{section}}}
+  \def\SUF@dotsec{.}
+\or
+  \def\SUF@thesection{\Roman{section}}
+  \def\SUF@dotsec{.}
+\fi
+\else
+  \def\SUF@thesection{\arabic{section}}
+  \def\SUF@dotsec{}
+\fi}
+\define@choicekey{}{headerstyle}[\val\nr]
+    {inner,center,plain,authortitleinner,
+     authortitlecenter,elements}[inner]{%
+\ifcase\nr\relax
+  \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+\or
+  \suftesi@centerheadertrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+\or
+  \suftesi@sufplaintrue
+\or
+  \suftesi@authortitletrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+\or
+  \suftesi@authortitletrue
+  \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+  \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+  \suftesi@centerheadertrue
+\or
+  \suftesi@elementsheadertrue
+\fi}
+\define@choicekey{}{headerfont}[\val\nr]
+    {roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+  \def\SUF@Rheadstyle{}
+  \def\SUF@Lheadstyle{}
+  \def\SUF@thepage{\thepage}
+\or
+  \def\SUF@Rheadstyle{\itshape}
+  \def\SUF@Lheadstyle{\itshape}
+  \def\SUF@thepage{\thepage}
+\or
+  \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
+  \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
+  \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
+\fi}
+\RequirePackage[inline]{enumitem}
+\renewcommand\labelitemi{\color{sufgray}\textbullet}
+\setlist{itemsep=.5ex,parsep=0pt}
+\setlist[description]{font=\normalfont\itshape}
+\define@choicekey{}{liststyle}[\val\nr]
+    {bulged,aligned,indented}[bulged]{%
+\ifcase\nr\relax
+    \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=0pt}
+    \setlist[itemize,2]{leftmargin=1.3\parindent}
+    \setlist[itemize,3]{leftmargin=1.3\parindent}
+\or
+    \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=1\parindent}
+    \setlist[itemize,2]{leftmargin=1.5\parindent}
+    \setlist[itemize,3]{leftmargin=1.5\parindent}
+\or
+    \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
+    \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
+    \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
+    \setlist[itemize,1]{leftmargin=2\parindent}
+    \setlist[itemize,2]{leftmargin=2.5\parindent}
+    \setlist[itemize,3]{leftmargin=2.5\parindent}
+\fi}
+\define@choicekey{}{quotestyle}[\val\nr]
+    {center,right}[center]{%
+\ifcase\nr\relax
+\def\SUF@quote@style{\rightmargin=\parindent}
+\or
+\def\SUF@quote@style{}
+\fi}
+\define@choicekey{}{quotesize}[\val\nr]
+    {footnotesize,small}[footnotesize]{%
+\ifcase\nr\relax
+\def\SUF@quotation@size{\footnotesize}
+\or
+\def\SUF@quotation@size{\small}
+\fi}
+\define@choicekey{}{footnotestyle}[\val\nr]
+    {bulged,hung,dotted,superscript}[bulged]{%
+\ifcase\nr\relax
+    \renewcommand\@makefntext{%
+      \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+\or
+    \renewcommand\@makefntext{%
+      \leftskip=1em\hskip-1.5em%
+        \makebox[1em][r]{\@thefnmark}\hskip.5em}
+\or
+    \renewcommand\@makefntext{%
+         \@thefnmark.\hskip.5em}
+\or
+  \renewcommand\@makefntext{%
+    \textsuperscript{\@thefnmark}\hskip.3em}
+\fi}
+\define@choicekey{}{fewfootnotes}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@fewfootnotestrue
+\or
+  \relax
+\fi}
+\RequirePackage{caption}
+\define@choicekey{}{captionstyle}[\val\nr]
+    {standard,elements}[standard]{%
+\ifcase\nr\relax
+   \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+\or
+   \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+   \captionsetup{font+=sf}
+\fi
+}
+\define@choicekey{}{marginpar}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \relax
+\or
+  \renewcommand\marginpar[2][]{}
+\fi}
+\define@choicekey{}{tocstyle}[\val\nr]{%
+    standard,dotted,ragged,leftpage}[standard]{%
+\ifcase\nr\relax
+  \def\SUF@titlerule{\titlerule*{}}
+  \def\SUF@chaptitlerule{\titlerule*{}}
+\or
+\suftesi@dottedtoctrue
+  \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+  \def\SUF@chaptitlerule{\titlerule*{}}
+\or
+\suftesi@raggedtoctrue
+  \def\SUF@titlerule{\hspace{1em}}
+  \def\SUF@chaptitlerule{\hspace{1em}}
+\or
+\suftesi@pagelefttoctrue
+\fi}
+\define@choicekey{}{defaultfont}[\val\nr]{%
+    palatino,standard}[palatino]{%
+\ifcase\nr\relax
+\or
+  \suftesi@cmfonttrue
+  \setkeys{suftesi.cls}{greekfont=cbgreek}
+\fi}
+\define@choicekey{}{greekfont}[\val\nr]{%
+    artemisia,porson,cbgreek}[artemisia]{%
+\ifcase\nr\relax
+\def\SUF@greekfamily{artemisiaeuler}
+\or
+\def\SUF@greekfamily{porson}
+\or
+\def\SUF@greekfamily{lmr}
+\fi}
+\define@choicekey{}{parindent}[\val\nr]
+    {compact,wide}[compact]{%
+\ifcase\nr\relax
+\setlength\parindent{1em}
+\or
+\setlength\parindent{1.5em}
+\fi}
+\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@partpagetrue
+\or
+  \relax
+\fi}
+\define@choicekey{}{crop}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+\or
+  \suftesi@nocroptrue
+\fi}
+\define@choicekey{}{titlepage}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \@titlepagetrue
+\or
+  \@titlepagetrue
+\fi}
+\define@choicekey{}{bozza}[\val\nr]
+    {true,false}[true]{%
+\ifcase\nr\relax
+  \suftesi@bozzatrue
+\or
+\fi}
+\define@choicekey{}{style}[\val\nr]
+  {roman1,roman2,roman3,roman4,roman5,roman6,
+  italic1,italic2,italic3,italic4,italic5,italic6,
+  italic7,italic8,italic9,italic10,italic11,italic12,
+  smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
+  smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
+  elements,sufelements}
+  [roman1]{%
+\ifcase\nr\relax
+  \setkeys{}{chapstyle=left}
+\or
+  \setkeys{}{chapstyle=center}
+\or
+  \setkeys{}{chapstyle=right}
+\or
+  \setkeys{}{chapstyle=parleft}
+\or
+  \setkeys{}{chapstyle=parcenter}
+\or
+  \setkeys{}{chapstyle=parright}
+\or
+  \setkeys{}{chapstyle=left,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=center,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=right,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=italic}
+\or
+  \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=left,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps}
+\or
+  \setkeys{}{
+    pagelayout=elements,
+    headerstyle=elements,
+    chapstyle=elements,
+    secfont=smallcaps,
+    subsecfont=italic,
+    captionstyle=elements}
+\disable@keys{}
+    {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle}
+\or
+  \setkeys{}{
+    chapstyle=elements,
+    headerfont=smallcaps,
+    secfont=smallcaps,
+    subsecfont=italic}
+\disable@keys{}
+    {headerstyle,chapstyle,secfont,subsecfont}
+\fi}
+\ExecuteOptionsX<>{
+  marginpar=true,
+  captionstyle=standard,
+  parindent=compact,
+  tocstyle=standard,
+  greekfont=artemisia,
+  pagelayout=standard,
+  headerstyle=inner,
+  liststyle=bulged,
+  footnotestyle=bulged,
+  quotesize=footnotesize,
+  quotestyle=center,
+  partstyle=left,
+  chapstyle=left,
+  secstyle=left,
+  subsecstyle=left,
+  subsubsecstyle=left,
+  partfont=roman,
+  chapfont=roman,
+  secfont=italic,
+  subsecfont=roman,
+  subsubsecfont=roman,
+  headerfont=roman,
+  secnumstyle=arabic,
+  partnumstyle=Roman,
+  chapnumstyle=arabic}
+\ProcessOptionsX<>\relax
 \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
-\RequirePackage{textcase}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{mparhack}
+\RequirePackage{textcase}
+\RequirePackage{ifxetex,ifluatex}
 \ifxetex
    \relax
       \else
+\RequirePackage{microtype}
 \RequirePackage[LGR,T1]{fontenc}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
-\ifsuftesi@defaultfont
+\ifsuftesi@cmfont
   \relax
-    \else
-\RequirePackage[osf,sc]{mathpazo}
-\RequirePackage[scaled=0.8]{beramono}
-   \linespread{1.05}
-    \renewcommand{\sfdefault}{iwona}
-  \fi
-\ifsuftesi@artemisia
-\def\SUF@greekfamily{artemisiaeuler}
-    \fi
-\ifsuftesi@defaultgreek
-\def\SUF@greekfamily{cmr}
-    \fi
+   \else
+     \RequirePackage[osf,sc]{mathpazo}
+     \RequirePackage[scaled=0.8]{beramono}
+       \renewcommand{\sfdefault}{iwona}
+\fi
 \ifsuftesi@porson
 \sbox\z@{\fontsize{10}{10}\normalfont A}
 \sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A}
@@ -427,89 +640,17 @@
 \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\SUF@greekfamily{porson}
    \fi
 \AtBeginDocument{
   \DeclareRobustCommand{\greektext}{%
     \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont
     \def\encodingdefault{LGR}}}
 \fi
-\RequirePackage{geometry}
-\ifsuftesi@defaultparindent
-  \relax
-    \else
-  \parindent1em
-\fi
-  \geometry{heightrounded}
 \ifsuftesi@nocrop
   \relax
     \else
   \RequirePackage[a4,cam,center]{crop}
 \fi
-\ifsuftesi@periodical
-  \geometry{
-    textheight=     165mm,
-    textwidth=      110mm,
-    paperwidth=     170mm,
-    paperheight=    240mm,
-    marginratio=    2:3,
-    marginparwidth= 75pt,
-    marginparsep=   10pt}
-\else
-\ifsuftesi@compact
-  \geometry{
-    textheight=     165mm,
-    textwidth=      110mm,
-    paperwidth=     160mm,
-    paperheight=    240mm,
-    marginratio=    2:3,
-    marginparwidth= 65pt,
-    marginparsep=   10pt}
-\else
-\ifsuftesi@supercompact
-  \geometry{
-    textheight=     150mm,
-    textwidth=      100mm,
-    paperwidth=     140mm,
-    paperheight=    210mm,
-    marginratio=    2:3,
-    marginparwidth= 50pt,
-    marginparsep=   9pt}
-\else
-\ifsuftesi@elements
-  \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
  \if@twoside
    \relax
      \else
@@ -518,27 +659,14 @@
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifsuftesi@periodical
-  \DeclareRobustCommand{\SUF@chaptersize}{\large}
-    \else
-      \ifsuftesi@compact
-       \DeclareRobustCommand{\SUF@chaptersize}{\large}
-         \else
-           \ifsuftesi@supercompact
-          \DeclareRobustCommand{\SUF@chaptersize}{\large}
-        \else
-      \DeclareRobustCommand{\SUF@chaptersize}{\Large}
-    \fi
-  \fi
-\fi
 \ifxetex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
-      \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}}
-      \chapnumfont{Palatino}
+      \def\SUF@chapnumfont{#1}}
+      \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
 \else
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\MakeTextLowercase{\textls[110]{#1}}}%
@@ -548,103 +676,28 @@
     \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
 \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]
-     {}%
+\define@key[SUF]{elements}{chapsize}[90]{%
+  \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}}
+\define@key[SUF]{elements}{chapposition}[-83]{%
+  \def\cmdSUF@elements@chapposition{#1}}
+\def\SUF@elements@CHAPTER{%
+  \titleformat{\chapter}[block]
+     {\Large}%
      {\begin{picture}(0,0)
      \setlength{\unitlength}{1pt}
      \SUF@chapnumfont%
-     \ifsuftesi@elements
-       \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%
-       \def\SUF@chapnumpos{-83}
-     \fi
-     \put(0,\SUF@chapnumpos){%
-       \hskip\dimexpr(\textwidth+\marginparsep)%
-       \textcolor{sufgray}{\SUF@thechapter}}%
+     \cmdSUF@elements@chapsize
+      \put(0,\cmdSUF@elements@chapposition){%
+       \hskip\dimexpr(\textwidth+0.9\marginparsep)%
+        \textcolor{sufgray}{\SUF@thechapter}}%
    \end{picture}}%
   {0pt}
-  {\Large\SUF@titlesmallcaps}
-  [\rule{\textwidth}{.1pt}]
-  \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]
+  {\SUF@titlesmallcaps}
+  [\vspace*{-6pt}\rule{\textwidth}{.1pt}]
+  }
+\def\SUF@elements@SECTIONS{
 \titleformat{\section}[block]
-  {\filright}
+  {\extramarks{}{}\filright}
   {\textnormal\thesection}
   {1em}
   {\SUF@titlesmallcaps}
@@ -661,88 +714,8 @@
   {1em}
   {}
   \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
-\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
+\def\SUF@default@CHAPTER{
 \ifsuftesi@numparchap
   \titleformat{\chapter}[display]
     {\SUF@chaptersize\SUF@lr@CHAPSwitch}
@@ -760,50 +733,33 @@
   \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
+\fi}
+\def\SUF@default@SECTIONS{
 \ifsuftesi@numparsec
 \titleformat{\section}[display]
-  {\SUF@lr@SECswitch}
-  {\thesection}
+  {\SUF@lr@SECSwitch}
+  {\SUF@thesection\SUF@dotsec}
   {0ex}
   {\SUF@SEC@StyleSwitch}
 \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\section}[hang]
-  {\SUF@lr@SECswitch}
-  {\thesection}
+  {\SUF@lr@SECSwitch}
+  {\SUF@thesection\SUF@dotsec}
   {1em}
   {\SUF@SEC@StyleSwitch}
 \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
 \fi
 \ifsuftesi@numparsubsec
 \titleformat{\subsection}[display]
-  {\SUF@lr@SUBSECswitch}
+  {\SUF@lr@SUBSECSwitch}
   {\textnormal\thesubsection}
   {0ex}
   {\SUF@SUBSEC@StyleSwitch}
 \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\subsection}[hang]
-  {\SUF@lr@SUBSECswitch}
+  {\SUF@lr@SUBSECSwitch}
   {\textnormal\thesubsection}
   {1em}
   {\SUF@SUBSEC@StyleSwitch}
@@ -811,20 +767,121 @@
 \fi
 \ifsuftesi@numparsubsubsec
 \titleformat{\subsubsection}[display]
-  {\SUF@lr@SUBSUBSECswitch}
+  {\SUF@lr@SUBSUBSECSwitch}
   {\textnormal\thesubsubsection}
   {0ex}
   {\SUF@SUBSUBSEC@StyleSwitch}
 \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 \titleformat{\subsubsection}[hang]
-  {\SUF@lr@SUBSUBSECswitch}
+  {\SUF@lr@SUBSUBSECSwitch}
   {\textnormal\thesubsubsection}
   {1em}
   {\SUF@SUBSUBSEC@StyleSwitch}
 \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
   \fi
+}
+\ifsuftesi@elementschap
+\RequirePackage{extramarks}
+  \SUF@elements@CHAPTER
+  \SUF@elements@SECTIONS
+\ifsuftesi@periodical
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
+\else
+\ifsuftesi@compact
+  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
+\else
+\ifsuftesi@supercompact
+  \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
+\else
+\ifsuftesi@elementspagelayout
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=60,chapposition=-73}
+\else
+  \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
+    \setkeys[SUF]{elements}{chapsize=90,chapposition=-83}
+      \fi
+    \fi
+  \fi
+\fi
+\else
+  \SUF@default@CHAPTER
+  \SUF@default@SECTIONS
+\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
 \fi
+\ifsuftesi@article
+\def\chapter#1{\ClassError{suftesi}
+  {\noexpand\chapter level is not defined
+     using 'documentstructure=article'}
+  {\noexpand\chapter level is not defined
+     using 'documentstructure=article'}}
+  \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}
+\ifsuftesi@partpage
+  \relax
+    \else
+  \titleclass{\part}{straight}
+  \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\fi
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {1em}
+  {\SUF@PART@StyleSwitch}
+\fi
+\else
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {2ex}
+  {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+  {\SUF@chaptersize\SUF@lr@PARTSwitch}
+  {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
+  {1em}
+  {\SUF@PART@StyleSwitch}
+\fi
+\fi
+
 \titleformat{\paragraph}[runin]
   {}
   {\theparagraph}
@@ -1025,33 +1082,47 @@
    \vskip 1.5em}
 \fi
 \AtBeginDocument{%
-\@ifpackageloaded{frontespizio}{%
-      \ifsuftesi@periodical
-          \Margini {5.5cm}{7cm}{4.5cm}{1cm}
+\@ifpackagewith{frontespizio}{suftesi}
+     {\ifsuftesi@periodical
+          \Margini {5.5cm}{7cm}{4.5cm}{0cm}
         \else
       \ifsuftesi@compact
-          \Margini{1cm}{7cm}{6cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {4.5cm}{7cm}{4.5cm}{0cm}
         \else
           \ifsuftesi@supercompact
-          \Margini{1cm}{10cm}{8cm}{1cm}%
-          \Rientro{1cm}%
+          \Margini {4.5cm}{10cm}{6cm}{1cm}
         \else
      \fi
   \fi
-\fi
-  }%
-{\relax}}
+\fi}
+{\@ifpackageloaded{frontespizio}
+     {\ifsuftesi@periodical
+          \Margini {1cm}{7cm}{5cm}{1cm}
+        \else
+      \ifsuftesi@compact
+          \Margini {1cm}{7cm}{6cm}{1cm}
+        \else
+          \ifsuftesi@supercompact
+          \Margini {1cm}{10cm}{8cm}{1cm}
+        \else
+     \fi
+  \fi
+\fi}
+{\relax}}}
 \renewenvironment{theindex}
                {\if@twocolumn
                   \@restonecolfalse
                 \else
                   \@restonecoltrue
                 \fi
+                \ifsuftesi@article
+                \twocolumn[\section*{\indexname}]%
+                \else
                 \twocolumn[\@makeschapterhead{\indexname}]%
+                \fi
                 \@mkboth{\indexname}{\indexname}%
                 \thispagestyle{plain}%
-                \raggedright\small%
+                \raggedright%
                 \parindent\z@
                 \parskip\z@ \@plus .3\p@\relax
                 \columnseprule \z@
@@ -1107,7 +1178,7 @@
           \renewcommand\appendix{\par
               \setcounter{section}{0}%
               \setcounter{subsection}{0}%
-              \gdef\thesection{\@Alph\c@section}}
+              \gdef\SUF@thesection{\@Alph\c@section}}
    \else
          \renewcommand\appendix{\par
              \setcounter{chapter}{0}%
@@ -1121,7 +1192,7 @@
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{Version of \today}}
-\ifsuftesi@elements%
+\ifsuftesi@elementsheader%
   \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
   \renewcommand{\sectionmark}[1]{\markright{#1}}
  \fancypagestyle{elements}{%
@@ -1145,27 +1216,17 @@
 \renewcommand{\chaptermark}[1]{%
     \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
 \ifsuftesi@article
-  \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+  \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}}
     \else
   \renewcommand{\sectionmark}[1]{}
 \fi
 \fi
-\fancypagestyle{plain}{\pagestyle{sufplain}}
+\fancypagestyle{plain}{\fancyhf{}}
 \fancypagestyle{sufplain}{%
  \fancyhf{}%
  \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
-         \else
-           \SUF@rightmark
-         \fi
-       \else
-     \SUF@leftmark
-   \fi}
 \fancypagestyle{centerheader}{%
   \fancyhf{}%
   \fancyfoot[RE,LO]{%
@@ -1184,119 +1245,36 @@
   \fancyhead[RE]{\footnotesize\xheadbreakfalse%
     \SUF@LR@MarkSwitch}
   }%
-\ifsuftesi@italicRhead
-  \def\SUF@Rheadstyle{\itshape}
-    \else
-      \ifsuftesi@smallcapsRhead
-        \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
-      \else
-    \def\SUF@Rheadstyle{}
-  \fi
-\fi
-\ifsuftesi@italicLhead
-  \def\SUF@Lheadstyle{\itshape}
-    \else
-      \ifsuftesi@smallcapsLhead
-        \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
-      \else
-    \def\SUF@Lheadstyle{}
-  \fi
+\ifsuftesi@article
+\ifsuftesi@authortitle
+\def\SUF@LR@MarkSwitch{\SUF@leftmark}
+\else
+\def\SUF@LR@MarkSwitch{\SUF@rightmark}
 \fi
-    \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\SUF@thepage{\thepage}
+\else
+        \def\SUF@LR@MarkSwitch{\SUF@leftmark}
 \fi
 \def\SUF@leftrightmark{%
  \if@mainmatter\leftmark\else\rightmark\fi}
 \pagestyle{sufdefault}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
-  \ifsuftesi@elements\pagestyle{elements}\else\fi
-\RequirePackage{caption}
-\ifsuftesi@elements
-  \captionsetup{labelsep=period,font={small,sf},singlelinecheck=false}
-\else
-  \captionsetup{labelsep=period,font=small,singlelinecheck=false}
-\fi
-\RequirePackage{epigraph}
-\ifsuftesi@elements
-  \relax
-    \else
-      \ifsuftesi@sufelements
-        \relax
-      \else
-    \setlength{\beforeepigraphskip}{-3\baselineskip}
-    \setlength{\afterepigraphskip}{2\baselineskip}
-    \setlength{\epigraphrule}{0pt}
-    \renewcommand{\textflush}{flushepinormal}
-    \renewcommand{\sourceflush}{flushepinormal}
-    \renewcommand{\epigraphsize}{\footnotesize}
-  \fi
-\fi
-\RequirePackage[inline]{enumitem}
-    \setlist{labelsep=0.5\parindent,noitemsep,font=\normalfont}
-    \setdescription{font=\normalfont\itshape,noitemsep}
-\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.3\parindent,label=\alph*.}
-    \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.}
-    \setitemize[1]{leftmargin=0pt}
-    \setitemize[2]{leftmargin=1.3\parindent}
-    \setitemize[3]{leftmargin=1.3\parindent}
-  \fi
-\fi
-\renewcommand\labelitemii{\normalfont \textendash}
+  \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
 \renewenvironment{quotation}
             {\list{}{\listparindent\parindent%
                      \itemindent    \listparindent
                      \leftmargin     \parindent
-                     \ifsuftesi@ralignquotation
-                      \else
-                        \rightmargin   \parindent
-                       \fi
-                        \parsep        \z@ \@plus\p@}%
+                     \SUF@quote@style
+                     \parsep        \z@ \@plus\p@}%
                \item\relax%
-                 \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi\noindent\ignorespaces}
+                 \SUF@quotation@size%
+                 \noindent\ignorespaces}
                {\endlist}
 \renewenvironment{quote}
             {\list{}{\leftmargin \parindent
-                     \ifsuftesi@ralignquotation\
-                      \else
-                        \rightmargin   \parindent
-                       \fi}%
+            \SUF@quote@style}%
                \item\relax%
-                 \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi}%\ignorespaces?
+                 \SUF@quotation@size}%\ignorespaces?
                {\endlist}
 \renewenvironment{verse}
                {\let\\\@centercr
@@ -1306,24 +1284,31 @@
                         \rightmargin  \leftmargin
                         \advance\leftmargin 1.5em}%
                 \item\relax
-                  \ifsuftesi@smallquotation
-                   \small
-                     \else
-                   \footnotesize
-                 \fi}
+                 \SUF@quotation@size}
                {\endlist}
-\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
+\let\oldfootnote\footnote
+\ifsuftesi@fewfootnotes
+\def\@fnsymbol#1{\ensuremath{\ifcase#1
+  \or * \or ** \or *** \ClassError{suftesi}
+  {Too many footnotes\MessageBreak
+  Use class option 'fewfootnote=false'}
+  {Too many footnotes\MessageBreak
+  Use class option 'fewfootnote=false'}
+  \else\@ctrerr\fi}}
+\renewcommand{\footnote}[1]{%
+  \begingroup
+    \@addtoreset{footnote}{page}
+      \renewcommand\thefootnote{\fnsymbol{footnote}}\oldfootnote{#1}
+  \endgroup}
+\else\fi
+\newcommand{\xfootnote}[2]{%
+  \begingroup
+    \addtocounter{footnote}{-1}
+    \@addtoreset{footnote}{page}
+      \renewcommand\thefootnote{\ensuremath{#1}}\oldfootnote{#2}
+  \endgroup}
+\def\SUF@mpsetup{%
+    \ifsuftesi@elementsheader\relax
       \else\itshape\fi
     \footnotesize%
     \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
@@ -1334,10 +1319,6 @@
 \renewcommand{\marginpar}[1]{\oldmarginpar%
  [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
  {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
-\ifsuftesi@nomarginpar
-    \renewcommand\marginpar[2][]{}
-     \else
-  \fi
 \if@titlepage
   \newenvironment{abstract}{%
       \titlepage
@@ -1362,16 +1343,6 @@
       {\if@twocolumn\else\endquotation\fi}
 \fi
 \newcommand\abstractname{Abstract}
-\edef\SUF@engine{%
-  \ifxetex
-  \noexpand\XeLaTeX
-  \else
-      \ifluatex
-        Lua\noexpand\LaTeX
-      \else
-       \noexpand\LaTeX
-      \fi
-  \fi}
 \newcommand{\colophon}[3][]{%
   \thispagestyle{empty}
   \null
@@ -1379,10 +1350,10 @@
      \def\next{#2}
          \ifx\next\@empty\else
             \noindent Copyright \copyright{} \the\year~#2\\[1ex]
-          Tutti i diritti riservato
+          Tutti i diritti riservati
         \fi
   \vfill
-  {\small\noindent Questo lavoro è stato composto con \SUF@engine{}%
+  {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
      \def\next{#1}
         \ifx\next\@empty\else su #1
       \fi usando la classe \textsf{suftesi} di
@@ -1409,26 +1380,8 @@
   \centering\small #1
   \end{minipage}
   \end{center}
-    \vspace*{\stretch{6}}
-  }
+    \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}}
@@ -1456,18 +1409,18 @@
 \setlength\SUF@label@subparagraph
     {\dimexpr(\SUF@label@paragraph+.5em)}
 \setlength\SUF@label@figure
-    {\SUF@label@chapter}
+    {\SUF@label@section}
 \setlength\SUF@label@table
-    {\SUF@label@chapter}
+    {\SUF@label@section}
 }
 \titlecontents{part}
   [0em]
-  {\addvspace{3ex}\SUF@tocchapsize\partname~}
+  {\addvspace{3ex}\partname\hspace*{.5em}}
   {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
   [\addvspace{1ex}]
-\ifsuftesi@tocpageleft
+\ifsuftesi@pagelefttoc
 \contentsmargin{0pt}
 \AtBeginDocument{
 \newlength\SUF@tochang@chap
@@ -1515,18 +1468,21 @@
 \setlength\SUF@addto@tochang@subpar
     {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
 \setlength\SUF@addto@tochang@fig
-    {\SUF@addto@tochang@chap}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
 \setlength\SUF@addto@tochang@tab
-    {\SUF@addto@tochang@chap}
+    {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
 }
 \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}}
+   \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}
+     \makebox[1em][l]{\thecontentspage}%
+       \hskip\SUF@addto@tochang@chap}
   {}
   [\addvspace{1ex}]
 \titlecontents{section}
@@ -1584,7 +1540,7 @@
   {}
   {\hskip-\SUF@tochang@fig%
    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
-     \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+     \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {}
 \titlecontents{table}
@@ -1618,16 +1574,17 @@
 \setlength\SUF@tocindent@subpar
     {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
 \setlength\SUF@tocindent@fig
-    {\SUF@tocindent@chap}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
 \setlength\SUF@tocindent@tab
-    {\SUF@tocindent@chap}
+    {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
 }
 \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}
+    \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
+    \hspace*{1em}}
+  {\hskip-\SUF@tocindent@chap}
   {\SUF@chaptitlerule\contentspage}
   [\addvspace{1ex}]
 \titlecontents{section}
@@ -1674,38 +1631,38 @@
 \titlecontents{figure}
   [\SUF@tocindent@fig]
   {}
-  {\hskip-\dimexpr(\SUF@label@figure+1em)%
-    \makebox[\SUF@label@figure][l]{\thecontentslabel}}
+  {\hskip-\SUF@tocindent@fig%
+    \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \titlecontents{table}
   [\SUF@tocindent@tab]
   {}
-  {\hskip-\dimexpr(\SUF@label@table+1em)%
-    \makebox[\SUF@label@table][l]{\thecontentslabel}}
+  {\hskip-\SUF@tocindent@tab%
+    \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
   {}
   {\SUF@titlerule\contentspage}
 \fi
 \ifsuftesi@article
 \renewcommand\tableofcontents{%
-\thispagestyle{empty}
-    \section*{\contentsname
-        \@mkboth{\contentsname}{\contentsname}}%
+    \vspace{2ex}%
+    \section*{\contentsname%
+      \@mkboth{\contentsname}{\contentsname}}%
+        \thispagestyle{empty}
     \@starttoc{toc}%
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
-    \section*{\listfigurename}%
-      \@mkboth{\listfigurename}%
-              {\listfigurename}%
+    \section*{\listfigurename%
+       \@mkboth{\listfigurename}{\listfigurename}}%
+     \thispagestyle{empty}
     \@starttoc{lof}%
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
-    \section*{\listtablename}%
-      \@mkboth{%
-          \listtablename}%
-         {\listtablename}%
+    \section*{\listtablename%
+        \@mkboth{\listtablename}{\listtablename}}%
+      \thispagestyle{empty}
     \@starttoc{lot}%
     \vspace{2ex}%
     }
@@ -1716,10 +1673,11 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\contentsname
+    \chapter*{\contentsname%
         \@mkboth{%
             \contentsname}
            {\contentsname}}%
+      \thispagestyle{empty}
     \@starttoc{toc}%
     \if@restonecol\twocolumn\fi
    }
@@ -1729,9 +1687,10 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\listfigurename}%
+    \chapter*{\listfigurename%
       \@mkboth{\listfigurename}%
-              {\listfigurename}%
+              {\listfigurename}}%
+     \thispagestyle{empty}
     \@starttoc{lof}%
     \if@restonecol\twocolumn\fi
     }
@@ -1741,10 +1700,11 @@
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\listtablename}%
+    \chapter*{\listtablename%
       \@mkboth{%
           \listtablename}%
-         {\listtablename}%
+         {\listtablename}}%
+     \thispagestyle{empty}
     \@starttoc{lot}%
     \if@restonecol\twocolumn\fi
     }