diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
| -rw-r--r-- | Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 1690 |
1 files changed, 1214 insertions, 476 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 36aa0fc4a3e..527ac390668 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -19,19 +19,16 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2012/04/22 v0.9 A class for typesetting theses, books and articles] -\newif\ifsuftesi@centertitle -\newif\ifsuftesi@sctitles + [2012/08/31 v0.9a A class for typesetting theses, books and articles] \newif\ifsuftesi@artemisia \newif\ifsuftesi@porson -\newif\ifsuftesi@defaultfont \newif\ifsuftesi@defaultgreek -\newif\ifsuftesi@centerheadings +\newif\ifsuftesi@defaultfont +\newif\ifsuftesi@centerheader \newif\ifsuftesi@sufplain \newif\ifsuftesi@bozza \newif\ifsuftesi@article \newif\ifsuftesi@authortitle -\newif\ifsuftesi@nofront \newif\ifsuftesi@periodical \newif\ifsuftesi@compact \newif\ifsuftesi@supercompact @@ -41,44 +38,355 @@ \newif\ifsuftesi@nomarginpar \newif\ifsuftesi@dottedtoc \newif\ifsuftesi@raggedtoc -\DeclareOption{centertitle}{\suftesi@centertitletrue} -\DeclareOption{sctitles}{\suftesi@sctitlestrue} -\DeclareOption{disablefront}{\suftesi@nofronttrue} -\DeclareOption{defaultfont}{\suftesi@defaultfonttrue\suftesi@defaultgreektrue} -\DeclareOption{artemisia}{\suftesi@artemisiatrue\suftesi@porsonfalse -\suftesi@defaultgreekfalse} -\DeclareOption{porson}{\suftesi@porsontrue\suftesi@artemisiafalse -\suftesi@defaultgreekfalse} -\DeclareOption{defaultgreek}{\suftesi@defaultgreektrue -\suftesi@artemisiafalse\suftesi@porsonfalse} -\DeclareOption{centerheadings}{\suftesi@centerheadingstrue} -\DeclareOption{sufplain}{\suftesi@sufplaintrue} -\DeclareOption{bozza}{\suftesi@bozzatrue} -\DeclareOption{periodical}{\suftesi@periodicaltrue\suftesi@compacttrue} -\DeclareOption{compact}{\suftesi@compacttrue} -\DeclareOption{supercompact}{\suftesi@supercompacttrue} -\DeclareOption{elements}{\suftesi@elementstrue\suftesi@sufelementstrue -\suftesi@supercompactfalse\suftesi@compactfalse} -\DeclareOption{sufelements}{\suftesi@sufelementstrue\suftesi@sctitlestrue} -\DeclareOption{nocrop}{\suftesi@nocroptrue} -\DeclareOption{nomarginpar}{\suftesi@nomarginpartrue} -\DeclareOption{article}{\suftesi@articletrue} -\DeclareOption{authortitle}{\suftesi@authortitletrue} -\DeclareOption{dottedtoc}{\suftesi@dottedtoctrue} -\DeclareOption{raggedtoc}{\suftesi@raggedtoctrue} +\newif\ifsuftesi@tocpageleft +\newif\ifsuftesi@defaultparindent +\newif\ifsuftesi@standardfootnote +\newif\ifsuftesi@dottedfootnote +\newif\ifsuftesi@alignlist +\newif\ifsuftesi@indentlist +\newif\ifsuftesi@ralignquotation +\newif\ifsuftesi@smallquotation +\newif\ifsuftesi@romanchap +\newif\ifsuftesi@centerpart +\newif\ifsuftesi@centerchap +\newif\ifsuftesi@centersec +\newif\ifsuftesi@centersubsec +\newif\ifsuftesi@rightpart +\newif\ifsuftesi@rightchap +\newif\ifsuftesi@rightsec +\newif\ifsuftesi@rightsubsec +\newif\ifsuftesi@centersubsubsec +\newif\ifsuftesi@rightsubsubsec +\newif\ifsuftesi@numparpart +\newif\ifsuftesi@numparchap +\newif\ifsuftesi@numparsec +\newif\ifsuftesi@numparsubsec +\newif\ifsuftesi@numparsubsubsec +\newif\ifsuftesi@dottedpart +\newif\ifsuftesi@dottedchap +\newif\ifsuftesi@italicpart +\newif\ifsuftesi@italicchap +\newif\ifsuftesi@italicsec +\newif\ifsuftesi@italicsubsec +\newif\ifsuftesi@italicsubsubsec +\newif\ifsuftesi@smallcapspart +\newif\ifsuftesi@smallcapschap +\newif\ifsuftesi@smallcapssec +\newif\ifsuftesi@smallcapssubsec +\newif\ifsuftesi@smallcapssubsubsec +\newif\ifsuftesi@italicLhead +\newif\ifsuftesi@italicRhead +\newif\ifsuftesi@italicheader +\newif\ifsuftesi@smallcapsRhead +\newif\ifsuftesi@smallcapsLhead +\newif\ifsuftesi@smallcapsheader +\DeclareOption{defaultfont}{ + \suftesi@defaultfonttrue + \suftesi@defaultgreektrue} +\DeclareOption{artemisia}{ + \suftesi@artemisiatrue + \suftesi@porsonfalse + \suftesi@defaultgreekfalse} +\DeclareOption{porson}{ + \suftesi@porsontrue + \suftesi@artemisiafalse + \suftesi@defaultgreekfalse} +\DeclareOption{defaultgreek}{ + \suftesi@defaultgreektrue + \suftesi@artemisiafalse + \suftesi@porsonfalse} +\DeclareOption{centerheader}{ + \suftesi@centerheadertrue} +\DeclareOption{sufplain}{ + \suftesi@sufplaintrue} +\DeclareOption{bozza}{ + \suftesi@bozzatrue} +\DeclareOption{periodical}{ + \suftesi@periodicaltrue + \suftesi@compacttrue} +\DeclareOption{compact}{ + \suftesi@compacttrue} +\DeclareOption{supercompact}{ + \suftesi@supercompacttrue} +\DeclareOption{elements}{ + \suftesi@elementstrue + \suftesi@sufelementstrue + \suftesi@articlefalse + \suftesi@smallcapschaptrue + \suftesi@smallcapssectrue + \suftesi@raggedtoctrue + } +\DeclareOption{sufelements}{ + \suftesi@sufelementstrue + \suftesi@smallcapschaptrue + \suftesi@smallcapssectrue + \suftesi@compactfalse + \suftesi@supercompactfalse} +\DeclareOption{nocrop}{ + \suftesi@nocroptrue} +\DeclareOption{nomarginpar}{ + \suftesi@nomarginpartrue} +\DeclareOption{article}{ + \suftesi@articletrue} +\DeclareOption{authortitle}{ + \suftesi@authortitletrue} +\DeclareOption{dottedtoc}{ + \suftesi@dottedtoctrue} +\DeclareOption{raggedtoc}{ + \suftesi@raggedtoctrue} +\DeclareOption{tocpageleft}{ + \suftesi@tocpagelefttrue} +\DeclareOption{defaultparindent}{ + \suftesi@defaultparindenttrue} +\DeclareOption{standardfootnote}{ + \suftesi@standardfootnotetrue} +\DeclareOption{dottedfootnote}{ + \suftesi@dottedfootnotetrue} +\DeclareOption{alignlist}{ + \suftesi@alignlisttrue} +\DeclareOption{indentlist}{ + \suftesi@indentlisttrue} +\DeclareOption{ralignquotation}{ + \suftesi@ralignquotationtrue} +\DeclareOption{smallquotation}{ + \suftesi@smallquotationtrue} +\DeclareOption{centerpart}{ + \suftesi@centerparttrue} +\DeclareOption{centerchap}{ + \suftesi@centerchaptrue} +\DeclareOption{centersec}{ + \suftesi@centersectrue} +\DeclareOption{rightpart}{ + \suftesi@rightparttrue} +\DeclareOption{rightchap}{ + \suftesi@rightchaptrue} +\DeclareOption{rightsec}{ + \suftesi@rightsectrue} +\DeclareOption{numparpart}{ + \suftesi@numparparttrue} +\DeclareOption{numparchap}{ + \suftesi@numparchaptrue} +\DeclareOption{numparsec}{ + \suftesi@numparsectrue} +\DeclareOption{smallcapspart}{ + \suftesi@smallcapsparttrue} +\DeclareOption{smallcapschap}{ + \suftesi@smallcapschaptrue} +\DeclareOption{smallcapssec}{ + \suftesi@smallcapssectrue} +\DeclareOption{italicpart}{ + \suftesi@italicparttrue} +\DeclareOption{italicchap}{ + \suftesi@italicchaptrue} +\DeclareOption{italicsec}{ + \suftesi@italicsectrue} +\DeclareOption{italicsubsec}{ + \suftesi@italicsubsectrue} +\DeclareOption{romanchap}{ + \suftesi@romanchaptrue} +\DeclareOption{dottedpart}{ + \suftesi@dottedparttrue} +\DeclareOption{dottedchap}{ + \suftesi@dottedchaptrue} +\DeclareOption{italicheader}{ + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{smallcapsheader}{ + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{rmstyle1}{ + \suftesi@italicsectrue} +\DeclareOption{rmstyle2}{ + \suftesi@italicsectrue + \suftesi@centerchaptrue} +\DeclareOption{rmstyle3}{ + \suftesi@italicsectrue + \suftesi@rightchaptrue} +\DeclareOption{rmstyle4}{ + \suftesi@italicsectrue + \suftesi@numparchaptrue} +\DeclareOption{rmstyle5}{ + \suftesi@italicsectrue + \suftesi@centerchaptrue + \suftesi@numparchaptrue} +\DeclareOption{rmstyle6}{ + \suftesi@italicsectrue + \suftesi@rightchaptrue + \suftesi@numparchaptrue} +\DeclareOption{itstyle1}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle2}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@centerchaptrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle3}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@rightchaptrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle4}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@numparchaptrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle5}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@centerchaptrue + \suftesi@numparchaptrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle6}{ + \suftesi@italicchaptrue + \suftesi@italicsectrue + \suftesi@rightchaptrue + \suftesi@numparchaptrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle7}{ + \suftesi@italicchaptrue + \suftesi@smallcapssectrue + \suftesi@italicsubsectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle8}{ + \suftesi@italicchaptrue + \suftesi@centerchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle9}{ + \suftesi@italicchaptrue + \suftesi@rightchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle10}{ + \suftesi@italicchaptrue + \suftesi@numparchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle11}{ + \suftesi@italicchaptrue + \suftesi@centerchaptrue + \suftesi@italicsubsectrue + \suftesi@numparchaptrue + \suftesi@smallcapssectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{itstyle12}{ + \suftesi@italicchaptrue + \suftesi@rightchaptrue + \suftesi@italicsubsectrue + \suftesi@numparchaptrue + \suftesi@smallcapssectrue + \suftesi@italicLheadtrue + \suftesi@italicRheadtrue} +\DeclareOption{scstyle1}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle2}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@centerchaptrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle3}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@rightchaptrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle4}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@numparchaptrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle5}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@centerchaptrue + \suftesi@numparchaptrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle6}{ + \suftesi@smallcapschaptrue + \suftesi@italicsectrue + \suftesi@rightchaptrue + \suftesi@numparchaptrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle7}{ + \suftesi@smallcapschaptrue + \suftesi@smallcapssectrue + \suftesi@italicsubsectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle8}{ + \suftesi@smallcapschaptrue + \suftesi@centerchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle9}{ + \suftesi@smallcapschaptrue + \suftesi@rightchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle10}{ + \suftesi@smallcapschaptrue + \suftesi@numparchaptrue + \suftesi@italicsubsectrue + \suftesi@smallcapssectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle11}{ + \suftesi@smallcapschaptrue + \suftesi@centerchaptrue + \suftesi@italicsubsectrue + \suftesi@numparchaptrue + \suftesi@smallcapssectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} +\DeclareOption{scstyle12}{ + \suftesi@smallcapschaptrue + \suftesi@rightchaptrue + \suftesi@italicsubsectrue + \suftesi@numparchaptrue + \suftesi@smallcapssectrue + \suftesi@smallcapsLheadtrue + \suftesi@smallcapsRheadtrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} -\ExecuteOptions{artemisia} +\ExecuteOptions{artemisia,rmstyle1} \ProcessOptions \relax -\LoadClass[a4paper]{book} +\LoadClass{book} \RequirePackage{color} \definecolor{sufred}{rgb}{0.5,0,0} \definecolor{sufgray}{rgb}{0.5,0.5,0.5} \RequirePackage{ifxetex,ifluatex} -\ifxetex\relax - \else - \RequirePackage{microtype} - \fi +\ifxetex + \relax + \else + \RequirePackage{microtype} +\fi \RequirePackage{textcase} \RequirePackage{multicol} \RequirePackage{emptypage} @@ -97,10 +405,10 @@ \renewcommand{\sfdefault}{iwona} \fi \ifsuftesi@artemisia -\def\suftesi@greekfamily{artemisiaeuler} +\def\SUF@greekfamily{artemisiaeuler} \fi \ifsuftesi@defaultgreek -\def\suftesi@greekfamily{cmr} +\def\SUF@greekfamily{cmr} \fi \ifsuftesi@porson \sbox\z@{\fontsize{10}{10}\normalfont A} @@ -109,105 +417,98 @@ \dimexpr(0.001\dimexpr\numexpr(\dimexpr(1000\ht\z@)/\ht\tw@)\p@) \edef\art@scale{\strip@pt\dimen@} \DeclareFontFamily{LGR}{porson}{} -\DeclareFontShape{LGR}{porson}{m}{n}{<-> s * [\art@scale] gporsonrg6a}{} -\DeclareFontShape{LGR}{porson}{m}{it}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{b}{n}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{b}{it}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{m}{sl}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{b}{sl}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{m}{sc}{<-> ssub * porson/m/n}{} -\DeclareFontShape{LGR}{porson}{bx}{n}{<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{m}{n} {<-> s * [\art@scale] gporsonrg6a}{} +\DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{b}{n} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{} +\DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{} \DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{} \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{} - \def\suftesi@greekfamily{porson} + \def\SUF@greekfamily{porson} \fi \AtBeginDocument{ \DeclareRobustCommand{\greektext}{% - \fontencoding{LGR}\fontfamily{\suftesi@greekfamily}\selectfont + \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont \def\encodingdefault{LGR}}} \fi \RequirePackage{geometry} +\ifsuftesi@defaultparindent + \relax + \else \parindent1em -\ifcase\@ptsize\relax -\geometry{% - textwidth=312pt, - textheight=624pt}\or -\geometry{% - textwidth=324pt, - textheight=648pt}\or -\geometry{% - textwidth=324pt, - textheight=648pt} - \fi -\geometry{% - marginparsep=12pt, - includehead, - hmarginratio=1:2, - vmarginratio=1:2, - heightrounded, - marginparwidth=82pt} +\fi + \geometry{heightrounded} \ifsuftesi@nocrop - \relax - \else - \RequirePackage[a4,cam,center]{crop} + \relax + \else + \RequirePackage[a4,cam,center]{crop} \fi \ifsuftesi@periodical - \geometry{ - textheight=16.5cm, - textwidth=11cm, - paperwidth=17cm, - paperheight=24cm, - hmarginratio=2:3, - vmarginratio=2:3, - includefoot, - includehead, - heightrounded, - marginparwidth=70pt, - marginparsep=10pt} + \geometry{ + textheight= 165mm, + textwidth= 110mm, + paperwidth= 170mm, + paperheight= 240mm, + marginratio= 2:3, + marginparwidth= 75pt, + marginparsep= 10pt} \else \ifsuftesi@compact - \geometry{ - textheight=16.5cm, - textwidth=11cm, - paperwidth=16cm, - paperheight=24cm, - hmarginratio=2:3, - vmarginratio=2:3, - includefoot, - includehead, - heightrounded, - marginparwidth=65pt, - marginparsep=10pt} + \geometry{ + textheight= 165mm, + textwidth= 110mm, + paperwidth= 160mm, + paperheight= 240mm, + marginratio= 2:3, + marginparwidth= 65pt, + marginparsep= 10pt} \else \ifsuftesi@supercompact - \geometry{ - textheight=15cm, - textwidth=10cm, - paperwidth=14cm, - paperheight=21cm, - hmarginratio=2:3, - vmarginratio=2:3, - includefoot, - includehead, - heightrounded, - marginparwidth=50pt, - marginparsep=9pt} + \geometry{ + textheight= 150mm, + textwidth= 100mm, + paperwidth= 140mm, + paperheight= 210mm, + marginratio= 2:3, + marginparwidth= 50pt, + marginparsep= 9pt} \else \ifsuftesi@elements - \geometry{% - textwidth=251pt, - textheight=502pt, - marginparwidth=60pt, - marginparsep=18pt, - paperwidth=378pt, - paperheight=654pt, - heightrounded, - outer=91.2pt, - top=64pt} + \geometry{% + textwidth= 251pt, + textheight= 502pt, + paperwidth= 374pt, + paperheight= 648pt, + marginparwidth= 60pt, + marginparsep= 18pt, + outer= 90pt, + top= 64pt} \else +\ifcase\@ptsize\relax +\geometry{% + textwidth= 312pt, + textheight= 624pt}\or +\geometry{% + textwidth= 324pt, + textheight= 648pt}\or +\geometry{% + textwidth= 324pt, + textheight= 648pt} + \fi +\geometry{% + a4paper, + includehead, + heightrounded, + marginparwidth= 82pt, + marginparsep= 12pt, + hmarginratio= 1:2, + vmarginratio= 1:2} + \fi + \fi \fi - \fi -\fi \fi \if@twoside \relax @@ -217,144 +518,312 @@ \RequirePackage{titlesec} \newlength{\sectionsep} \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt} -\ifsuftesi@supercompact - \DeclareRobustCommand{\sufchaptersize}{\large} +\ifsuftesi@periodical + \DeclareRobustCommand{\SUF@chaptersize}{\large} \else \ifsuftesi@compact - \DeclareRobustCommand{\sufchaptersize}{\Large} + \DeclareRobustCommand{\SUF@chaptersize}{\large} \else - \DeclareRobustCommand{\sufchaptersize}{\Large} - \fi + \ifsuftesi@supercompact + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \else + \DeclareRobustCommand{\SUF@chaptersize}{\Large} + \fi + \fi \fi \ifxetex - \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{% + \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}} - \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{% + \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}} \newcommand{\chapnumfont}[1]{% - \def\@chapnumfont{\fontspec{#1}}} + \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}} \chapnumfont{Palatino} \else - \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{% + \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \scshape\MakeTextLowercase{\textls[110]{#1}}}% - \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{% + \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \scshape\MakeTextLowercase{\textls[110]{#1}}}% \newcommand{\chapnumfont}[1]{% - \def\@chapnumfont{\fontfamily{#1}}} + \def\SUF@chapnumfont{\fontfamily{#1}}} \chapnumfont{pplj} \fi -\ifsuftesi@article -\titleclass{\part}{straight} -\titleformat{\part}[hang] - {\large} - {\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart} - {.5em} - {\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi} - \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex] -\else -\titleformat{\part}[display] - {\LARGE\filcenter} - {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart} - {3ex} - {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi} +\ifsuftesi@romanchap + \def\SUF@thechapter{\Roman{chapter}} + \else + \def\SUF@thechapter{\arabic{chapter}} +\fi +\ifsuftesi@centerpart + \def\SUF@lr@PARTSwitch{\filcenter} + \else + \ifsuftesi@rightpart + \def\SUF@lr@PARTSwitch{\filleft} + \else + \def\SUF@lr@PARTSwitch{\filright} + \fi \fi +\ifsuftesi@centerchap + \def\SUF@lr@CHAPSwitch{\filcenter} + \else + \ifsuftesi@rightchap + \def\SUF@lr@CHAPSwitch{\filleft} + \else + \def\SUF@lr@CHAPSwitch{\filright} + \fi +\fi +\ifsuftesi@centersec + \def\SUF@lr@SECswitch{\filcenter} + \else + \ifsuftesi@rightsec + \def\SUF@lr@SECswitch{\filleft} + \else + \def\SUF@lr@SECswitch{\filright} + \fi +\fi +\ifsuftesi@centersubsec + \def\SUF@lr@SUBSECswitch{\filcenter} + \else + \ifsuftesi@rightsubsec + \def\SUF@lr@SUBSECswitch{\filleft} + \else + \def\SUF@lr@SUBSECswitch{\filright} + \fi +\fi +\ifsuftesi@centersubsubsec + \def\SUF@lr@SUBSUBSECswitch{\filcenter} + \else + \ifsuftesi@rightsubsubsec + \def\SUF@lr@SUBSUBSECswitch{\filleft} + \else + \def\SUF@lr@SUBSUBSECswitch{\filright} + \fi +\fi +\ifsuftesi@dottedchap + \def\SUF@dotchap{.} + \else + \def\SUF@dotchap{} +\fi +\ifsuftesi@dottedpart + \def\SUF@dotpart{.} + \else + \def\SUF@dotpart{} +\fi +\def\SUF@chapnumpos{-73} \ifsuftesi@sufelements \titleformat{\chapter}[block] {}% {\begin{picture}(0,0) \setlength{\unitlength}{1pt} - \@chapnumfont% + \SUF@chapnumfont% \ifsuftesi@elements - \fontsize{64}{64}\selectfont% - \put(0,-73){% - \hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}% + \ifsuftesi@periodical + \fontsize{80}{80}\selectfont% + \def\SUF@chapnumpos{-83} + \else + \ifsuftesi@compact + \fontsize{80}{80}\selectfont% + \def\SUF@chapnumpos{-83} + \else + \ifsuftesi@supercompact + \fontsize{64}{64}\selectfont% + \def\SUF@chapnumpos{-73} + \else + \fontsize{64}{64}\selectfont% + \def\SUF@chapnumpos{-73} + \fi\fi\fi \else \fontsize{95}{95}\selectfont% - \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)% - \textcolor{sufgray}{\thechapter}}% + \def\SUF@chapnumpos{-83} \fi + \put(0,\SUF@chapnumpos){% + \hskip\dimexpr(\textwidth+\marginparsep)% + \textcolor{sufgray}{\SUF@thechapter}}% \end{picture}}% {0pt} - {\suftesi@titlesmallcaps} + {\Large\SUF@titlesmallcaps} [\rule{\textwidth}{.1pt}] -\else -\ifsuftesi@centertitle - \titleformat{\chapter}[display] - {\filcenter} - {\sufchaptersize\thechapter} - {3ex} - {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi} -\else - \titleformat{\chapter}[hang] - {\filright} - {\sufchaptersize\thechapter.} - {3ex} - {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi} - \fi -\fi -\ifsuftesi@compact - \titlespacing*{\chapter}{0em}{0ex}{18ex} - \else - \ifsuftesi@supercompact - \titlespacing*{\chapter}{0em}{0ex}{18ex} - \else - \ifsuftesi@elements - \titlespacing*{\chapter}{0em}{-45pt}{10pt}[0em] - \else - \ifsuftesi@sufelements - \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em] - \else - \titlespacing*{\chapter}{0em}{6ex}{18ex} - \fi - \fi - \fi -\fi -\ifsuftesi@elements -\titleformat{\section}[hang] - {\raggedright} + \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em] +\titleformat{\section}[block] + {\filright} {\textnormal\thesection} {1em} - {\small\suftesi@titlesmallcaps} -\titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em] + {\SUF@titlesmallcaps} +\titlespacing*{\section}{0em}{1em}{1em}[0em] \titleformat{\subsection}[block] {\filright\normalsize\itshape} {\textnormal\thesubsection} {1em} {} -\titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] + \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] \titleformat{\subsubsection}[block] - {\filright\normalsize\itshape} + {\filright\normalsize} {\textnormal\thesubsubsection} {1em} {} -\titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] -\else + \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] + \else +\def\SUF@PART@StyleSwitch{% + \ifsuftesi@smallcapspart + \expandafter\SUF@titlesmallcaps + \else + \ifsuftesi@italicpart + \itshape + \else + \fi +\fi} +\def\SUF@CHAP@StyleSwitch{% + \ifsuftesi@smallcapschap + \expandafter\SUF@titlesmallcaps + \else + \ifsuftesi@italicchap + \itshape + \else + \fi +\fi} +\def\SUF@SEC@StyleSwitch{% + \ifsuftesi@smallcapssec + \expandafter\SUF@titlesmallcaps + \else + \ifsuftesi@italicsec + \itshape + \else + \fi +\fi} +\def\SUF@SUBSEC@StyleSwitch{% + \ifsuftesi@smallcapssubsec + \expandafter + \SUF@titlesmallcaps + \else + \ifsuftesi@italicsubsec + \itshape + \else + \fi +\fi +} +\def\SUF@SUBSUBSEC@StyleSwitch{% + \ifsuftesi@smallcapssubsubsec + \expandafter + \SUF@titlesmallcaps + \else + \ifsuftesi@italicsubsubsec + \itshape + \else + \fi +\fi} \ifsuftesi@article - \renewcommand\thesection {\@arabic\c@section} - \renewcommand\thesubsection {\thesection.\@arabic\c@subsection} - \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection} - \renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph} - \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph} +\def\chapter#1{\ClassError{suftesi} + {\noexpand\chapter level is not defined using 'article' option} + {\noexpand\chapter level is not defined using 'article' option}} + \setcounter{tocdepth}{3} + \setcounter{secnumdepth}{3} + \renewcommand\thesection{% + \@arabic\c@section} + \renewcommand\thesubsection{% + \thesection.\@arabic\c@subsection} + \renewcommand\thesubsubsection{% + \thesubsection.\@arabic\c@subsubsection} + \renewcommand\theparagraph{% + \thesubsubsection.\@arabic\c@paragraph} + \renewcommand\thesubparagraph{% + \theparagraph.\@arabic\c@subparagraph} +\titleclass{\part}{straight} +\titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex] +\else +\fi +\ifsuftesi@numparpart +\titleformat{\part}[display] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart} + {2ex} + {\SUF@PART@StyleSwitch} \else +\titleformat{\part}[hang] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart} + {3em} + {\SUF@PART@StyleSwitch} +\fi +\ifsuftesi@numparchap + \titleformat{\chapter}[display] + {\SUF@chaptersize\SUF@lr@CHAPSwitch} + {\SUF@thechapter\SUF@dotchap} + {2ex} + {\SUF@CHAP@StyleSwitch} + \else + \titleformat{\chapter}[hang] + {\SUF@chaptersize\SUF@lr@CHAPSwitch} + {\SUF@thechapter\SUF@dotchap} + {3em} + {\SUF@CHAP@StyleSwitch} + \fi +\ifsuftesi@numparchap + \def\SUF@ADJnumparchap{-2.5\baselineskip} + \else + \def\SUF@ADJnumparchap{0pt} +\fi +\ifsuftesi@periodical + \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex} + \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex} + \else + \ifsuftesi@compact + \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex} + \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex} + \else + \ifsuftesi@supercompact + \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex} + \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex} + \else + \titlespacing*{\chapter}{0em}{% + \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex} + \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex} + \fi + \fi \fi +\ifsuftesi@numparsec +\titleformat{\section}[display] + {\SUF@lr@SECswitch} + {\thesection} + {0ex} + {\SUF@SEC@StyleSwitch} +\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] +\else \titleformat{\section}[hang] - {\filright} + {\SUF@lr@SECswitch} {\thesection} - {.5em} - {\unskip\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\itshape\fi} + {1em} + {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] +\fi +\ifsuftesi@numparsubsec +\titleformat{\subsection}[display] + {\SUF@lr@SUBSECswitch} + {\textnormal\thesubsection} + {0ex} + {\SUF@SUBSEC@StyleSwitch} +\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] +\else \titleformat{\subsection}[hang] - {} + {\SUF@lr@SUBSECswitch} {\textnormal\thesubsection} - {.5em} - {\itshape} + {1em} + {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] +\fi +\ifsuftesi@numparsubsubsec +\titleformat{\subsubsection}[display] + {\SUF@lr@SUBSUBSECswitch} + {\textnormal\thesubsubsection} + {0ex} + {\SUF@SUBSUBSEC@StyleSwitch} +\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] +\else \titleformat{\subsubsection}[hang] - {} + {\SUF@lr@SUBSUBSECswitch} {\textnormal\thesubsubsection} - {.5em} - {\itshape} -\titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex] + {1em} + {\SUF@SUBSUBSEC@StyleSwitch} +\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] + \fi \fi \titleformat{\paragraph}[runin] {} @@ -370,7 +839,7 @@ {} [{.}\hspace*{1em}] \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep} -\ifsuftesi@article %ARTICLE +\ifsuftesi@article \AtBeginDocument{% \@ifpackageloaded{biblatex}{% \defbibheading{bibliography}[\refname]{% @@ -402,7 +871,7 @@ \subsection{#1}}}% {\relax}% }% -\else %BOOK +\else \AtBeginDocument{% \@ifpackageloaded{biblatex}{% \defbibheading{bibliography}[\bibname]{% @@ -437,118 +906,7 @@ {\relax}% }% \fi -\RequirePackage{titletoc} -\ifsuftesi@dottedtoc - \newcommand{\suftesi@titlerule}{\titlerule*{\footnotesize .\ }} - \newcommand{\suftesi@chaptitlerule}{\titlerule*{}} - \else -\ifsuftesi@raggedtoc - \newcommand{\suftesi@titlerule}{\hspace{1.5em}} - \newcommand{\suftesi@chaptitlerule}{\hspace{1.5em}} - \else - \newcommand{\suftesi@titlerule}{\titlerule*{}} - \newcommand{\suftesi@chaptitlerule}{\titlerule*{}} - \fi -\fi -\ifsuftesi@article -\renewcommand\tableofcontents{% -\thispagestyle{empty} - \section*{\contentsname - \@mkboth{\contentsname}{\contentsname}}% - \@starttoc{toc}% - \vspace{2ex}% - } -\renewcommand\listoffigures{% - \section*{\listfigurename}% - \@mkboth{\listfigurename}% - {\listfigurename}% - \@starttoc{lof}% - \vspace{2ex}% - } -\renewcommand\listoftables{% - \section*{\listtablename}% - \@mkboth{% - \listtablename}% - {\listtablename}% - \@starttoc{lot}% - \vspace{2ex}% - } -\else -\renewcommand\tableofcontents{% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \chapter*{\contentsname - \@mkboth{\contentsname}{\contentsname}}% - \@starttoc{toc}% - \if@restonecol\twocolumn\fi - } - \fi -\titlecontents{part} - [0em] - {\addvspace{3ex}\partname~} - {\thecontentslabel\hspace*{1em}} - {} - {} - [\addvspace{1ex}] -\titlecontents{chapter} - [0em] - {\addvspace{2ex}} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@chaptitlerule\contentspage} - [\addvspace{1ex}] -\titlecontents{section} - [1.5em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\ifsuftesi@article\suftesi@chaptitlerule% - \else\suftesi@titlerule\fi\contentspage} -\titlecontents{subsection} - [3em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\titlecontents{subsubsection} - [4.5em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\titlecontents{paragraph} - [6em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\titlecontents{subparagraph} - [7.5em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\titlecontents{figure} - [0em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\titlecontents{table} - [0em] - {} - {\thecontentslabel\hspace*{1em}} - {} - {\suftesi@titlerule\contentspage} -\ifsuftesi@article -\setcounter{tocdepth}{3} -\setcounter{secnumdepth}{3} -\else -\fi - \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}} +\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}} \edef\title{\noexpand\@dblarg \expandafter\noexpand\csname\string\title\endcsname} \def\@headtitle{--missing title--% @@ -573,8 +931,20 @@ \null\vfil \vskip 60\p@ \begin{center}% - {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles% - \suftesi@titlesmallcaps{\@title}\else\@title\fi \par}% + {\SUF@chaptersize\color{sufred}\sffamily% + \ifsuftesi@smallcapschap% + \SUF@titlesmallcaps{\@title} + \else + \ifsuftesi@article + \ifsuftesi@smallcapssec + \SUF@titlesmallcaps{\@title} + \else + \@title + \fi + \else + \@title + \fi + \fi\par}% \vskip 3em% {\small\lineskip .75em% \begin{tabular}[t]{c}% @@ -629,8 +999,20 @@ \vskip 2em% \begin{center}% \let \footnote \thanks - {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles% - \suftesi@titlesmallcaps{\@title}\else\@title\fi\par}% + {\SUF@chaptersize\color{sufred}\sffamily% + \ifsuftesi@smallcapschap% + \SUF@titlesmallcaps{\@title} + \else + \ifsuftesi@article + \ifsuftesi@smallcapssec + \SUF@titlesmallcaps{\@title} + \else + \@title + \fi + \else + \@title + \fi + \fi\par}% \vskip 1.5em% {\small\lineskip .5em% \begin{tabular}[t]{c}% @@ -645,8 +1027,7 @@ \AtBeginDocument{% \@ifpackageloaded{frontespizio}{% \ifsuftesi@periodical - \Margini{1cm}{7cm}{5cm}{1cm}% - \Rientro{1cm}% + \Margini {5.5cm}{7cm}{4.5cm}{1cm} \else \ifsuftesi@compact \Margini{1cm}{7cm}{6cm}{1cm}% @@ -662,22 +1043,25 @@ }% {\relax}} \renewenvironment{theindex} - {\setlength\columnseprule{0pt} - \setlength\columnsep{35pt}% - \cleardoublepage - \@makeschapterhead{\indexname}% - \begin{multicols}{2} - \markboth{\indexname}{\indexname}% - \raggedright\small - \setlength\parindent{0pt}% - \setlength\parskip{0pt plus 0.3pt}% - \thispagestyle{plain}\let\item\@idxitem} - {\end{multicols}} -\renewcommand\@idxitem{\par\hangindent 15\p@} -\newcommand{\appendicesname}[1]{\def\suff@appendices{#1}} + {\if@twocolumn + \@restonecolfalse + \else + \@restonecoltrue + \fi + \twocolumn[\@makeschapterhead{\indexname}]% + \@mkboth{\indexname}{\indexname}% + \thispagestyle{plain}% + \raggedright\small% + \parindent\z@ + \parskip\z@ \@plus .3\p@\relax + \columnseprule \z@ + \columnsep 35\p@ + \let\item\@idxitem} + {\if@restonecol\onecolumn\else\clearpage\fi} +\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}} \appendicesname{Appendici} - \newcommand{\appendixpage}{\@appendixpage} -\def\@appendixpage{% + \newcommand{\appendixpage}{\SUF@appendixpage} +\def\SUF@appendixpage{% \@mainmattertrue \titlecontents{part} [0em] @@ -689,18 +1073,18 @@ \let\contentspage\relax \cleardoublepage \thispagestyle{empty} - \addcontentsline{toc}{part}{\suff@appendices} + \addcontentsline{toc}{part}{\SUF@appendices} \begingroup \centering \null\vfil - {\LARGE\suff@appendices\par} + {\LARGE\SUF@appendices\par} \vfil \endgroup \cleardoublepage \titlecontents{part} [0em] {\addvspace{3ex}\partname~} - {\thecontentslabel\hspace*{1em}} + {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}} {} {} [\addvspace{1ex}] @@ -713,16 +1097,11 @@ \gdef\thechapter{\@Alph\c@chapter} \titleformat{\chapter}[block] {\vskip-22pt}% - {\small\suftesi@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em} + {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em} {0pt} - {\small\suftesi@titlesmallcaps} + {\small\SUF@titlesmallcaps} [\rule{\textwidth}{.4pt}] - \titlespacing*{\chapter}{0em}{10pt}{10pt}[0em] - \titlecontents{chapter}[1em] - {\filright\hskip.5em} - {\suftesi@titlesmallcaps{\appendixname~\thecontentslabel:}\hskip1em} - {} - {\contentspage\vspace{5pt}}} + \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]} \else \ifsuftesi@article \renewcommand\appendix{\par @@ -741,111 +1120,104 @@ \pagestyle{fancy} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footnoterule}{} +\def\SUF@versionstring{\texttt{Version of \today}} \ifsuftesi@elements% - \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} - \renewcommand{\sectionmark}[1]{\markright{#1}} + \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} + \renewcommand{\sectionmark}[1]{\markright{#1}} \fancypagestyle{elements}{% + \setlength{\unitlength}{1pt} \fancyhf{} \fancyfoot[LE,RO]{\thepage} \fancyhead[RO]{% \begin{picture}(0,0) - \setlength{\unitlength}{1pt} - \put(0,-104){% - \hskip\marginparsep - \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}% + \put(0,-104){% + \hskip\marginparsep + \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}% \end{picture}} \fancyhead[LE]{% \begin{picture}(0,0) - \setlength{\unitlength}{1pt} - \put(0,-104){% - \hskip-\dimexpr(\marginparwidth+\marginparsep) - \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}% - \end{picture}}% + \put(0,-104){% + \hskip-\dimexpr(\marginparwidth+\marginparsep) + \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}% + \end{picture}}% }% \else - \renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}} - \renewcommand{\sectionmark}[1]{} +\renewcommand{\chaptermark}[1]{% + \markboth{\chaptertitlename\ \SUF@thechapter}{#1}} +\ifsuftesi@article + \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}} + \else + \renewcommand{\sectionmark}[1]{} +\fi \fi -\fancypagestyle{plain}{% - \fancyhf{} - \fancyfoot[C]{} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt}} +\fancypagestyle{plain}{\pagestyle{sufplain}} \fancypagestyle{sufplain}{% \fancyhf{}% - \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi} - \fancyfoot[C]{\footnotesize\sufthepage}} -\fancypagestyle{centerheadings}{% - \fancyhf{}% - \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi} - \fancyhead[CO]{\footnotesize\xheadbreakfalse\suf@rightmark} - \fancyhead[CE]{\footnotesize\xheadbreakfalse% + \fancyfoot[RE,LO]{% + \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi} + \fancyfoot[C]{\footnotesize\SUF@thepage}} +\def\SUF@LR@MarkSwitch{% \ifsuftesi@article \ifsuftesi@authortitle - \suf@leftmark + \SUF@leftmark \else - \suf@rightmark + \SUF@rightmark \fi - \else - \suf@leftmark - \fi} - \fancyfoot[C]{\footnotesize\sufthepage}% + \else + \SUF@leftmark + \fi} +\fancypagestyle{centerheader}{% + \fancyhf{}% + \fancyfoot[RE,LO]{% + \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi} + \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark} + \fancyhead[CE]{\footnotesize\xheadbreakfalse% + \SUF@LR@MarkSwitch} + \fancyfoot[C]{\footnotesize\SUF@thepage}% }% \fancypagestyle{sufdefault}{% \fancyhf{}% - \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi} - \fancyhead[LE,RO]{\footnotesize\sufthepage} - \fancyhead[LO]{\footnotesize\xheadbreakfalse\suf@rightmark} + \fancyfoot[RE,LO]{% + \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi} + \fancyhead[LE,RO]{\footnotesize\SUF@thepage} + \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark} \fancyhead[RE]{\footnotesize\xheadbreakfalse% - \ifsuftesi@article - \ifsuftesi@authortitle - \suf@leftmark - \else - \suf@rightmark - \fi - \else - \suf@leftmark - \fi} + \SUF@LR@MarkSwitch} }% -\ifsuftesi@article - \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}} - \else - \fi -\ifsuftesi@sctitles - \ifsuftesi@authortitle - \def\suf@rightmark{\suftesi@headingsmallcaps{\@headtitle}} +\ifsuftesi@italicRhead + \def\SUF@Rheadstyle{\itshape} + \else + \ifsuftesi@smallcapsRhead + \def\SUF@Rheadstyle{\SUF@headingsmallcaps} \else - \def\suf@rightmark{\suftesi@headingsmallcaps{\rightmark}} + \def\SUF@Rheadstyle{} \fi -\else - \ifsuftesi@authortitle - \def\suf@rightmark{\nouppercase{\@headtitle}} - \else - \def\suf@rightmark{\nouppercase{\rightmark}} - \fi \fi -\ifsuftesi@sctitles - \ifsuftesi@authortitle - \def\suf@leftmark{\suftesi@headingsmallcaps{\@author}} - \else - \def\suf@leftmark{\suftesi@headingsmallcaps{\suf@leftrightmark}} - \fi -\else -\ifsuftesi@authortitle - \def\suf@leftmark{\nouppercase{\@author}} +\ifsuftesi@italicLhead + \def\SUF@Lheadstyle{\itshape} \else - \def\suf@leftmark{\nouppercase{\suf@leftrightmark}} + \ifsuftesi@smallcapsLhead + \def\SUF@Lheadstyle{\SUF@headingsmallcaps} + \else + \def\SUF@Lheadstyle{} \fi \fi -\ifsuftesi@sctitles - \def\sufthepage{\suftesi@headingsmallcaps{\thepage}} + \ifsuftesi@authortitle + \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \else + \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} + \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} + \fi +\ifsuftesi@smallcapsheader + \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}} \else - \def\sufthepage{\thepage} + \def\SUF@thepage{\thepage} \fi -\def\suf@leftrightmark{% +\def\SUF@leftrightmark{% \if@mainmatter\leftmark\else\rightmark\fi} \pagestyle{sufdefault} - \ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi + \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi \ifsuftesi@elements\pagestyle{elements}\else\fi \RequirePackage{caption} @@ -869,72 +1241,99 @@ \renewcommand{\epigraphsize}{\footnotesize} \fi \fi -\RequirePackage{enumitem} - \setlist{labelsep=0.6em,noitemsep,font=\normalfont} +\RequirePackage[inline]{enumitem} + \setlist{labelsep=0.5\parindent,noitemsep,font=\normalfont} \setdescription{font=\normalfont\itshape,noitemsep} -\ifsuftesi@compact - \setenumerate[1]{leftmargin=1em,label=\arabic*} - \setenumerate[2]{leftmargin= 1.5em,label=\arabic*} - \setenumerate[3]{leftmargin= 1.5em,label=\arabic*} - \setitemize[1]{leftmargin=1em} - \setitemize[2]{leftmargin=1.5em} - \setitemize[3]{leftmargin=1.5em} - \else - \ifsuftesi@supercompact - \setenumerate[1]{leftmargin=1em,label=\arabic*} - \setenumerate[2]{leftmargin= 1.5em,label=\arabic*} - \setenumerate[3]{leftmargin= 1.5em,label=\arabic*} - \setitemize[1]{leftmargin=1em} - \setitemize[2]{leftmargin=1.5em} - \setitemize[3]{leftmargin=1.5em} +\ifsuftesi@alignlist + \setenumerate[1]{leftmargin=1\parindent,label=\arabic*.} + \setenumerate[2]{leftmargin= 1.5\parindent,label=\alph*.} + \setenumerate[3]{leftmargin= 1.5\parindent,label=\roman*.} + \setitemize[1]{leftmargin=1\parindent} + \setitemize[2]{leftmargin=1.5\parindent} + \setitemize[3]{leftmargin=1.5\parindent} +\else +\ifsuftesi@indentlist + \setenumerate[1]{leftmargin=2\parindent,label=\arabic*.} + \setenumerate[2]{leftmargin= 2.5\parindent,label=\alph*.} + \setenumerate[3]{leftmargin= 2.5\parindent,label=\roman*.} + \setitemize[1]{leftmargin=2\parindent} + \setitemize[2]{leftmargin=2.5\parindent} + \setitemize[3]{leftmargin=2.5\parindent} \else - \setenumerate[1]{leftmargin=0pt,label=\arabic*} - \setenumerate[2]{leftmargin= 1.3em,label=\arabic*} - \setenumerate[3]{leftmargin= 1.3em,label=\arabic*} + \setenumerate[1]{leftmargin=0pt,label=\arabic*.} + \setenumerate[2]{leftmargin= 1.3\parindent,label=\alph*.} + \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.} \setitemize[1]{leftmargin=0pt} - \setitemize[2]{leftmargin=1.3em} - \setitemize[3]{leftmargin=1.3em} - \fi + \setitemize[2]{leftmargin=1.3\parindent} + \setitemize[3]{leftmargin=1.3\parindent} + \fi \fi \renewcommand\labelitemii{\normalfont \textendash} \renewenvironment{quotation} - {\list{}{\listparindent\parindent% - \itemindent \listparindent + {\list{}{\listparindent\parindent% + \itemindent \listparindent + \leftmargin \parindent + \ifsuftesi@ralignquotation + \else \rightmargin \parindent - \leftmargin \parindent + \fi \parsep \z@ \@plus\p@}% - \item\relax\footnotesize\noindent\ignorespaces} + \item\relax% + \ifsuftesi@smallquotation + \small + \else + \footnotesize + \fi\noindent\ignorespaces} {\endlist} \renewenvironment{quote} - {\list{}{\rightmargin \parindent - \leftmargin \parindent}% - \item\relax\footnotesize} + {\list{}{\leftmargin \parindent + \ifsuftesi@ralignquotation\ + \else + \rightmargin \parindent + \fi}% + \item\relax% + \ifsuftesi@smallquotation + \small + \else + \footnotesize + \fi}%\ignorespaces? {\endlist} \renewenvironment{verse} {\let\\\@centercr - \list{}{\footnotesize% - \itemsep \z@ + \list{}{\itemsep \z@ \itemindent -1.5em% \listparindent\itemindent \rightmargin \leftmargin \advance\leftmargin 1.5em}% - \item\relax} + \item\relax + \ifsuftesi@smallquotation + \small + \else + \footnotesize + \fi} {\endlist} -\renewcommand\@makefntext{% - \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em} -\def\sufmpsetup@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio - \itshape\footnotesize% +\ifsuftesi@standardfootnote + \relax + \else + \ifsuftesi@dottedfootnote + \renewcommand\@makefntext{\@thefnmark.\hskip.5em} + \else + \renewcommand\@makefntext{% + \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em} + \fi +\fi +\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio + \ifsuftesi@elements\relax + \else\itshape\fi + \footnotesize% \parindent=0pt \lineskip=0pt \lineskiplimit=0pt % \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300% \doublehyphendemerits=100000% \finalhyphendemerits=\doublehyphendemerits} -\long\def\@xmpar[#1]#2{% - \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% - \@savemarbox\@currbox{\sufmpsetup@setup\raggedright\hspace{0pt}#2}% - \@xympar} -\long\def\@ympar#1{% - \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}% - \global\setbox\@currbox\copy\@marbox \@xympar} +\let\oldmarginpar\marginpar +\renewcommand{\marginpar}[1]{\oldmarginpar% + [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]% + {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}} \ifsuftesi@nomarginpar \renewcommand\marginpar[2][]{} \else @@ -963,7 +1362,7 @@ {\if@twocolumn\else\endquotation\fi} \fi \newcommand\abstractname{Abstract} -\edef\sufengine{% +\edef\SUF@engine{% \ifxetex \noexpand\XeLaTeX \else @@ -980,13 +1379,13 @@ \def\next{#2} \ifx\next\@empty\else \noindent Copyright \copyright{} \the\year~#2\\[1ex] - All rights reserved + Tutti i diritti riservato \fi \vfill - {\small\noindent This work has been typeset with \sufengine{}% + {\small\noindent Questo lavoro รจ stato composto con \SUF@engine{}% \def\next{#1} - \ifx\next\@empty\else on #1 - \fi using the \textsf{suftesi} class by + \ifx\next\@empty\else su #1 + \fi usando la classe \textsf{suftesi} di Ivan Valbusa\index{Valbusa, Ivan}. #3\par} \cleardoublepage} \newcommand{\bookcolophon}[2]{% @@ -1012,12 +1411,350 @@ \end{center} \vspace*{\stretch{6}} } +\RequirePackage{titletoc} +\ifsuftesi@elements + \def\SUF@tochapsize{} + \else + \def\SUF@tochapsize{\large} +\fi +\ifsuftesi@dottedtoc + \def\SUF@titlerule{\titlerule*{\footnotesize .\ }} + \def\SUF@chaptitlerule{\titlerule*{}} + \else + \ifsuftesi@raggedtoc + \def\SUF@titlerule{\hspace{1.5em}} + \def\SUF@chaptitlerule{\hspace{1.5em}} + \else + \def\SUF@titlerule{\titlerule*{}} + \def\SUF@chaptitlerule{\titlerule*{}} + \fi +\fi +\newlength\SUF@label@chapter +\setlength\SUF@label@chapter{.5em} +\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}} +\newlength{\SUF@tochang} +\setlength{\SUF@tochang}{3em} +\AtBeginDocument{ +\newlength\SUF@label@part +\newlength\SUF@label@section +\newlength\SUF@label@subsection +\newlength\SUF@label@subsubsection +\newlength\SUF@label@paragraph +\newlength\SUF@label@subparagraph +\newlength\SUF@label@figure +\newlength\SUF@label@table +\setlength\SUF@label@part + {\SUF@label@chapter} +\setlength\SUF@label@section + {\dimexpr(\SUF@label@chapter+.5em)} +\setlength\SUF@label@subsection + {\dimexpr(\SUF@label@section+.5em)} +\setlength\SUF@label@subsubsection + {\dimexpr(\SUF@label@subsection+.5em)} +\setlength\SUF@label@paragraph + {\dimexpr(\SUF@label@subsubsection+.5em)} +\setlength\SUF@label@subparagraph + {\dimexpr(\SUF@label@paragraph+.5em)} +\setlength\SUF@label@figure + {\SUF@label@chapter} +\setlength\SUF@label@table + {\SUF@label@chapter} +} +\titlecontents{part} + [0em] + {\addvspace{3ex}\SUF@tocchapsize\partname~} + {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}} + {} + {} + [\addvspace{1ex}] +\ifsuftesi@tocpageleft +\contentsmargin{0pt} +\AtBeginDocument{ +\newlength\SUF@tochang@chap +\newlength\SUF@tochang@sec +\newlength\SUF@tochang@subsec +\newlength\SUF@tochang@subsubsec +\newlength\SUF@tochang@par +\newlength\SUF@tochang@subpar +\newlength\SUF@tochang@fig +\newlength\SUF@tochang@tab +\newlength\SUF@addto@tochang@chap +\newlength\SUF@addto@tochang@sec +\newlength\SUF@addto@tochang@subsec +\newlength\SUF@addto@tochang@subsubsec +\newlength\SUF@addto@tochang@par +\newlength\SUF@addto@tochang@subpar +\newlength\SUF@addto@tochang@fig +\newlength\SUF@addto@tochang@tab +\setlength\SUF@tochang@chap + {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)} +\setlength\SUF@tochang@sec + {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)} +\setlength\SUF@tochang@subsec + {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)} +\setlength\SUF@tochang@subsubsec + {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)} +\setlength\SUF@tochang@par + {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)} +\setlength\SUF@tochang@subpar + {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)} +\setlength\SUF@tochang@fig + {\SUF@tochang@chap} +\setlength\SUF@tochang@tab + {\SUF@tochang@chap} +\setlength\SUF@addto@tochang@chap + {\SUF@tochang} +\setlength\SUF@addto@tochang@sec + {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)} +\setlength\SUF@addto@tochang@subsec + {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)} +\setlength\SUF@addto@tochang@subsubsec + {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)} +\setlength\SUF@addto@tochang@par + {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)} +\setlength\SUF@addto@tochang@subpar + {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)} +\setlength\SUF@addto@tochang@fig + {\SUF@addto@tochang@chap} +\setlength\SUF@addto@tochang@tab + {\SUF@addto@tochang@chap} +} +\titlecontents{chapter} + [\SUF@tochang@chap] + {\addvspace{2ex}} + {\hskip-\SUF@tochang@chap% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap% + \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@chap% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap} + {} + [\addvspace{1ex}] +\titlecontents{section} + [\SUF@tochang@sec] + {} + {\hskip-\SUF@tochang@sec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec% + \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@sec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec% + \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}} + {} +\titlecontents{subsection} + [\SUF@tochang@subsec] + {} + {\hskip-\SUF@tochang@subsec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec% + \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@subsec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec% + \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}} + {} +\titlecontents{subsubsection} + [\SUF@tochang@subsubsec] + {} + {\hskip-\SUF@tochang@subsubsec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec% + \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@subsubsec% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec% + \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}} + {} +\titlecontents{paragraph} + [\SUF@tochang@par] + {} + {\hskip-\SUF@tochang@par% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par% + \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@par% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par% + \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}} + {} +\titlecontents{subparagraph} + [\SUF@tochang@subpar] + {} + {\hskip-\SUF@tochang@subpar% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar% + \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\SUF@tochang@subpar% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar% + \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}} + {} +\titlecontents{figure} + [\SUF@tochang@fig] + {} + {\hskip-\SUF@tochang@fig% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig% + \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}} + {} + {} +\titlecontents{table} + [\SUF@tochang@tab] + {} + {\hskip-\SUF@tochang@tab% + \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab% + \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}} + {} + {} +\else +\AtBeginDocument{ +\newlength\SUF@tocindent@chap +\newlength\SUF@tocindent@sec +\newlength\SUF@tocindent@subsec +\newlength\SUF@tocindent@subsubsec +\newlength\SUF@tocindent@par +\newlength\SUF@tocindent@subpar +\newlength\SUF@tocindent@fig +\newlength\SUF@tocindent@tab +\setlength\SUF@tocindent@chap + {\dimexpr(\SUF@label@chapter+1em)} +\setlength\SUF@tocindent@sec + {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)} +\setlength\SUF@tocindent@subsec + {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)} +\setlength\SUF@tocindent@subsubsec + {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)} +\setlength\SUF@tocindent@par + {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)} +\setlength\SUF@tocindent@subpar + {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)} +\setlength\SUF@tocindent@fig + {\SUF@tocindent@chap} +\setlength\SUF@tocindent@tab + {\SUF@tocindent@chap} +} +\titlecontents{chapter} + [\SUF@tocindent@chap] + {\addvspace{2ex}} + {\hskip-\SUF@tocindent@chap% + \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}\SUF@tochapsize} + {\hskip-\SUF@tocindent@chap\SUF@tochapsize} + {\SUF@chaptitlerule\contentspage} + [\addvspace{1ex}] +\titlecontents{section} + [\SUF@tocindent@sec] + {} + {\hskip-\dimexpr(\SUF@label@section+1em)% + \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\dimexpr(\SUF@label@section+1em)% + \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}} + {\ifsuftesi@article\SUF@chaptitlerule% + \else\SUF@titlerule\fi\contentspage} +\titlecontents{subsection} + [\SUF@tocindent@subsec] + {} + {\hskip-\dimexpr(\SUF@label@subsection+1em)% + \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\dimexpr(\SUF@label@subsection+1em)% + \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}} + {\SUF@titlerule\contentspage} +\titlecontents{subsubsection} + [\SUF@tocindent@subsubsec] + {} + {\hskip-\dimexpr(\SUF@label@subsubsection+1em)% + \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\dimexpr(\SUF@label@subsubsection+1em)% + \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}} + {\SUF@titlerule\contentspage} +\titlecontents{paragraph} + [\SUF@tocindent@par] + {} + {\hskip-\dimexpr(\SUF@label@paragraph+1em)% + \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\dimexpr(\SUF@label@paragraph+1em)% + \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}} + {\SUF@titlerule\contentspage} +\titlecontents{subparagraph} + [\SUF@tocindent@subpar] + {} + {\hskip-\dimexpr(\SUF@label@subparagraph+1em)% + \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}} + {\hskip-\dimexpr(\SUF@label@subparagraph+1em)% + \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}} + {\SUF@titlerule\contentspage} +\titlecontents{figure} + [\SUF@tocindent@fig] + {} + {\hskip-\dimexpr(\SUF@label@figure+1em)% + \makebox[\SUF@label@figure][l]{\thecontentslabel}} + {} + {\SUF@titlerule\contentspage} +\titlecontents{table} + [\SUF@tocindent@tab] + {} + {\hskip-\dimexpr(\SUF@label@table+1em)% + \makebox[\SUF@label@table][l]{\thecontentslabel}} + {} + {\SUF@titlerule\contentspage} +\fi +\ifsuftesi@article +\renewcommand\tableofcontents{% +\thispagestyle{empty} + \section*{\contentsname + \@mkboth{\contentsname}{\contentsname}}% + \@starttoc{toc}% + \vspace{2ex}% + } +\renewcommand\listoffigures{% + \section*{\listfigurename}% + \@mkboth{\listfigurename}% + {\listfigurename}% + \@starttoc{lof}% + \vspace{2ex}% + } +\renewcommand\listoftables{% + \section*{\listtablename}% + \@mkboth{% + \listtablename}% + {\listtablename}% + \@starttoc{lot}% + \vspace{2ex}% + } +\else +\renewcommand\tableofcontents{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\contentsname + \@mkboth{% + \contentsname} + {\contentsname}}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi + } +\renewcommand\listoffigures{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}% + {\listfigurename}% + \@starttoc{lof}% + \if@restonecol\twocolumn\fi + } +\renewcommand\listoftables{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\listtablename}% + \@mkboth{% + \listtablename}% + {\listtablename}% + \@starttoc{lot}% + \if@restonecol\twocolumn\fi + } +\fi \def\chapterintro{ \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}} \def\@chapterintro{\phantomsection - \if@tempswa\section*{\suffchapterintroname}\fi - \addcontentsline{toc}{section}{\suffchapterintroname}} -\newcommand{\chapterintroname}[1]{\def\suffchapterintroname{#1}} + \if@tempswa\section*{\SUF@fchapterintroname}\fi + \addcontentsline{toc}{section}{\SUF@fchapterintroname}} +\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}} \chapterintroname{Introduzione} \newif\ifheadbreak\headbreakfalse \DeclareRobustCommand{\headbreak} @@ -1059,6 +1796,7 @@ \let\makelabel\itlabel}} {\endlist} \let\hemph\emph +\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi \frenchspacing \endinput %% |