summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-20 20:18:04 +0000
committerKarl Berry <karl@freefriends.org>2021-05-20 20:18:04 +0000
commitdcbd7054adeb27d771321139957652cf12e181a9 (patch)
tree9fcb18fa1dc0cbd25633b999527a541032f39449 /Master/texmf-dist/tex/latex/suftesi
parent5d4d6e312887e7c62c64d35f26f62f135998afa9 (diff)
suftesi (20may21)
git-svn-id: svn://tug.org/texlive/trunk@59280 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls1064
1 files changed, 614 insertions, 450 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 9a4109fd3ce..259fe6745de 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -26,56 +26,58 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2021/02/06 v3.0.2 A class for typesetting theses, books and articles]
+ [2021/05/20 v3.1.0 A class for typesetting theses, books and articles]
\RequirePackage{xkeyval}
-\newif\ifsuftesi@compatibility
-\newif\ifsuftesi@nofont
-\newif\ifsuftesi@greekfont
+\newif\ifsuftesi@article
+\newif\ifsuftesi@authortitle
+\newif\ifsuftesi@collection
\newif\ifsuftesi@standard
\newif\ifsuftesi@cochineal
\newif\ifsuftesi@libertine
\newif\ifsuftesi@palatino
+\newif\ifsuftesi@compatibility
+\newif\ifsuftesi@nofont
+\newif\ifsuftesi@greekfont
\newif\ifsuftesi@porson
\newif\ifsuftesi@artemisia
\newif\ifsuftesi@bodoni
\newif\ifsuftesi@cbgreek
\newif\ifsuftesi@mathminimal
\newif\ifsuftesi@mathextended
-\newif\ifsuftesi@centerheader
-\newif\ifsuftesi@sufplain
-\newif\ifsuftesi@article
-\newif\ifsuftesi@authortitle
\newif\ifsuftesi@periodical
\newif\ifsuftesi@periodicalaureo
\newif\ifsuftesi@compact
\newif\ifsuftesi@compactaureo
\newif\ifsuftesi@supercompact
\newif\ifsuftesi@supercompactaureo
+\newif\ifsuftesi@pocketa
+\newif\ifsuftesi@pocketb
+\newif\ifsuftesi@pocketc
\newif\ifsuftesi@screen
\newif\ifsuftesi@screencentered
-\newif\ifsuftesi@dottedtoc
-\newif\ifsuftesi@raggedtoc
+\newif\ifsuftesi@centerheader
+\newif\ifsuftesi@sufplain
\newif\ifsuftesi@numparpart
\newif\ifsuftesi@numparchap
\newif\ifsuftesi@numparsec
\newif\ifsuftesi@numparsubsec
\newif\ifsuftesi@numparsubsubsec
-\newif\ifsuftesi@smallcapspart
-\newif\ifsuftesi@smallcapschap
-\newif\ifsuftesi@smallcapssec
-\newif\ifsuftesi@draftdate
-\newif\ifsuftesi@fewfootnotes
-\newif\ifsuftesi@partpage
-\newif\ifsuftesi@FSPL
+\newif\ifsuftesi@dottedtoc
+\newif\ifsuftesi@raggedtoc
\newif\ifsuftesi@pagelefttoc
\newif\ifsuftesi@twocolumntoc
\newif\ifsuftesi@twocolumnlof
\newif\ifsuftesi@twocolumnlot
-\newif\ifsuftesi@reverseauthortitle
-\newif\ifsuftesi@collection
+\newif\ifsuftesi@partialtoc
\newif\ifsuftesi@toccompactsec
\newif\ifsuftesi@toccompactsubsec
\newif\ifsuftesi@toccompactsubsubsec
+\newif\ifsuftesi@toccompactpar
+\newif\ifsuftesi@toccompactsubpar
+\newif\ifsuftesi@draftdate
+\newif\ifsuftesi@fewfootnotes
+\newif\ifsuftesi@partpage
+\newif\ifsuftesi@FSPL
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -96,9 +98,9 @@
\DeclareOptionX{parindent}{\setlength{\parindent}{#1}}
\ExecuteOptionsX{parindent=\baselineskip}
\ProcessOptionsX*\relax
-\define@choicekey{}{structure}[\val\nr]
+\define@choicekey{}{structure}[\suftesi@val\suftesi@nr]
{book,article,collection}[book]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@chapswitch{\thechapter.}
\or
\suftesi@articletrue
@@ -109,21 +111,21 @@
\setkeys{}{headerstyle=authortitleinner}
\def\SUF@chapswitch{}
\fi}
-\define@choicekey{}{documentstructure}[\val\nr]
+\define@choicekey{}{documentstructure}[\suftesi@val\suftesi@nr]
{book,article,collection}[book]{%
\ClassWarningNoLine{suftesi}{%
'documentstructure' option is deprecated.\MessageBreak
Use 'structure' option instead}
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\setkeys{}{structure=book}
\or
\setkeys{}{structure=article}
\or
\setkeys{}{structure=collection}
\fi}
-\define@choicekey{}{defaultfont}[\val\nr]
+\define@choicekey{}{defaultfont}[\suftesi@val\suftesi@nr]
{none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@nofonttrue
\or
\suftesi@cochinealtrue
@@ -136,9 +138,9 @@
\or
\suftesi@compatibilitytrue
\fi}
-\define@choicekey{}{mathfont}[\val\nr]
+\define@choicekey{}{mathfont}[\suftesi@val\suftesi@nr]
{none,minimal,extended}[minimal]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@mathminimalfalse
\suftesi@mathextendedfalse
\or
@@ -146,9 +148,9 @@
\or
\suftesi@mathextendedtrue
\fi}
-\define@choicekey{}{greekfont}[\val\nr]
+\define@choicekey{}{greekfont}[\suftesi@val\suftesi@nr]
{none,artemisia,porson,bodoni,cbgreek}[none]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@greekfontfalse
\or
\suftesi@greekfonttrue\suftesi@artemisiatrue
@@ -160,10 +162,10 @@
\suftesi@greekfonttrue\suftesi@cbgreektrue
\fi}
\RequirePackage{geometry}
-\define@choicekey{}{pagelayout}[\val\nr]
+\define@choicekey{}{pagelayout}[\suftesi@val\suftesi@nr]
{standard,standardaureo,periodical,periodicalaureo,compact,compactaureo,
supercompact,supercompactaureo,pocketa,pocketb,pocketc}[standard]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
@@ -295,8 +297,8 @@
marginratio= 1:1,
marginparwidth= 11mm,
marginparsep= 7pt}
-\or% pocketa
-\suftesi@supercompactaureotrue
+\or
+\suftesi@pocketatrue
\DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
@@ -313,8 +315,8 @@
vmarginratio= 2:3,
marginparwidth= 12mm,
marginparsep= 7pt}
-\or% pocketb
-\suftesi@supercompactaureotrue
+\or
+\suftesi@pocketBtrue
\DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
@@ -331,8 +333,8 @@
vmarginratio= 2:3,
marginparwidth= 15mm,
marginparsep= 7pt}
-\or% pocketc
-\suftesi@supercompactaureotrue
+\or
+\suftesi@pocketCtrue
\DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
@@ -350,15 +352,15 @@
marginparwidth= 8mm,
marginparsep= 7pt}
\fi}
-\define@choicekey{}{partstyle}[\val\nr]
+\define@choicekey{}{partstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@lr@PARTSwitch{\filright}
\or
\def\SUF@lr@PARTSwitch{\filcenter}
\or
\def\SUF@lr@PARTSwitch{\filleft}
-\or%numpar
+\or
\def\SUF@lr@PARTSwitch{\filright}
\suftesi@numparparttrue
\or
@@ -368,15 +370,15 @@
\def\SUF@lr@PARTSwitch{\filleft}
\suftesi@numparparttrue
\fi}
-\define@choicekey{}{chapstyle}[\val\nr]
+\define@choicekey{}{chapstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@lr@CHAPSwitch{\filright}
\or
\def\SUF@lr@CHAPSwitch{\filcenter}
\or
\def\SUF@lr@CHAPSwitch{\filleft}
-\or%numparchap
+\or
\def\SUF@lr@CHAPSwitch{\filright}
\suftesi@numparchaptrue
\or
@@ -386,15 +388,15 @@
\def\SUF@lr@CHAPSwitch{\filleft}
\suftesi@numparchaptrue
\fi}
-\define@choicekey{}{secstyle}[\val\nr]
+\define@choicekey{}{secstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@lr@SECSwitch{\filright}
\or
\def\SUF@lr@SECSwitch{\filcenter}
\or
\def\SUF@lr@SECSwitch{\filleft}
-\or%numparsec
+\or
\def\SUF@lr@SECSwitch{\filright}
\suftesi@numparsectrue
\or
@@ -404,99 +406,117 @@
\def\SUF@lr@SECSwitch{\filleft}
\suftesi@numparsectrue
\fi}
-\define@choicekey{}{subsecstyle}[\val\nr]
+\define@choicekey{}{subsecstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@lr@SUBSECSwitch{\filright}
\or
\def\SUF@lr@SUBSECSwitch{\filcenter}
\or
\def\SUF@lr@SUBSECSwitch{\filleft}
-\or%numparsubsec
-\def\SUF@lr@SUBSECSwitch{\filright}
+\or
+ \def\SUF@lr@SUBSECSwitch{\filright}
\suftesi@numparsubsectrue
\or
-\def\SUF@lr@SUBSECSwitch{\filcenter}
+ \def\SUF@lr@SUBSECSwitch{\filcenter}
\suftesi@numparsubsectrue
\or
-\def\SUF@lr@SUBSECSwitch{\filleft}
+ \def\SUF@lr@SUBSECSwitch{\filleft}
\suftesi@numparsubsectrue
\fi}
-\define@choicekey{}{subsubsecstyle}[\val\nr]
+\define@choicekey{}{subsubsecstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@lr@SUBSUBSECSwitch{\filright}
\or
\def\SUF@lr@SUBSUBSECSwitch{\filcenter}
\or
\def\SUF@lr@SUBSUBSECSwitch{\filleft}
-\or%numparsubsubsec
-\def\SUF@lr@SUBSUBSECSwitch{\filright}
+\or
+ \def\SUF@lr@SUBSUBSECSwitch{\filright}
\suftesi@numparsubsubsectrue
\or
-\def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+ \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
\suftesi@numparsubsubsectrue
\or
-\def\SUF@lr@SUBSUBSECSwitch{\filleft}
+ \def\SUF@lr@SUBSUBSECSwitch{\filleft}
\suftesi@numparsubsubsectrue
\fi}
-\define@choicekey{}{partfont}[\val\nr]
+\define@choicekey{}{partfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@PART@StyleSwitch{\relax}
\or
\def\SUF@PART@StyleSwitch{\itshape}
\or
\def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{chapfont}[\val\nr]
+\define@choicekey{}{chapfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@CHAP@StyleSwitch{\relax}
\or
\def\SUF@CHAP@StyleSwitch{\itshape}
\or
\def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{secfont}[\val\nr]
+\define@choicekey{}{secfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@SEC@StyleSwitch{\relax}
\or
\def\SUF@SEC@StyleSwitch{\itshape}
\or
\def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{subsecfont}[\val\nr]
+\define@choicekey{}{subsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@SUBSEC@StyleSwitch{\relax}
\or
\def\SUF@SUBSEC@StyleSwitch{\itshape}
\or
\def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{subsubsecfont}[\val\nr]
+\define@choicekey{}{subsubsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@SUBSUBSEC@StyleSwitch{\relax}
\or
\def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
\or
\def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{smallcapsstyle}[\val\nr]
+\define@choicekey{}{parfont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[roman]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@PAR@StyleSwitch{\relax}
+\or
+ \def\SUF@PAR@StyleSwitch{\itshape}
+\or
+ \def\SUF@PAR@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{subparfont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[roman]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@SUBPAR@StyleSwitch{\relax}
+\or
+ \def\SUF@SUBPAR@StyleSwitch{\itshape}
+\or
+ \def\SUF@SUBPAR@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{smallcapsstyle}[\suftesi@val\suftesi@nr]
{low,upper}[low]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\suftesi@MakeTextLowercase{\MakeLowercase}
\def\suftesi@MakeTextTOCLowercase{\lowercase}
\or
\def\suftesi@MakeTextLowercase{\relax}
\def\suftesi@MakeTextTOCLowercase{\relax}
\fi}
-\define@choicekey{}{partnumstyle}[\val\nr]
+\define@choicekey{}{partnumstyle}[\suftesi@val\suftesi@nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{}
\or
@@ -515,9 +535,9 @@
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{.}
\fi}
-\define@choicekey{}{chapnumstyle}[\val\nr]
+\define@choicekey{}{chapnumstyle}[\suftesi@val\suftesi@nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
@@ -548,9 +568,9 @@
\def\SUF@dotchap{.}
\def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
-\define@choicekey{}{secnumstyle}[\val\nr]
+\define@choicekey{}{secnumstyle}[\suftesi@val\suftesi@nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@thesection{\SUF@chapswitch\arabic{section}}
\def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
@@ -581,9 +601,9 @@
\def\SUF@dotsec{.}
\def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
-\define@choicekey{}{subsecnumstyle}[\val\nr]
+\define@choicekey{}{subsecnumstyle}[\suftesi@val\suftesi@nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
\def\SUF@dotsubsec{}
\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
@@ -608,9 +628,9 @@
\def\SUF@dotsubsec{.}
\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
-\define@choicekey{}{subsubsecnumstyle}[\val\nr]
+\define@choicekey{}{subsubsecnumstyle}[\suftesi@val\suftesi@nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
\def\SUF@dotsubsubsec{}
\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
@@ -635,9 +655,9 @@
\def\SUF@dotsubsubsec{.}
\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
-\define@choicekey{}{tocstyle}[\val\nr]
+\define@choicekey{}{tocstyle}[\suftesi@val\suftesi@nr]
{standard,dotted,ragged,leftpage}[standard]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@titlerule{\titlerule*{}}
\def\SUF@chaptitlerule{\titlerule*{}}
\or
@@ -651,33 +671,52 @@
\or
\suftesi@pagelefttoctrue
\fi}
-\define@choicekey{}{compacttoc}[\val\nr]
- {sec,subsec,subsubsec}[sec]{%
-\ifcase\nr\relax
+\define@choicekey{}{compacttoc}[\suftesi@val\suftesi@nr]
+ {sec,subsec,subsubsec,par,subpar}[sec]{%
+\ifcase\suftesi@nr\relax
\suftesi@toccompactsectrue
\suftesi@toccompactsubsectrue
\suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\hskip.5em}
- \def\suf@ssscorrect{\hskip.5em}
- \def\suf@ctocdotsec{.}
- \def\suf@ctocdotssec{}
- \def\suf@ctocdotsssec{}
+ \suftesi@toccompactpartrue
+ \suftesi@toccompactsubpartrue
+ \def\SUF@sscorrect{\hskip.5em}
+ \def\SUF@ssscorrect{\hskip.5em}
+ \def\SUF@pcorrect{\hskip.5em}
+ \def\SUF@pcorrect{\hskip.5em}
\or
\suftesi@toccompactsubsectrue
\suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\relax}
- \def\suf@ssscorrect{\hskip.5em}
- \def\suf@ctocdotssec{.}
- \def\suf@ctocdotsssec{}
+ \suftesi@toccompactpartrue
+ \suftesi@toccompactsubpartrue
+ \def\SUF@sscorrect{\relax}
+ \def\SUF@ssscorrect{\hskip.5em}
+ \def\SUF@pcorrect{\hskip.5em}
+ \def\SUF@pcorrect{\hskip.5em}
\or
\suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\relax}
- \def\suf@ssscorrect{\relax}
- \def\suf@ctocdotsssec{.}
+ \suftesi@toccompactpartrue
+ \suftesi@toccompactsubpartrue
+ \def\SUF@sscorrect{\relax}
+ \def\SUF@ssscorrect{\relax}
+ \def\SUF@pcorrect{\hskip.5em}
+ \def\SUF@pcorrect{\hskip.5em}
+\or
+ \suftesi@toccompactpartrue
+ \suftesi@toccompactsubpartrue
+ \def\SUF@sscorrect{\relax}
+ \def\SUF@ssscorrect{\relax}
+ \def\SUF@pcorrect{\relax}
+ \def\SUF@pcorrect{\hskip.5em}
+\or
+ \suftesi@toccompactsubpartrue
+ \def\SUF@sscorrect{\relax}
+ \def\SUF@ssscorrect{\relax}
+ \def\SUF@pcorrect{\relax}
+ \def\SUF@pcorrect{\relax}
\fi}
-\define@choicekey{}{twocolcontents}[\val\nr]
+\define@choicekey{}{twocolcontents}[\suftesi@val\suftesi@nr]
{toc,lof,lot,toclof,toclot,loflot,all}[all]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@twocolumntoctrue
\setkeys{}{tocstyle=ragged}
\or
@@ -704,72 +743,79 @@
\suftesi@twocolumnlottrue
\setkeys{}{tocstyle=ragged}
\fi}
-\define@choicekey{}{tocpartfont}[\val\nr]
+\define@choicekey{}{partialtoc}[\suftesi@val\suftesi@nr]
+{true,false}[true]{%
+ \ifcase\suftesi@nr\relax
+ \suftesi@partialtoctrue
+ \or
+ \suftesi@partialtocfalse
+ \fi}
+\define@choicekey{}{tocpartfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@tocPART@font{\relax}
\or
\def\SUF@tocPART@font{\itshape}
\or
\def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{tocchapfont}[\val\nr]
+\define@choicekey{}{tocchapfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@tocCHAP@font{\relax}
\or
\def\SUF@tocCHAP@font{\itshape}
\or
\def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{tocsecfont}[\val\nr]
+\define@choicekey{}{tocsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@tocSEC@font{\relax}
\or
\def\SUF@tocSEC@font{\itshape}
\or
\def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{tocsubsecfont}[\val\nr]
+\define@choicekey{}{tocsubsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@tocSUBSEC@font{\relax}
\or
\def\SUF@tocSUBSEC@font{\itshape}
\or
\def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{tocsubsubsecfont}[\val\nr]
+\define@choicekey{}{tocsubsubsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@tocSUBSUBSEC@font{\relax}
\or
\def\SUF@tocSUBSUBSEC@font{\itshape}
\or
\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{tocauthorfont}[\val\nr]
+\define@choicekey{}{tocparfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
- \def\SUF@tocAUT@font{\relax}
+\ifcase\suftesi@nr\relax
+ \def\SUF@tocPAR@font{\relax}
\or
- \def\SUF@tocAUT@font{\itshape}
+ \def\SUF@tocPAR@font{\itshape}
\or
- \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
+ \def\SUF@tocPAR@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{toctitlefont}[\val\nr]
- {roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
- \def\SUF@tocTIT@font{\relax}
+\define@choicekey{}{tocsubparfont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[roman]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@tocSUBPAR@font{\relax}
\or
- \def\SUF@tocTIT@font{\itshape}
+ \def\SUF@tocSUBPAR@font{\itshape}
\or
- \def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
+ \def\SUF@tocSUBPAR@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
-\define@choicekey{}{headerstyle}[\val\nr]
+\define@choicekey{}{headerstyle}[\suftesi@val\suftesi@nr]
{inner,center,plain,authortitleinner,authortitlecenter}[inner]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
\def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
\or
@@ -788,9 +834,9 @@
\def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}}
\suftesi@centerheadertrue
\fi}
-\define@choicekey{}{headerfont}[\val\nr]
+\define@choicekey{}{headerfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\def\SUF@Rheadstyle{}
\def\SUF@Lheadstyle{}
\def\SUF@thepage{\thepage}
@@ -804,12 +850,12 @@
\def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
\fi}
\RequirePackage[inline]{enumitem}
-\renewcommand\labelitemi{\color{sufgray}\textbullet}
-\setlist{itemsep=.5ex,parsep=0pt,listparindent=\parindent}
-\setlist[description]{font=\normalfont\itshape}
-\define@choicekey{}{liststyle}[\val\nr]
+ \setlist[itemize,1]{label=\color{sufgray}\textbullet}
+ \setlist{itemsep=.5ex,parsep=0pt,listparindent=\parindent}
+ \setlist[description]{font=\normalfont\itshape}
+\define@choicekey{}{liststyle}[\suftesi@val\suftesi@nr]
{bulged,aligned,indented}[bulged]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
\setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
\setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
@@ -831,23 +877,20 @@
\setlist[itemize,2]{leftmargin=2.5\parindent}
\setlist[itemize,3]{leftmargin=2.5\parindent}
\fi}
-\define@choicekey{}{quotestyle}[\val\nr]
- {center,right}[center]{%
-\ifcase\nr\relax
- \def\SUF@quote@style{\rightmargin=\parindent}
+\define@choicekey{}{quotestyle}[\suftesi@val\suftesi@nr]
+ {center,right,justify}[center]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@quote@style{\leftmargin=\parindent \rightmargin=\parindent}
\or
- \def\SUF@quote@style{}
-\fi}
-\define@choicekey{}{quotesize}[\val\nr]
- {footnotesize,small}[footnotesize]{%
-\ifcase\nr\relax
- \def\SUF@quotation@size{\footnotesize}
+ \def\SUF@quote@style{\leftmargin=\parindent}
\or
- \def\SUF@quotation@size{\small}
+ \def\SUF@quote@style{\leftmargin=0pt}
\fi}
-\define@choicekey{}{footnotestyle}[\val\nr]
+\define@key{}{quotesize}[footnotesize]{
+ \def\SUF@quotation@size{\csname #1\endcsname}}
+\define@choicekey{}{footnotestyle}[\suftesi@val\suftesi@nr]
{bulged,hung,dotted,superscript}[bulged]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\renewcommand\@makefntext{%
\hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
\or
@@ -861,18 +904,18 @@
\renewcommand\@makefntext{%
\textsuperscript{\@thefnmark}\hskip.3em}
\fi}
-\define@choicekey{}{fewfootnotes}[\val\nr]
+\define@choicekey{}{fewfootnotes}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@fewfootnotestrue
\or
\relax
\fi}
\RequirePackage{caption}
\captionsetup{labelsep=period,font=small,textformat=period}
-\define@choicekey{}{captionstyle}[\val\nr]
+\define@choicekey{}{captionstyle}[\suftesi@val\suftesi@nr]
{standard,sanserif,italic,smallcaps}[standard]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\or
\captionsetup{font+=sf}
\or
@@ -880,29 +923,29 @@
\or
\captionsetup{labelfont=sc}
\fi}
-\define@choicekey{}{marginpar}[\val\nr]
+\define@choicekey{}{marginpar}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\or
\renewcommand\marginpar[2][]{}
\fi}
-\define@choicekey{}{partpage}[\val\nr]
+\define@choicekey{}{partpage}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@partpagetrue
\or
\relax
\fi}
-\define@choicekey{}{draftdate}[\val\nr]
+\define@choicekey{}{draftdate}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@draftdatetrue
\or
\relax
\fi}
-\define@choicekey{}{version}[\val\nr]
+\define@choicekey{}{version}[\suftesi@val\suftesi@nr]
{screen,cscreen,draft,final}[draft]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\suftesi@screentrue
\or
\suftesi@screentrue
@@ -912,24 +955,24 @@
\or
\AtBeginDocument{\crop[off]}
\fi}
-\define@choicekey{}{crop}[\val\nr]
+\define@choicekey{}{crop}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
\ClassWarningNoLine{suftesi}{%
'crop' option is deprecated.\MessageBreak
Use 'version' option instead}
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\setkeys{}{version=draft}
\or
\setkeys{}{version=screen}
\fi}
-\define@choicekey{}{titlepage}[\val\nr]
+\define@choicekey{}{titlepage}[\suftesi@val\suftesi@nr]
{true,false}[true]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\@titlepagetrue
\or
\@titlepagefalse
\fi}
-\define@choicekey{}{style}[\val\nr]
+\define@choicekey{}{style}[\suftesi@val\suftesi@nr]
{roman1,roman2,roman3,roman4,roman5,roman6,
italic1,italic2,italic3,italic4,italic5,italic6,
italic7,italic8,italic9,italic10,italic11,italic12,
@@ -937,7 +980,7 @@
smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
FSPLa,FSPLb,FSPLc}
[roman1]{%
-\ifcase\nr\relax
+\ifcase\suftesi@nr\relax
\setkeys{}{chapstyle=left}
\or
\setkeys{}{chapstyle=center}
@@ -1102,7 +1145,7 @@
\setkeys{}{
chapstyle=parright,
chapfont=smallcaps,
- tocchapfont=smallcaps,
+ tocchapfont=smallcaps,file:///tmp/mozilla_ivan0/luatex85.pdf
secfont=smallcaps,
headerfont=smallcaps}
\or
@@ -1160,82 +1203,154 @@
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
quotesize,footnotestyle,liststyle,captionstyle}
\fi}
-\define@choicekey{}{papertitlestyle}[\val\nr]
+\define@choicekey{}{authortitlealign}[\suftesi@val\suftesi@nr]
{left,center,right}[left]{%
-\ifcase\nr\relax
+\ifcase\suftesi@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]
+\define@choicekey{}{papertitlestyle}[\suftesi@val\suftesi@nr]
+ {left,center,right}[left]{%
+\ClassWarningNoLine{suftesi}{%
+ 'papertitlestyle' option is deprecated.\MessageBreak
+ Use 'authortitlealign' option instead}
+\ifcase\suftesi@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{}{reverseauthortitle}[\suftesi@val\suftesi@nr]
{true,false}[false]{%
-\ifcase\nr\relax
- \suftesi@reverseauthortitletrue
+\ifcase\suftesi@nr\relax
+ \def\SUF@first{\SUF@Afont@style\SUF@Afont@shape\@author}
+ \def\SUF@second{\SUF@Tfont@style\SUF@Tfont@shape\@title}
\or
+ \def\SUF@first{\SUF@Tfont@style\SUF@Tfont@shape\@title}
+ \def\SUF@second{\SUF@Afont@style\SUF@Afont@shape\@author}
\relax
\fi}
-\define@choicekey{}{titlefont}[\val\nr]
+\define@choicekey{}{revauthortitle}[\suftesi@val\suftesi@nr]
+ {true,false}[false]{%
+\ClassWarningNoLine{suftesi}{%
+ 'revauthortitle' option is deprecated.\MessageBreak
+ Use 'reverseauthortitle' option instead}
+\ifcase\suftesi@nr\relax
+ \def\SUF@first{\SUF@Afont@style\SUF@Afont@shape\@author}
+ \def\SUF@second{\SUF@Tfont@style\SUF@Tfont@shape\@title}
+\or
+ \def\SUF@first{\SUF@Tfont@style\SUF@Tfont@shape\@title}
+ \def\SUF@second{\SUF@Afont@style\SUF@Afont@shape\@author}
+ \relax
+\fi}
+\define@choicekey{}{maketitlestyle}[\suftesi@val\suftesi@nr]
+ {suftesi,standard}[suftesi]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@Tfont@style{\SUF@chaptersize\color{sufred}\sffamily}
+ \def\SUF@Afont@style{\small}
+ \def\SUF@datefont{\small}
+\or
+ \def\SUF@Tfont@style{\LARGE}
+ \def\SUF@Afont@style{\large}
+ \def\SUF@datefont{\small}
+\fi}
+\define@choicekey{}{titlefont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[suftesi]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@Tfont@shape{\relax}
+\or
+ \def\SUF@Tfont@shape{\itshape}
+\or
+ \def\SUF@Tfont@shape{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{authorfont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[suftesi]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@Afont@shape{\relax}
+\or
+ \def\SUF@Afont@shape{\itshape}
+\or
+ \def\SUF@Afont@shape{\expandafter\SUF@titlesmallcaps}
+\fi}
+\define@choicekey{}{datefont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
- \def\SUF@titlefont@Switch{\relax}
+\ifcase\suftesi@nr\relax
+ \def\SUF@datefont{\relax}
\or
- \def\SUF@titlefont@Switch{\itshape}
+ \def\SUF@datefont{\itshape}
\or
- \def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@datefont{\expandafter\SUF@titlesmallcaps}
\fi}
-\define@choicekey{}{authorfont}[\val\nr]
+\define@choicekey{}{toctitlefont}[\suftesi@val\suftesi@nr]
+ {roman,italic,smallcaps}[italic]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@tocTIT@font{\relax}
+\or
+ \def\SUF@tocTIT@font{\itshape}
+\or
+ \def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps}
+\fi}
+\define@choicekey{}{tocauthorfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
- \def\SUF@authorfont@Switch{\relax}
+\ifcase\suftesi@nr\relax
+ \def\SUF@tocAUT@font{\relax}
\or
- \def\SUF@authorfont@Switch{\itshape}
+ \def\SUF@tocAUT@font{\itshape}
\or
- \def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
\ExecuteOptionsX<>{
structure=book,
- captionstyle=standard,
- marginpar=true,
- tocstyle=standard,
- defaultfont=cochineal,
- mathfont=minimal,
- greekfont=none,
pagelayout=standard,
headerstyle=inner,
+ headerfont=roman,
+ defaultfont=cochineal,
+ greekfont=none,
+ mathfont=minimal,
+ smallcapsstyle=low,
liststyle=bulged,
footnotestyle=bulged,
quotesize=footnotesize,
quotestyle=center,
+ captionstyle=standard,
+ marginpar=true,
+ tocstyle=standard,
partstyle=left,
chapstyle=left,
secstyle=left,
subsecstyle=left,
subsubsecstyle=left,
- partfont=roman,
- chapfont=roman,
- secfont=italic,
- subsecfont=roman,
- subsubsecfont=roman,
- headerfont=roman,
partnumstyle=Roman,
chapnumstyle=arabic,
secnumstyle=arabic,
subsecnumstyle=arabic,
subsubsecnumstyle=arabic,
- smallcapsstyle=low,
- titlefont=italic,
- authorfont=roman,
- toctitlefont=italic,
- tocauthorfont=roman,
- revauthortitle=false,
- papertitlestyle=left,
+ partfont=roman,
+ chapfont=roman,
+ secfont=italic,
+ subsecfont=roman,
+ subsubsecfont=roman,
+ parfont=italic,
+ subparfont=roman,
tocpartfont=roman,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
- tocsubsubsecfont=roman}
+ tocsubsubsecfont=roman,
+ tocparfont=roman,
+ tocsubparfont=roman,
+ maketitlestyle=suftesi,
+ titlefont=roman,
+ authorfont=roman,
+ datefont=roman,
+ toctitlefont=italic,
+ tocauthorfont=roman,
+ reverseauthortitle=false,
+ authortitlealign=left}
\ProcessOptionsX<>\relax
\XKV@useoption{a4paper}
\XKV@useoption{10pt}
@@ -1456,22 +1571,22 @@
\fi
\unless\ifPDFTeX\else
\ifsuftesi@greekfont
- \ifsuftesi@artemisia
- \def\SUF@greekfamily{artemisia}
- \else
- \ifsuftesi@porson
- \def\SUF@greekfamily{porson}
- \else
- \ifsuftesi@bodoni
- \def\SUF@greekfamily{bodoni}
- \else
- \ifsuftesi@cbgreek
- \def\SUF@greekfamily{lmr}
- \else
- \fi
- \fi
+ \ifsuftesi@artemisia
+ \def\SUF@greekfamily{artemisia}
+ \else
+ \ifsuftesi@porson
+ \def\SUF@greekfamily{porson}
+ \else
+ \ifsuftesi@bodoni
+ \def\SUF@greekfamily{bodoni}
+ \else
+ \ifsuftesi@cbgreek
+ \def\SUF@greekfamily{lmr}
+ \else
\fi
\fi
+ \fi
+\fi
\AtEndPreamble{
\substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
\DeclareRobustCommand{\greektext}{%
@@ -1546,16 +1661,18 @@
\def\SUF@default@CHAPTER{
\ifsuftesi@numparchap
\titleformat{\chapter}[display]
- {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\startpartialtoc\SUF@chaptersize\SUF@lr@CHAPSwitch}
{\SUF@thechapter\SUF@dotchap}
{2ex}
{\SUF@CHAP@StyleSwitch}
+ [\printpartialtoc]
\else
\titleformat{\chapter}[hang]
- {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\startpartialtoc\SUF@chaptersize\SUF@lr@CHAPSwitch}
{\SUF@thechapter\SUF@dotchap}
{3em}
{\SUF@CHAP@StyleSwitch}
+ [\printpartialtoc]
\fi
\ifsuftesi@numparchap
\setlength{\SUF@ADJnumparchap}{-6ex}
@@ -1633,14 +1750,29 @@
\ifsuftesi@supercompactaureo
\titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
-\else%standard/standardaureo
+\else
+\ifsuftesi@pocketa
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
+\ifsuftesi@pocketb
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
+\ifsuftesi@pocketc
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+\else
\titlespacing*{\chapter}{0em}{%
\dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
- \fi
+ \fi
\fi
+ \fi
\fi
+ \fi
\fi
+ \fi
\fi
\fi
\ifsuftesi@article
@@ -1681,7 +1813,6 @@
\fi
\secdef\@part\@spart}
\fi
-
\def\@part[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
@@ -1706,54 +1837,52 @@
\fi
\noindent\SUF@PART@StyleSwitch#2\par}%
\@endpart}
-
\def\@spart#1{%
{\SUF@lr@PARTSwitch\SUF@partsize
\interlinepenalty \@M
\addvspace{4ex}
\noindent\SUF@PART@StyleSwitch#1\par}%
\@endpart}
-
\ifsuftesi@article
-\def\@endpart{%
- \ifsuftesi@partpage
- \vfil\newpage
- \if@twoside
- \if@openright
- \null
- \thispagestyle{empty}%
- \newpage
- \fi
- \fi
- \fi
- \if@tempswa
- \twocolumn
- \fi}
+ \def\@endpart{%
+ \ifsuftesi@partpage
+ \vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}
\else
-\def\@endpart{\vfil\newpage
- \if@twoside
- \if@openright
- \null
- \thispagestyle{empty}%
- \newpage
- \fi
- \fi
- \if@tempswa
- \twocolumn
- \fi}
+ \def\@endpart{\vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}
\fi
\titleformat{\paragraph}[runin]
{}
{\theparagraph}
{.5em}
- {\itshape}
+ {\SUF@PAR@StyleSwitch}
[{.}\hspace*{1em}]
\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
\titleformat{\subparagraph}[runin]
{}
{\thesubparagraph}
{.5em}
- {}
+ {\SUF@SUBPAR@StyleSwitch}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
\ifsuftesi@article
@@ -1888,95 +2017,56 @@
************************************}}}
}
\def\isbn#1{\gdef\@isbn{#1}}
- \def\@issn{\@latex@warning@no@line{%
- No \noexpand\isbn given}}
+\def\@issn{\@latex@warning@no@line{%
+ No \noexpand\isbn given}}
\def\doi#1{\gdef\@doi{#1}}
- \def\@doi{\@latex@warning@no@line{%
- No \noexpand\doi given}}
+\def\@doi{\@latex@warning@no@line{%
+ No \noexpand\doi given}}
\def\isbn#1{\gdef\@issn{#1}}
- \def\@issn{\@latex@warning@no@line{%
- No \noexpand\isbn given}}
+\def\@issn{\@latex@warning@no@line{%
+ No \noexpand\isbn given}}
\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
- \edef\title{\noexpand\@dblarg
+\edef\title{\noexpand\@dblarg
\expandafter\noexpand\csname\string\title\endcsname}
- \def\@headtitle{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
+\def\@headtitle{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
No \string\title\space given \MessageBreak%
See the class documentation for explanation}}
- \def\@title{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
+\def\@title{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
No \string\title\space given\MessageBreak%
See the class documentation for explanation}}
- \def\@author{--missing author--%
- \protect\ClassWarningNoLine{suftesi}{%
+\def\@author{--missing author--%
+ \protect\ClassWarningNoLine{suftesi}{%
No \string\author\space given\MessageBreak%
See the class documentation for explanation}}
-\if@titlepage% titlepage
- \renewcommand\maketitle{\begin{titlepage}%
- \let\footnotesize\small
- \let\footnoterule\relax
- \let \footnote \thanks
- \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \null\vfil
- \vskip 60\p@
- \begin{center}%
- {\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}%
- \@author
- \end{tabular}\par}%
- \vskip 1.5em%
- {\small\@date\par}%
- \end{center}\par
- \@thanks
- \vfil\null
- \end{titlepage}%
- \setcounter{footnote}{0}%
- \global\let\thanks\relax
- \global\let\maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@date\@empty
- \global\let\date\relax
- \global\let\and\relax}
-\newcommand\standardtitle{\begin{titlepage}%
- \let\footnotesize\small
- \let\footnoterule\relax
- \let \footnote \thanks
- \null\vfil
- \vskip 60\p@
- \begin{center}%
- {\LARGE \@title \par}%
- \vskip 3em%
- {\large
- \lineskip .75em%
- \begin{tabular}[t]{c}%
- \@author
- \end{tabular}\par}%
- \vskip 1.5em%
- {\large \@date \par}%
- \end{center}\par
- \@thanks
- \vfil\null
+\if@titlepage
+ \renewcommand\maketitle{%
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let \footnote \thanks
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \null\vfil
+ \vskip 60\p@
+ \begin{center}%
+ {\SUF@first\par}%
+ \vskip 3em%
+ {\lineskip .75em%
+ \begin{tabular}[t]{c}%
+ \SUF@second
+ \end{tabular}\par}%
+ \vskip 1.5em%
+ {\SUF@datefont\@date\par}%
+ \end{center}\par
+ \@thanks
+ \vfil\null
\end{titlepage}%
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
\global\let\@thanks\@empty
- \global\let\@date\@empty
+ \global\let\@date\@empty
\global\let\date\relax
\global\let\and\relax}
\else
@@ -2014,76 +2104,17 @@
\vskip 2em%
\begin{center}%
\let \footnote \thanks
- {\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}%
+ {\SUF@first\par}%
\vskip 1.5em%
- {\small\lineskip .5em%
+ {\lineskip .5em%
\begin{tabular}[t]{c}%
- \@author\par
+ \SUF@second\par
\end{tabular}\par}%
\vskip 1em%
- {\small\@date\par}%
+ {\SUF@datefont\@date\par}%
\end{center}%
\par
\vskip 1.5em}
-\newcommand\standardtitle{\par
- \begingroup
- \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
- \long\def\@makefntext##1{\parindent 1em\noindent
- \hb@xt@1.8em{%
- \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
- \if@twocolumn
- \ifnum \col@number=\@ne
- \@standardmaketitle
- \else
- \twocolumn[\@standardmaketitle]%
- \fi
- \else
- \newpage
- \global\@topnum\z@
- \@standardmaketitle
- \fi
- \thispagestyle{plain}\@thanks
- \endgroup
- \setcounter{footnote}{0}%
- \global\let\thanks\relax
- \global\let\maketitle\relax
- \global\let\@standardmaketitle\relax
- \global\let\@thanks\@empty
- \global\let\@date\@empty
- \global\let\date\relax
- \global\let\and\relax}
-\def\@standardmaketitle{%
- \newpage
- \null
- \vskip 2em%
- \begin{center}%
- \let \footnote \thanks
- {\LARGE \@title \par}%
- \vskip 1.5em%
- {\large
- \lineskip .5em%
- \begin{tabular}[t]{c}%
- \@author
- \end{tabular}\par}%
- \vskip 1em%
- {\large \@date}%
- \end{center}%
- \par
- \vskip 1.5em}
\fi
\ifsuftesi@collection
\newcounter{journalnumber}
@@ -2191,23 +2222,22 @@
\fi
\thispagestyle{plain}\@thanks%
\endgroup
- \setcounter{section}{0}%
- \global\let\and\relax
- \let\thanks\@gobble}
+ \setcounter{section}{0}%
+ \global\let\and\relax
+ \let\thanks\@gobble}
\AtBeginDocument{\def\@maketitle{%
\refstepcounter{article}
\SUF@chaptersize
\SUF@lr@coll@titleSwitch
\let\footnote\thanks
\parindent=0pt
- {\ifsuftesi@reverseauthortitle
- \SUF@titlefont@Switch{\@title}%
- \else\SUF@authorfont@Switch{\@author}\fi}%
+ {\SUF@second}%
\label{begin:\thearticle}
- \xdef\@currentHref{title.\thearticle}%
- \Hy@raisedlink{%
- \hyper@anchorstart{\@currentHref}\hyper@anchorend}%
- \csname toc@entry@\endcsname
+ \@ifundefined{Hy@raisedlink}{\let\texorpdfstring\@firstoftwo}{%
+ \xdef\@currentHref{title.\thearticle}%
+ \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+ }%
+ \csname toc@entry@\endcsname
\begingroup%
\let\thanks\@gobble
\addcontentsline{toc}{title}{%
@@ -2215,11 +2245,8 @@
{\SUF@tocTIT@font{\@headtitle}}}
\endgroup%
\par\nobreak\vspace{2ex}
- {\ifsuftesi@reverseauthortitle
- \SUF@authorfont@Switch{\@author}%
- \else
- \SUF@titlefont@Switch{\@title}%
- \fi\vskip1.5cm}}%
+ {\SUF@first%
+ \vskip1.5cm}}%
}
\newenvironment{article}
{\begingroup
@@ -2231,7 +2258,7 @@
\cleardoublepage
\global\let\@thanks\@empty
\endgroup}
-\newcommand{\frontispiece}{%
+\newcommand{\collectiontitlepage}{%
\thispagestyle{empty}%
\begingroup
\centering
@@ -2245,6 +2272,7 @@
\endgroup
\clearpage}
+\def\frontispiece{\collectiontitlepage}
\setcounter{tocdepth}{0}
\renewcommand\thesection{%
\@arabic\c@section}
@@ -2263,48 +2291,69 @@
\ifsuftesi@periodical
\Margini {5.5cm}{7cm}{4.5cm}{0cm}
\else
+\ifsuftesi@periodicalaureo
+ \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+ \else
\ifsuftesi@compact
\Margini {4.5cm}{7cm}{4.5cm}{0cm}
\else
-\ifsuftesi@supercompact
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
\ifsuftesi@compactaureo
\Margini {4.5cm}{7cm}{4.5cm}{0cm}
\else
+\ifsuftesi@supercompact
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
\ifsuftesi@supercompactaureo
\Margini {4.5cm}{10cm}{6cm}{1cm}
\else
-\ifsuftesi@periodicalaureo
- \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+\ifsuftesi@pocketa
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\ifsuftesi@pocketb
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
\else
-\fi\fi\fi\fi\fi\fi}
+\ifsuftesi@pocketc
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
{\@ifpackageloaded{frontespizio}{%
\ifsuftesi@periodical
\Margini {1cm}{7cm}{5cm}{1cm}
\Rientro{1cm}
\else
+\ifsuftesi@periodicalaureo
+ \Margini {1cm}{7cm}{5cm}{1cm}
+ \Rientro{1cm}
+ \else
\ifsuftesi@compact
\Margini {1cm}{7cm}{6cm}{1cm}
\Rientro{1cm}
\else
+\ifsuftesi@compactaureo
+ \Margini {1cm}{7cm}{6cm}{1cm}
+ \Rientro{1cm}
+ \else
\ifsuftesi@supercompact
\Margini {1cm}{10cm}{8cm}{1cm}
\Rientro{1cm}
\else
-\ifsuftesi@compactaureo
- \Margini {1cm}{7cm}{6cm}{1cm}
+\ifsuftesi@supercompactaureo
+ \Margini {1cm}{10cm}{8cm}{1cm}
\Rientro{1cm}
\else
-\ifsuftesi@supercompactaureo
+\ifsuftesi@pocketa
\Margini {1cm}{10cm}{8cm}{1cm}
\Rientro{1cm}
\else
-\ifsuftesi@periodicalaureo
- \Margini {1cm}{7cm}{5cm}{1cm}
+\ifsuftesi@pocketb
+ \Margini {1cm}{10cm}{8cm}{1cm}
\Rientro{1cm}
\else
-\fi\fi\fi\fi\fi\fi}
+\ifsuftesi@pocketc
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
{\relax}}}
\renewenvironment{theindex}
{\if@twocolumn
@@ -2398,7 +2447,7 @@
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
\thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
[\SUF@tochang@sec]
@@ -2427,7 +2476,7 @@
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
\thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
[\SUF@tocindent@sec]
@@ -2512,7 +2561,6 @@
\renewenvironment{quotation}
{\list{}{\listparindent\parindent%
\itemindent \listparindent
- \leftmargin \parindent
\SUF@quote@style
\parsep \z@ \@plus\p@}%
\item\relax%
@@ -2520,7 +2568,7 @@
\noindent\ignorespaces}
{\endlist}
\renewenvironment{quote}
- {\list{}{\leftmargin \parindent
+ {\list{}{%
\SUF@quote@style}%
\item\relax%
\SUF@quotation@size}% \ignorespaces?
@@ -2803,7 +2851,7 @@ Janusz M.~Nowacki.
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
[\SUF@tochang@sec]
@@ -2818,9 +2866,9 @@ Janusz M.~Nowacki.
{}
\fi
\ifsuftesi@toccompactsubsec
-\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
+\titlecontents*{subsection}[\SUF@tochang@sec]{\SUF@sscorrect}{%
\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
@@ -2835,10 +2883,10 @@ Janusz M.~Nowacki.
{}
\fi
\ifsuftesi@toccompactsubsubsec
-\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
+\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\SUF@ssscorrect}{%
\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
\SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
@@ -2852,24 +2900,42 @@ Janusz M.~Nowacki.
\SUF@tocSUBSUBSEC@font}
{}
\fi
+\ifsuftesi@toccompactpar
+\titlecontents*{paragraph}[\SUF@tochang@subsubsec]{\SUF@pcorrect}{%
+ \SUF@PAR@thecontentslabel\adjtoclabelsep%
+ \SUF@tocPAR@font}{\SUF@tocPAR@font}{,
+ \thecontentspage.}[][\adjtocpagesep][]
+\else
\titlecontents{paragraph}
- [\SUF@tochang@par]
- {}
- {\hskip-\SUF@tochang@par%
- \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
- \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
- {\hskip-\SUF@tochang@par%
- \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par}
- {}
+[\SUF@tochang@par]
+{}
+{\hskip-\SUF@tochang@par%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+ \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocPAR@font}
+{\hskip-\SUF@tochang@par%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+ \SUF@tocPAR@font}
+{}
+\fi
+\ifsuftesi@toccompactsubpar
+\titlecontents*{subparagraph}[\SUF@tochang@par]{\SUF@pcorrect}{%
+ \SUF@SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBPAR@font}{\SUF@tocSUBPAR@font}{,
+ \thecontentspage.}[][\adjtocpagesep][]
+\else
\titlecontents{subparagraph}
[\SUF@tochang@subpar]
{}
{\hskip-\SUF@tochang@subpar%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
- \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
+ \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSUBPAR@font}
{\hskip-\SUF@tochang@subpar%
- \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar}
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+ \SUF@tocSUBPAR@font}
{}
+\fi
\titlecontents{figure}
[\SUF@tochang@fig]
{}
@@ -2942,8 +3008,8 @@ Janusz M.~Nowacki.
[\addvspace{1ex}]
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
- \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}
+ {\SUF@tocSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
[\SUF@tocindent@sec]
@@ -2957,9 +3023,9 @@ Janusz M.~Nowacki.
\else\SUF@titlerule\fi\contentspage}
\fi
\ifsuftesi@toccompactsubsec
-\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
- \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+\titlecontents*{subsection}[\SUF@tocindent@sec]{\SUF@sscorrect}{%
+ \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}
+ {\SUF@tocSUBSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
@@ -2972,10 +3038,10 @@ Janusz M.~Nowacki.
{\SUF@titlerule\contentspage}
\fi
\ifsuftesi@toccompactsubsubsec
-\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
+\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\SUF@ssscorrect}{%
\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
\SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
@@ -2987,20 +3053,38 @@ Janusz M.~Nowacki.
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
\fi
+\ifsuftesi@toccompactpar
+\titlecontents*{paragraph}[\SUF@tocindent@subsubsec]{\SUF@pcorrect}{%
+ \SUF@PAR@thecontentslabel\adjtoclabelsep%
+ \SUF@tocPAR@font}{\SUF@tocPAR@font}{,
+ \thecontentspage.}[][\adjtocpagesep][]
+\else
\titlecontents{paragraph}
[\SUF@tocindent@par]
{}
{\hskip-\dimexpr(\SUF@label@par+1em)%
- \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}}
- {\hskip-\dimexpr(\SUF@label@par+1em)}
+ \makebox[\SUF@label@par][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocPAR@font}
+ {\hskip-\dimexpr(\SUF@label@par+1em)%
+ \SUF@tocPAR@font}
{\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@toccompactsubpar
+\titlecontents*{subparagraph}[\SUF@tocindent@par]{\SUF@pcorrect}{%
+ \SUF@SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBPAR@font}{\SUF@tocSUBPAR@font}{,
+ \thecontentspage.}[][\adjtocpagesep][]
+\else
\titlecontents{subparagraph}
[\SUF@tocindent@subpar]
{}
{\hskip-\dimexpr(\SUF@label@subpar+1em)%
- \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}}
- {\hskip-\dimexpr(\SUF@label@subpar+1em)}
+ \makebox[\SUF@label@subpar][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSUBPAR@font}
+ {\hskip-\dimexpr(\SUF@label@subpar+1em)%
+ \SUF@tocSUBPAR@font}
{\SUF@titlerule\contentspage}
+\fi
\titlecontents{figure}
[\SUF@tocindent@fig]
{}
@@ -3016,6 +3100,34 @@ Janusz M.~Nowacki.
{}
{\SUF@titlerule\contentspage}
\fi
+\titlecontents*{partialtocsection}[0cm]{}{%
+ \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
+ {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+\titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
+ \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+ {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+\titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
+ \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
+ {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+\titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
+ \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
+ {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+\titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
+ \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
+ {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+\newcommand{\startpartialtoc}{%
+ \ifsuftesi@partialtoc\startcontents\fi}
+\newcommand{\printpartialtoc}{%
+ \ifsuftesi@partialtoc
+ \setcounter{tocdepth}{5}
+ \contentsmargin{0cm}
+ \@partialtocsize
+ \@partialtocbeforespace
+ \@partialtocbeforecode\par
+ \printcontents{partialtoc}{1}{}
+ \par\@partialtocaftercode
+ \@partialtocafterspace
+ \fi}
\ifsuftesi@article
\renewcommand\tableofcontents{%
\vspace{2ex}%
@@ -3127,29 +3239,81 @@ Janusz M.~Nowacki.
\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\partnumfont}[1]{\def\SUF@PART@font{#1}}
- \partnumfont{}
+\newcommand{\partnumfont}[1]{\def\SUF@PART@font{#1}}\partnumfont{}
\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
\newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
\newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
\newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
-\newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}}
-\newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}}
+\newcommand{\titlefont}[1]{\def\SUF@Tfont@style{#1}\let\SUF@Tfont@shape\relax}
+\newcommand{\authorfont}[1]{\def\SUF@Afont@style{#1}\let\SUF@Afont@shape\relax}
+\newcommand{\datefont}[1]{\def\SUF@datefont{#1}}
\newcommand{\tocpartfont}[1]{\def\SUF@tocPART@font{#1}}
\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
-\newcommand{\tocpartnumfont}[1]{\def\SUF@tocPARTnum@font{#1}}
- \tocpartnumfont{}
+\newcommand{\tocparfont}[1]{\def\SUF@tocPAR@font{#1}}
+\newcommand{\tocsubparfont}[1]{\def\SUF@tocSUBPAR@font{#1}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF@tocPARTnum@font{#1}}\tocpartnumfont{}
\newcommand{\tocchapnumfont}[1]{%
- \def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+ \def\SUF@CHAP@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsecnumfont}[1]{%
- \def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+ \def\SUF@SEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsubsecnumfont}[1]{%
- \def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+ \def\SUF@SUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsubsubsecnumfont}[1]{%
- \def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\tocparnumfont}[1]{%
+ \def\SUF@PAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\tocsubparnumfont}[1]{%
+ \def\SUF@SUBPAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+\tocparnumfont{}
+\tocsubparnumfont{}
+\newcommand{\partialtocsize}[1]{%
+ \def\@partialtocsize{#1}}
+\newcommand{\partialtocsecfont}[1]{%
+ \def\@partialtocsecfont{#1}}
+\newcommand{\partialtocsubsecfont}[1]{%
+ \def\@partialtocsubsecfont{#1}}
+\newcommand{\partialtocsubsubsecfont}[1]{%
+ \def\@partialtocsubsubsecfont{#1}}
+\newcommand{\partialtocparfont}[1]{%
+ \def\@partialtocparfont{#1}}
+\newcommand{\partialtocsubparfont}[1]{%
+ \def\@partialtocsubparfont{#1}}
+\newcommand{\partialtocseclabel}[1]{%
+ \def\@partialtocseclabel{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\partialtocsubseclabel}[1]{%
+ \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\partialtocsubsubseclabel}[1]{%
+ \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\partialtocparlabelfont}[1]{%
+ \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\partialtocsubparlabelfont}[1]{%
+ \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+\newcommand{\partialtocbeforespace}[1]{%
+ \def\@partialtocbeforespace{\vspace*{#1}}}
+\newcommand{\partialtocafterspace}[1]{%
+ \def\@partialtocafterspace{\vspace*{#1}}}
+\newcommand{\partialtocbeforecode}[1]{%
+ \def\@partialtocbeforecode{#1}}
+\newcommand{\partialtocaftercode}[1]{%
+ \def\@partialtocaftercode{#1}}
+\partialtocsize{\footnotesize}
+\partialtocsecfont{\itshape}
+\partialtocsubsecfont{}
+\partialtocsubsubsecfont{}
+\partialtocparfont{}
+\partialtocsubparfont{}
+\partialtocseclabel{\itshape}
+\partialtocsubseclabel{}
+\partialtocsubsubseclabel{}
+\partialtocparlabelfont{}
+\partialtocsubparlabelfont{}
+\partialtocbeforespace{18ex}
+\partialtocafterspace{-18ex}
+\partialtocbeforecode{}
+\partialtocaftercode{}
\ifsuftesi@article
\def\chapterintro{%
\ClassError{suftesi}
@@ -3176,7 +3340,7 @@ Janusz M.~Nowacki.
{\ifbreakinbody\newline\else\fi}
\let\origtableofcontents\tableofcontents
\renewcommand{\tableofcontents}{%
- \begingroup
+ \begingroup\suftesi@partialtocfalse
\breakintoctrue\breakinbodyfalse%
\origtableofcontents
\endgroup}