summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-21 21:33:49 +0000
committerKarl Berry <karl@freefriends.org>2013-09-21 21:33:49 +0000
commit0bc09e46cbdb904897c028cca4c170792f03b32f (patch)
tree876119f2cf5d09a60f766297bdf6f911dcf16423 /Master/texmf-dist/tex/latex/suftesi
parent91196b7f1f05127d784069b65ec8c445fa6364ba (diff)
suftesi (21sep13)
git-svn-id: svn://tug.org/texlive/trunk@31713 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls737
1 files changed, 597 insertions, 140 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index ec8284efa0b..25d6acb05f2 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,13 +19,19 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2013/07/18 v1.8 A class for typesetting theses, books and articles]
+ [2013/09/21 v1.9 A class for typesetting theses, books and articles]
+
+
\ClassWarningNoLine{suftesi}{%
- DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
- WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
- THE LAYOUT OF THE DOCUMENT.\MessageBreak
- SEE DOCUMENTATION FOR DETAILS}{}%
+ ******************************************\MessageBreak
+ * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
+ * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
+ * THE LAYOUT OF THE DOCUMENT.\MessageBreak
+ * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
+ * ANYWAY, DON'T WORRY!\MessageBreak
+ * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
+ ******************************************}{}%
\RequirePackage{xkeyval}
\newif\ifsuftesi@standardfont
\newif\ifsuftesi@porson
@@ -40,7 +46,6 @@
\newif\ifsuftesi@nocrop
\newif\ifsuftesi@dottedtoc
\newif\ifsuftesi@raggedtoc
-\newif\ifsuftesi@pagelefttoc
\newif\ifsuftesi@numparpart
\newif\ifsuftesi@numparchap
\newif\ifsuftesi@numparsec
@@ -59,6 +64,12 @@
\newif\ifsuftesi@FSPL
\newif\ifsuftesi@periodicalaureo
\newif\ifsuftesi@screen
+\newif\ifsuftesi@pagelefttoc
+\newif\ifsuftesi@twocolumntoc
+\newif\ifsuftesi@twocolumnlof
+\newif\ifsuftesi@twocolumnlot
+\newif\ifsuftesi@reverseauthortitle
+\newif\ifsuftesi@collection
\DeclareOption{a5paper}{%
\ClassError{suftesi}{Option 'a5paper' not available}}
\DeclareOption{b5paper}{%
@@ -74,15 +85,19 @@
\relax
\LoadClass{book}
\define@choicekey{}{documentstructure}[\val\nr]
- {book,article}[book]{%
+ {book,article,collection}[book]{%
\ifcase\nr\relax
+\disable@keys{}{secnumstyle}
\or
\suftesi@articletrue
\@titlepagefalse
+\or
+\suftesi@collectiontrue
+ \setkeys{}{headerstyle=authortitleinner}
\fi}
\RequirePackage{geometry}
\define@choicekey{}{pagelayout}[\val\nr]
- {standard,periodical,compact,supercompact,elements,
+ {standard,periodical,compact,supercompact,supercompactaureo,elements,
periodicalaureo}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -135,6 +150,18 @@
marginparwidth= 18mm,
marginparsep= 8pt}
\or
+\suftesi@supercompacttrue
+ \DeclareRobustCommand{\SUF@chaptersize}{\large}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 175mm,
+ textwidth= 108mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ marginratio= 1:1,
+ marginparwidth= 11mm,
+ marginparsep= 7pt}\or
\suftesi@elementspagelayouttrue
\geometry{%
heightrounded,
@@ -279,63 +306,81 @@
\ifcase\nr\relax
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{}
+ \def\SUF@toclabelnum{\@Roman}
\or
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{.}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{.}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{.}
+ \def\SUF@toclabelnum{\@Roman}
\fi}
\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thechapter{\Roman{chapter}}
\def\SUF@dotchap{}
+ \def\SUF@toclabelnum{\@Roman}
\or
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@dotchap{.}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{.}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thechapter{\Roman{chapter}}
\def\SUF@dotchap{.}
+ \def\SUF@toclabelnum{\@Roman}
\fi}
\define@choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF@thesection{\arabic{section}}
\def\SUF@dotsec{}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thesection{\Roman{section}}
\def\SUF@dotsec{}
+ \def\SUF@toclabelnum{\@Roman}
\or
\def\SUF@thesection{\arabic{section}}
\def\SUF@dotsec{.}
+ \def\SUF@toclabelnum{}
\or
\def\SUF@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{.}
+ \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thesection{\Roman{section}}
\def\SUF@dotsec{.}
+ \def\SUF@toclabelnum{\@Roman}
\fi}
\define@choicekey{}{smallcapsstyle}[\val\nr]
{low,upper}[low]{%
@@ -450,12 +495,20 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\fi}
\RequirePackage{caption}
\define@choicekey{}{captionstyle}[\val\nr]
- {standard,elements}[standard]{%
+ {standard,sanserif,italic,smallcaps,elements}[standard]{%
\ifcase\nr\relax
\captionsetup{labelsep=period,font=small}
\or
\captionsetup{labelsep=period,font=small}
\captionsetup{font+=sf}
+\or
+ \captionsetup{labelsep=period,font=small}
+ \captionsetup{font+=it}
+\or
+ \captionsetup{labelsep=period,font=small,labelfont=sc}
+\or
+ \captionsetup{labelsep=period,font=small}
+ \captionsetup{font+=sf}
\fi
}
\define@choicekey{}{marginpar}[\val\nr]
@@ -480,6 +533,36 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\or
\suftesi@pagelefttoctrue
\fi}
+\define@choicekey{}{twocolcontents}[\val\nr]{%
+ toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\ifcase\nr\relax
+ \suftesi@twocolumntoctrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumntoctrue
+ \suftesi@twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumntoctrue
+ \suftesi@twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumnloftrue
+ \suftesi@twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi@twocolumntoctrue
+ \suftesi@twocolumnloftrue
+ \suftesi@twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\fi
+}
\define@choicekey{}{defaultfont}[\val\nr]{%
palatino,standard}[palatino]{%
\ifcase\nr\relax
@@ -560,53 +643,137 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\or
\setkeys{}{chapstyle=parright}
\or
- \setkeys{}{chapstyle=left,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=left,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=center,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=center,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=right,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=right,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parleft,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parleft,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parcenter,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parcenter,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parright,chapfont=italic,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parright,
+ chapfont=italic,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=left,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=center,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=right,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parleft,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parcenter,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps,headerfont=italic}
+ \setkeys{}{
+ chapstyle=parright,
+ chapfont=italic,
+ secfont=smallcaps,
+ headerfont=italic}
\or
- \setkeys{}{chapstyle=left,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=left,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=center,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=center,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=right,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=right,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parleft,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parleft,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parcenter,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parright,chapfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parright,
+ chapfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=left,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=center,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=right,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parleft,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parcenter,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
- \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps}
+ \setkeys{}{
+ chapstyle=parright,
+ chapfont=smallcaps,
+ secfont=smallcaps,
+ headerfont=smallcaps}
\or
\setkeys{}{
pagelayout=elements,
@@ -680,6 +847,38 @@ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
quotesize,footnotestyle,liststyle,captionstyle,parindent}
\fi}
+\define@choicekey{}{papertitlestyle}[\val\nr]{%
+ left,center,right}[left]{%
+\ifcase\nr\relax
+ \def\SUF@lr@coll@titleSwitch{\filright}
+\or
+ \def\SUF@lr@coll@titleSwitch{\filcenter}
+\or
+ \def\SUF@lr@coll@titleSwitch{\filleft}
+\fi}
+\define@choicekey{}{revauthortitle}[\val\nr]
+ {true,false}[false]{%
+\ifcase\nr\relax
+\suftesi@reverseauthortitletrue
+\or\relax
+\fi}
+\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@titlefont@Switch{\relax}
+\or
+\def\SUF@titlefont@Switch{\itshape}
+\or
+\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
+
+\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+\def\SUF@authorfont@Switch{\relax}
+\or
+\def\SUF@authorfont@Switch{\itshape}
+\or
+\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
+\fi}
\ExecuteOptionsX<>{
captionstyle=standard,
marginpar=true,
@@ -706,7 +905,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
secnumstyle=arabic,
partnumstyle=Roman,
chapnumstyle=arabic,
- smallcapsstyle=low}
+ smallcapsstyle=low,
+ titlefont=italic,
+ authorfont=roman,
+ revauthortitle=false,
+ papertitlestyle=left,
+ authorfont=roman,
+ titlefont=italic}
\ProcessOptionsX<>\relax
\XKV@useoption{a4paper} \XKV@useoption{10pt}
\XKV@useoption{11pt} \XKV@useoption{12pt}
@@ -739,8 +944,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\else
\fi
\ifxetex
- \relax
- \else
+\AtBeginDocument{
+\@ifpackageloaded{fontspec}
+ {\relax}
+ {\ClassError{suftesi}
+ {***********************************\MessageBreak
+ * For using suftesi with XeLaTeX\MessageBreak
+ * load either 'fontspec' or 'mathspec'\MessageBreak
+ ************************************}
+ {***********************************\MessageBreak
+ * For using suftesi with XeLaTeX\MessageBreak
+ * load either 'fontspec' or 'mathspec'\MessageBreak
+ ************************************}}
+ }
+\else
\RequirePackage[LGR,T1]{fontenc}
\AtBeginDocument{\fontencoding{T1}\selectfont}
\ifsuftesi@standardfont
@@ -799,7 +1016,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
\newcommand{\chapnumfont}[1]{%
\def\SUF@chapnumfont{#1}}
- \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
+ \chapnumfont{\relax}%
\else
\DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
\scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
@@ -1180,7 +1397,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\@author
\end{tabular}\par}%
\vskip 1.5em%
- {\large \@date \par}% % Set date in \large size.
+ {\large \@date \par}%
\end{center}\par
\@thanks
\vfil\null
@@ -1266,7 +1483,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\fi
\else
\newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
+ \global\@topnum\z@
\@standardmaketitle
\fi
\thispagestyle{plain}\@thanks
@@ -1298,6 +1515,162 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\par
\vskip 1.5em}
\fi
+\ifsuftesi@collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+ \def\@journalname{\@latex@warning@no@line{%
+ No \noexpand\journalname given}}
+\def\issn#1{\gdef\@issn{#1}}
+ \def\@issn{\@latex@warning@no@line{%
+ No \noexpand\issn given}}
+\def\doi#1{\gdef\@doi{#1}}
+ \def\@doi{\@latex@warning@no@line{%
+ No \noexpand\doi given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+ \def\@journalvolume{\@latex@warning@no@line{%
+ No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+ \def\@journalnumber{\@latex@warning@no@line{%
+ No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+ \def\@issue{\@latex@warning@no@line{%
+ No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+ \def\@journalyear{\@latex@warning@no@line{%
+ No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+ \def\@journalwebsite{\@latex@warning@no@line{%
+ No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected@xdef\@thanks{%
+ \@thanks\protect\footnotetext[\the\c@footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+ \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+ \def\@collectiontitle{\@latex@warning@no@line{%
+ No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+ \def\@collectioneditor{\@latex@warning@no@line{%
+ No \noexpand\collectioneditor given}}
+\newcommand*\l@title[2]{%
+ \ifnum \c@tocdepth >\m@ne
+ \addpenalty{-\@highpenalty}%
+ \vskip 1.0ex \@plus\p@
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \advance\leftskip1em
+ \hskip -\leftskip
+ #1\nobreak%
+ \ifsuftesi@dottedtoc\dotfill%
+ \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \else
+ \ifsuftesi@raggedtoc%
+ \nobreak\hskip1em #2 \hfill\null\par
+ \else
+ \ifsuftesi@pagelefttoc
+ \ClassError{suftesi}
+ {\MessageBreak
+ You can not use tocstyle=leftpage\MessageBreak
+ with documentstructure=collection}
+ {You can not use tocstyle=leftpage\MessageBreak
+ with documentstructure=collection}
+ \else
+ \nobreak\hfill #2\par
+ \fi
+ \fi
+ \fi
+ \penalty\@highpenalty
+ \endgroup
+ \fi}
+\renewcommand\maketitle{\par
+ \begingroup
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+ \long\def\@makefntext##1{\parindent 1em\noindent
+ \hb@xt@1.8em{%
+ \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+ \if@twocolumn
+ \ifnum \col@number=\@ne
+ \@maketitle
+ \else
+ \twocolumn[\@maketitle]%
+ \fi
+ \else
+ \newpage
+ \global\@topnum\z@
+ \@maketitle
+ \fi
+ \thispagestyle{plain}\@thanks
+ \endgroup
+ \setcounter{footnote}{0}%
+ \global\let\@thanks\@empty
+ \let\thanks\@gobble}
+\def\@maketitle{%
+ \cleardoublepage
+ \SUF@chaptersize
+ \SUF@lr@coll@titleSwitch
+ \let\footnote\thanks
+ \parindent=0pt
+ \refstepcounter{title}%
+ {\ifsuftesi@reverseauthortitle
+ \SUF@titlefont@Switch{\@title}%
+ \else\SUF@authorfont@Switch{\@author}\fi}%
+ \label{begin:\thetitle}%
+ \begingroup
+ \let\thanks\@gobble
+ \addcontentsline{toc}{title}{\normalfont{\@author}\newline%
+ \itshape\@headtitle}
+ \endgroup
+ \vspace{2ex}\par
+ {\ifsuftesi@reverseauthortitle
+ \SUF@authorfont@Switch{\@author}%
+ \else
+ \SUF@titlefont@Switch{\@title}%
+ \fi\\}
+ \vskip2.5cm}
+\newcommand{\includeart}[1]{%
+ \begingroup
+ \setcounter{section}{0}
+ \input{#1}\label{end:\thetitle}
+ \clearpage
+ \global\let\@thanks\@empty
+ \endgroup}
+\newcommand{\frontispiece}{%
+ \thispagestyle{empty}%
+ \begingroup
+ \centering
+ \null\vspace{\stretch{1}}
+
+ {\SUF@chaptersize\@collectiontitle\par}
+ \vskip5ex
+
+ \@collectioneditor
+ \vspace{\stretch{2}}
+
+ \@date
+
+ \endgroup
+ \clearpage}
+ \setcounter{tocdepth}{0}
+ \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}
+ \else
+\fi
\AtBeginDocument{%
\@ifpackagewith{frontespizio}{suftesi}
{\ifsuftesi@periodical
@@ -1318,13 +1691,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\@ifpackageloaded{frontespizio}
{\ifsuftesi@periodical
\Margini {1cm}{7cm}{5cm}{1cm}
+ \Rientro{1cm}
\else
\ifsuftesi@compact
\Margini {1cm}{7cm}{6cm}{1cm}
+ \Rientro{1cm}
\else
\ifsuftesi@supercompact
\Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
\else
+ \ifsuftesi@periodicalaureo
+ \Margini {1cm}{7cm}{5cm}{1cm}
+ \Rientro{1cm}
+ \fi
\fi
\fi
\fi}
@@ -1375,7 +1755,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\titlecontents{part}
[0em]
{\addvspace{3ex}\partname~}
- {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+ {\makebox[\SUF@label@part][l]{%
+ \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -1388,7 +1769,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\gdef\thechapter{\@Alph\c@chapter}
\titleformat{\chapter}[block]
{\vskip-22pt}%
- {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+ {\small%
+ \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
{0pt}
{\small\SUF@titlesmallcaps}
[\rule{\textwidth}{.4pt}]
@@ -1550,6 +1932,19 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
}%
}
{\relax}}
+\ifsuftesi@collection
+ \newenvironment{abstract}{%
+ \if@twocolumn
+ \section*{\abstractname}%
+ \else
+ \small
+ \begin{center}%
+ {\abstractname\vspace{-.5em}\vspace{\z@}}%
+ \end{center}%
+ \quotation
+ \fi}
+ {\if@twocolumn\else\endquotation\fi}
+\else
\if@titlepage
\newenvironment{abstract}{%
\titlepage
@@ -1573,6 +1968,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\fi}
{\if@twocolumn\else\endquotation\fi}
\fi
+\fi
\newcommand\abstractname{Abstract}
\newcommand{\colophon}[3][]{%
\thispagestyle{empty}
@@ -1620,8 +2016,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\noindent \hskip-.5em\cc #1 \@author%
\vskip1ex
-\small\noindent This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
-To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+\small\noindent This work is licensed under the Creative Commons
+Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+To view a copy of this license,
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
\endgroup
@@ -1630,7 +2028,11 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\null\vspace{\stretch{1}}
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janusz M. Nowacki.
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
+\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona,
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
+Janusz M. Nowacki.
\endgroup
@@ -1644,42 +2046,54 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
only for the FSPL styles}}
\fi
\RequirePackage{titletoc}
-\newlength\SUF@label@chapter
-\setlength\SUF@label@chapter{.5em}
-\newcommand*{\toclabelspace}[1]{\setlength\SUF@label@chapter{#1}}
-\let\toclabelwidth\toclabelspace
+\newlength\SUF@label@chap
+\setlength\SUF@label@chap{.5em}
+\newcommand*{\toclabelwidth}[2]{%
+ \addtolength{\csname SUF@label@#1\endcsname}{#2}%
+ \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}%
+\newcommand{\toclabelspace}{%
+ \ClassError{suftesi}
+ {\MessageBreak
+ \noexpand\toclabelspace is not more defined\MessageBreak
+ Use \noexpand\toclabelwidth instead.\MessageBreak
+ See package documentation for details}
+ {\MessageBreak
+ \noexpand\toclabelspace is not more defined\MessageBreak
+ Use \noexpand\toclabelwidth instead.\MessageBreak
+ See package documentation for details}}
\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
+\newlength\SUF@label@sec
+\newlength\SUF@label@subsec
+\newlength\SUF@label@subsubsec
+\newlength\SUF@label@par
+\newlength\SUF@label@subpar
+\newlength\SUF@label@fig
+\newlength\SUF@label@tab
\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@section}
-\setlength\SUF@label@table
- {\SUF@label@section}
+ {\SUF@label@chap}
+\setlength\SUF@label@sec
+ {\dimexpr(\SUF@label@chap+.5em)}
+\setlength\SUF@label@subsec
+ {\dimexpr(\SUF@label@sec+.5em)}
+\setlength\SUF@label@subsubsec
+ {\dimexpr(\SUF@label@subsec+.5em)}
+\setlength\SUF@label@par
+ {\dimexpr(\SUF@label@subsubsec+.5em)}
+\setlength\SUF@label@subpar
+ {\dimexpr(\SUF@label@par+.5em)}
+\setlength\SUF@label@fig
+ {\SUF@label@sec}
+\setlength\SUF@label@tab
+ {\SUF@label@sec}
}
\titlecontents{part}
[0em]
{\addvspace{3ex}\partname\hspace*{.5em}}
- {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+ {\makebox[\SUF@label@part][l]{%
+ \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -1703,17 +2117,17 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\newlength\SUF@addto@tochang@fig
\newlength\SUF@addto@tochang@tab
\setlength\SUF@tochang@chap
- {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+ {\dimexpr(1em+\SUF@tochang+\SUF@label@chap+1em)}
\setlength\SUF@tochang@sec
- {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+ {\dimexpr(\SUF@tochang@chap+\SUF@label@sec+1em)}
\setlength\SUF@tochang@subsec
- {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+ {\dimexpr(\SUF@tochang@sec+\SUF@label@subsec+1em)}
\setlength\SUF@tochang@subsubsec
- {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+ {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsec+1em)}
\setlength\SUF@tochang@par
- {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+ {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@par+1em)}
\setlength\SUF@tochang@subpar
- {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+ {\dimexpr(\SUF@tochang@par+\SUF@label@subpar+1em)}
\setlength\SUF@tochang@fig
{\SUF@tochang@chap}
\setlength\SUF@tochang@tab
@@ -1721,19 +2135,19 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\setlength\SUF@addto@tochang@chap
{\SUF@tochang}
\setlength\SUF@addto@tochang@sec
- {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+ {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@sec+.5em)}
\setlength\SUF@addto@tochang@subsec
- {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+ {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsec+.5em)}
\setlength\SUF@addto@tochang@subsubsec
- {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+ {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsec+.5em)}
\setlength\SUF@addto@tochang@par
- {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+ {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@par+.5em)}
\setlength\SUF@addto@tochang@subpar
- {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+ {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subpar+.5em)}
\setlength\SUF@addto@tochang@fig
- {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+ {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
\setlength\SUF@addto@tochang@tab
- {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)}
+ {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}
}
\titlecontents{chapter}
[\SUF@tochang@chap]
@@ -1741,8 +2155,8 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
{\hskip-\SUF@tochang@chap%
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap%
- \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
- \hspace*{1em}}
+ \makebox[\SUF@label@chap][l]{%
+ \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
{\hskip-\SUF@tochang@chap%
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap}
@@ -1753,57 +2167,54 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
{}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
- \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@sec][l]{%
+ \ifsuftesi@article\SUF@toclabelnum%
+ \else\fi\thecontentslabel}\hspace*{1em}}
{\hskip-\SUF@tochang@sec%
- \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
- \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec}
{}
\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}}
+ \makebox[\SUF@label@subsec][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}}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec}
{}
\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}}
+ \makebox[\SUF@label@subsubsec][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}}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec}
{}
\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}}
+ \makebox[\SUF@label@par][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}}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par}
{}
\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}}
+ \makebox[\SUF@label@subpar][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}}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar}
{}
\titlecontents{figure}
[\SUF@tochang@fig]
{}
{\hskip-\SUF@tochang@fig%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
- \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
{}
{}
\titlecontents{table}
@@ -1811,7 +2222,7 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
{}
{\hskip-\SUF@tochang@tab%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
- \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
{}
{}
\else
@@ -1824,28 +2235,41 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\newlength\SUF@tocindent@subpar
\newlength\SUF@tocindent@fig
\newlength\SUF@tocindent@tab
+\ifsuftesi@article
+\setlength\SUF@tocindent@sec
+ {\dimexpr(\SUF@label@chap+1.5em)}
+\setlength\SUF@tocindent@subsec
+ {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
+\setlength\SUF@tocindent@subsubsec
+ {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
+\setlength\SUF@tocindent@par
+ {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
+\setlength\SUF@tocindent@subpar
+ {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\else
\setlength\SUF@tocindent@chap
- {\dimexpr(\SUF@label@chapter+1em)}
+ {\dimexpr(\SUF@label@chap+1em)}
\setlength\SUF@tocindent@sec
- {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+ {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec+1em)}
\setlength\SUF@tocindent@subsec
- {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+ {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsec+1em)}
\setlength\SUF@tocindent@subsubsec
- {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+ {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsec+1em)}
\setlength\SUF@tocindent@par
- {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+ {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@par+1em)}
\setlength\SUF@tocindent@subpar
- {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+ {\dimexpr(\SUF@tocindent@par+\SUF@label@subpar+1em)}
+\fi
\setlength\SUF@tocindent@fig
- {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+ {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
\setlength\SUF@tocindent@tab
- {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)}
+ {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)}
}
\titlecontents{chapter}
[\SUF@tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF@tocindent@chap%
- \makebox[\SUF@label@chapter][l]{\thecontentslabel}%
+ \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
\hspace*{1em}}
{\hskip-\SUF@tocindent@chap}
{\SUF@chaptitlerule\contentspage}
@@ -1853,56 +2277,53 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\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}}
+ {\hskip-\dimexpr(\SUF@label@sec+1em)%
+ \makebox[\SUF@label@sec][l]{%
+ \ifsuftesi@article\SUF@toclabelnum%
+ \else\fi\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@sec+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}}
+ {\hskip-\dimexpr(\SUF@label@subsec+1em)%
+ \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subsec+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}}
+ {\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
+ \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subsubsec+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}}
+ {\hskip-\dimexpr(\SUF@label@par+1em)%
+ \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@par+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}}
+ {\hskip-\dimexpr(\SUF@label@subpar+1em)%
+ \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subpar+1em)}
{\SUF@titlerule\contentspage}
\titlecontents{figure}
[\SUF@tocindent@fig]
{}
{\hskip-\SUF@tocindent@fig%
- \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@fig][l]{\thecontentslabel}\hspace*{1em}}
{}
{\SUF@titlerule\contentspage}
\titlecontents{table}
[\SUF@tocindent@tab]
{}
{\hskip-\SUF@tocindent@tab%
- \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@tab][l]{\thecontentslabel}\hspace*{1em}}
{}
{\SUF@titlerule\contentspage}
\fi
@@ -1912,7 +2333,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
\thispagestyle{empty}
- \@starttoc{toc}%
+ \ifsuftesi@twocolumntoc
+ \begin{multicols}{2}
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoffigures{%
@@ -1920,7 +2347,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\section*{\listfigurename}%
\@mkboth{\listfigurename}{\listfigurename}%
\thispagestyle{empty}
- \@starttoc{lof}%
+ \ifsuftesi@twocolumnlof
+ \begin{multicols}{2}
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoftables{%
@@ -1928,7 +2361,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\section*{\listtablename}%
\@mkboth{\listtablename}{\listtablename}%
\thispagestyle{empty}
- \@starttoc{lot}%
+ \ifsuftesi@twocolumnlot
+ \begin{multicols}{2}
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\vspace{2ex}%
}
\else
@@ -1943,7 +2382,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\contentsname}
{\contentsname}%
\thispagestyle{empty}
- \@starttoc{toc}%
+ \ifsuftesi@twocolumntoc
+ \begin{multicols}{2}
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoffigures{%
@@ -1956,7 +2401,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\@mkboth{\listfigurename}%
{\listfigurename}%
\thispagestyle{empty}
- \@starttoc{lof}%
+ \ifsuftesi@twocolumnlof
+ \begin{multicols}{2}
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoftables{%
@@ -1970,7 +2421,13 @@ To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc
\listtablename}%
{\listtablename}%
\thispagestyle{empty}
- \@starttoc{lot}%
+ \ifsuftesi@twocolumnlot
+ \begin{multicols}{2}
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\if@restonecol\twocolumn\fi
}
\fi