summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-21 21:47:45 +0000
committerKarl Berry <karl@freefriends.org>2020-05-21 21:47:45 +0000
commit1116b2fb56bdecbdce687033df2909063a40a878 (patch)
tree4b1d27daf367d8335090fc9b710dd83235399255 /Master/texmf-dist/tex/latex/suftesi
parent9f01ea07708f5ad1434c3090d462ac7c27b6a4b5 (diff)
suftesi (21may20)
git-svn-id: svn://tug.org/texlive/trunk@55233 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls620
1 files changed, 348 insertions, 272 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index c2625bff7ab..f4ba2c425b7 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -6,23 +6,27 @@
%%
%% suftesi.dtx (with options: `class')
%%
-%% Copyright 2009-2020 by Ivan Valbusa
+%% The 'suftesi' document class
+%% Copyright (C) 2009-2020 Ivan Valbusa
+%% <ivan dot valbusa at gmail dot com>
%%
-%% This program is provided under the terms of the
-%% LaTeX Project Public License distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
+%% All rights reserved.
%%
-%% Author: Ivan Valbusa
-%% ivan dot valbusa at univr dot it
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work consists of all files listed in README
+%%
+%% This work has the LPPL maintenance status "author-maintained".
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
-
-
-
+ [2020/05/21 v2.9.9 A class for typesetting theses, books and articles]
\RequirePackage{xkeyval}
\newif\ifsuftesi@compatibility
\newif\ifsuftesi@nofont
@@ -459,8 +463,8 @@
\def\SUF@dotpart{.}
\fi}
\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+ dotarabic,dotroman,dotRoman}[arabic]{%
+ \ifcase\nr\relax
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
@@ -490,10 +494,10 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{.}
\def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \fi}
\define@choicekey{}{secnumstyle}[\val\nr]
- {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ \ifcase\nr\relax
\def\SUF@thesection{\SUF@chapswitch\arabic{section}}
\def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
@@ -523,61 +527,61 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{.}
\def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \fi}
\define@choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
-\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-\def\SUF@dotsubsec{}
-\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-\def\SUF@dotsubsec{.}
-\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \ifcase\nr\relax
+ \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \fi}
\define@choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
-\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-\def\SUF@dotsubsubsec{}
-\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-\or
-\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-\def\SUF@dotsubsubsec{.}
-\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \ifcase\nr\relax
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \fi}
\define@choicekey{}{smallcapsstyle}[\val\nr]
{low,upper}[low]{%
\ifcase\nr\relax
@@ -601,12 +605,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\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@PART@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecfont}[1]{%
+ \def\SUF@tocSUBSUBSEC@font{#1}}
+\newcommand{\tocpartnumfont}[1]{%
+ \def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{%
+ \def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{%
+ \def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{%
+ \def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{%
+ \def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
\define@choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
authortitlecenter}[inner]{%
@@ -745,29 +755,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\suftesi@pagelefttoctrue
\fi}
\define@choicekey{}{compacttoc}[\val\nr]{%
-sec,subsec,subsubsec}[sec]{%
-\ifcase\nr\relax
-\suftesi@toccompactsectrue
-\suftesi@toccompactsubsectrue
-\suftesi@toccompactsubsubsectrue
-\def\suf@sscorrect{\hskip.5em}
-\def\suf@ssscorrect{\hskip.5em}
+ sec,subsec,subsubsec}[sec]{%
+ \ifcase\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{}
\or
-\suftesi@toccompactsubsectrue
-\suftesi@toccompactsubsubsectrue
-\def\suf@sscorrect{\relax}
-\def\suf@ssscorrect{\hskip.5em}
+ \suftesi@toccompactsubsectrue
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\hskip.5em}
\def\suf@ctocdotssec{.}
\def\suf@ctocdotsssec{}
\or
-\suftesi@toccompactsubsubsectrue
-\def\suf@sscorrect{\relax}
-\def\suf@ssscorrect{\relax}
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\relax}
\def\suf@ctocdotsssec{.}
-\fi}
+ \fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -1290,7 +1300,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\ifsuftesi@mathextended
\RequirePackage{amsthm}
\RequirePackage[bigdelims,vvarbb]{newpxmath}
- \RequirePackage[cal=boondoxo]{mathalfa}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
\ifsuftesi@mathminimal
\RequirePackage[bigdelims,vvarbb]{newpxmath}
@@ -1327,18 +1337,18 @@ quotesize,footnotestyle,liststyle,captionstyle}
\else
\ifsuftesi@libertine
\RequirePackage{textcomp}
-\RequirePackage[sb]{libertine}
-\RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
-\ifsuftesi@mathextended
-\RequirePackage{amsthm}
-\RequirePackage{libertinust1math}
-\RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalfa}
-\else
-\ifsuftesi@mathminimal
-\RequirePackage{libertinust1math}
-\else
-\fi
-\fi
+ \RequirePackage[sb]{libertine}
+ \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+ \ifsuftesi@mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage{libertinust1math}
+ \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalpha}
+ \else
+ \ifsuftesi@mathminimal
+ \RequirePackage{libertinust1math}
+ \else
+ \fi
+ \fi
\useosf
\ifsuftesi@bodoni
\gdef\SUFfntscale{0.9}
@@ -1361,7 +1371,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\ifsuftesi@mathextended
\RequirePackage{amsthm}
\RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \RequirePackage[cal=boondoxo]{mathalfa}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
\ifsuftesi@mathminimal
\RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
@@ -1505,14 +1515,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
{\SUF@thesection\SUF@dotsec}
{0ex}
{\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\section}[hang]
{\SUF@sectionsize\SUF@lr@SECSwitch}
{\SUF@thesection\SUF@dotsec}
{1em}
{\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsec
\titleformat{\subsection}[display]
@@ -1520,14 +1530,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{0ex}
{\SUF@SUBSEC@StyleSwitch}
-\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsection}[hang]
{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{1em}
{\SUF@SUBSEC@StyleSwitch}
-\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsubsec
\titleformat{\subsubsection}[display]
@@ -1535,14 +1545,14 @@ quotesize,footnotestyle,liststyle,captionstyle}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{0ex}
{\SUF@SUBSUBSEC@StyleSwitch}
-\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsubsection}[hang]
{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{1em}
{\SUF@SUBSUBSEC@StyleSwitch}
-\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
}
\SUF@default@CHAPTER
@@ -1572,7 +1582,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else%standard/standardaureo
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -1588,16 +1598,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
using 'structure=article'}}
\setcounter{tocdepth}{3}
\setcounter{secnumdepth}{3}
- \renewcommand\thesection{%
- \@arabic\c@section}
- \renewcommand\thesubsection{%
- \thesection.\@arabic\c@subsection}
- \renewcommand\thesubsubsection{%
- \thesubsection.\@arabic\c@subsubsection}
- \renewcommand\theparagraph{%
- \thesubsubsection.\@arabic\c@paragraph}
- \renewcommand\thesubparagraph{%
- \theparagraph.\@arabic\c@subparagraph}
+ \renewcommand\thesection{%
+ \@arabic\c@section}
+ \renewcommand\thesubsection{%
+ \thesection.\@arabic\c@subsection}
+ \renewcommand\thesubsubsection{%
+ \thesubsection.\@arabic\c@subsubsection}
+ \renewcommand\theparagraph{%
+ \thesubsubsection.\@arabic\c@paragraph}
+ \renewcommand\thesubparagraph{%
+ \theparagraph.\@arabic\c@subparagraph}
\ifsuftesi@partpage
\relax
\else
@@ -1647,7 +1657,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
{}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -1679,7 +1689,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\subsection{#1}}}%
{\relax}%
}%
-\else
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -2083,7 +2093,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\fi
\else
\newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
+ \global\@topnum\z@ % Prevents figures from going at top of page.
\@maketitle
\fi
\thispagestyle{plain}\@thanks%
@@ -2204,25 +2214,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
\fi\fi\fi\fi\fi\fi}
{\relax}}}
\renewenvironment{theindex}
- {\if@twocolumn
- \@restonecolfalse
- \else
- \@restonecoltrue
- \fi
- \ifsuftesi@article
- \twocolumn[\section*{\indexname}]%
- \else
- \twocolumn[\@makeschapterhead{\indexname}]%
- \fi
- \@mkboth{\indexname}{\indexname}%
- \thispagestyle{plain}%
- \raggedright%
- \parindent\z@
- \parskip\z@ \@plus .3\p@\relax
- \columnseprule \z@
- \columnsep 35\p@
- \let\item\@idxitem}
- {\if@restonecol\onecolumn\else\clearpage\fi}
+ {\if@twocolumn
+ \@restonecolfalse
+ \else
+ \@restonecoltrue
+ \fi
+ \ifsuftesi@article
+ \twocolumn[\section*{\indexname}]%
+ \else
+ \twocolumn[\@makeschapterhead{\indexname}]%
+ \fi
+ \@mkboth{\indexname}{\indexname}%
+ \thispagestyle{plain}%
+ \raggedright%
+ \parindent\z@
+ \parskip\z@ \@plus .3\p@\relax
+ \columnseprule \z@
+ \columnsep 35\p@
+ \let\item\@idxitem}
+ {\if@restonecol\onecolumn\else\clearpage\fi}
\RequirePackage{appendix}
\renewcommand{\appendixpagename}{Appendici}
\renewcommand{\appendixtocname}{Appendici}
@@ -2234,68 +2244,132 @@ quotesize,footnotestyle,liststyle,captionstyle}
Redefine the \noexpand\appendixpagename command instead.
See the 'appendix' package documentation.\MessageBreak
\noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
-{Command \noexpand\appendicesname undefined\MessageBreak
+ {Command \noexpand\appendicesname undefined\MessageBreak
Redefine the \noexpand\appendixpagename command instead.
See the 'appendix' package documentation.\MessageBreak
\noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
\renewcommand{\@chap@pppage}{%
-\clear@ppage
-\thispagestyle{plain}%
-\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
-\null\vfil
-\markboth{}{}%
-{\centering
-\interlinepenalty \@M
-\normalfont
-\SUF@chaptersize
+ \clear@ppage
+ \thispagestyle{plain}%
+ \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+ \null\vfil
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \SUF@chaptersize
\SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
-\if@dotoc@pp
-\addappheadtotoc
-\fi
-\vfil\newpage
-\if@twoside
-\if@openright
-\null
-\thispagestyle{empty}%
-\newpage
-\fi
-\fi
-\if@tempswa
-\twocolumn
-\fi
+ \if@dotoc@pp
+ \addappheadtotoc
+ \fi
+ \vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi
}
\renewcommand{\@sec@pppage}{%
-\par
-\addvspace{4ex}%
-\@afterindentfalse
-{\parindent \z@ \raggedright
-\interlinepenalty \@M
-\normalfont
-\SUF@chaptersize
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \SUF@chaptersize
\SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
-\markboth{}{}\par}%
-\if@dotoc@pp
-\addappheadtotoc
-\fi
-\nobreak
-\vskip 3ex
-\@afterheading
+ \markboth{}{}\par}%
+ \if@dotoc@pp
+ \addappheadtotoc
+ \fi
+ \nobreak
+ \vskip 3ex
+ \@afterheading
+}
+\def\suf@appendixtoc{%
+ \ifsuftesi@pagelefttoc
+ \titlecontents{chapter}
+ [\SUF@tochang@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}%
+ \hskip\SUF@addto@tochang@chap%
+ \makebox[\SUF@label@chap][l]{%
+ \thecontentslabel}\hspace*{1em}%
+ \SUF@tocCHAP@font}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}%
+ \hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
+ {}
+ [\addvspace{1ex}]
+ \ifsuftesi@toccompactsec
+ \titlecontents*{section}[\SUF@tochang@chap]{}{%
+ \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \else
+ \titlecontents{section}
+ [\SUF@tochang@sec]
+ {}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+ \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSEC@font}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+ \SUF@tocSEC@font}
+ {}
+ \fi
+ \else
+ \titlecontents{chapter}
+ [\SUF@tocindent@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tocindent@chap%
+ \makebox[\SUF@label@chap][l]{\thecontentslabel}%
+ \hspace*{1em}%
+ \SUF@tocCHAP@font}
+ {\hskip-\SUF@tocindent@chap%
+ \SUF@tocCHAP@font}
+ {\SUF@chaptitlerule\contentspage}
+ [\addvspace{1ex}]
+ \ifsuftesi@toccompactsec
+ \titlecontents*{section}[\SUF@tocindent@chap]{}{%
+ \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \else
+ \titlecontents{section}
+ [\SUF@tocindent@sec]
+ {}
+ {\hskip-\dimexpr(\SUF@label@sec+1em)%
+ \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSEC@font}
+ {\hskip-\dimexpr(\SUF@label@sec+1em)%
+ \SUF@tocSEC@font}
+ {\ifsuftesi@article\SUF@chaptitlerule%
+ \else\SUF@titlerule\fi\contentspage}
+ \fi
}
\ifsuftesi@article
- \renewcommand\appendix{\par
- \setcounter{section}{0}%
- \setcounter{subsection}{0}%
- \gdef\SUF@thesection{\@Alph\c@section}%
- \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
- \renewcommand{\thesection}{\@Alph\c@section}}
+\renewcommand\appendix{\par
+ \suf@appendixtoc%
+ \setcounter{section}{0}%
+ \setcounter{subsection}{0}%
+ \gdef\SUF@thesection{\@Alph\c@section}%
+ \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+ \renewcommand{\thesection}{\@Alph\c@section}}
\else
- \renewcommand\appendix{\par
- \setcounter{chapter}{0}%
- \setcounter{section}{0}%
- \gdef\@chapapp{\appendixname}%
- \gdef\SUF@thechapter{\@Alph\c@chapter}%
- \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
- \renewcommand{\thechapter}{\@Alph\c@chapter}}
+\renewcommand\appendix{\par
+ \suf@appendixtoc%
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \gdef\@chapapp{\appendixname}%
+ \gdef\SUF@thechapter{\@Alph\c@chapter}%
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2307,11 +2381,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
\def\SUF@versionstring{\texttt{\version@string{} \today}}
\renewcommand{\chaptermark}[1]{%
\markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
-\ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
- \else
- \renewcommand{\sectionmark}[1]{}
-\fi
+ \ifsuftesi@article
+ \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
+ \else
+ \renewcommand{\sectionmark}[1]{}
+ \fi
\fancypagestyle{plain}{\fancyhf{}}
\fancypagestyle{sufplain}{%
\fancyhf{}%
@@ -2337,11 +2411,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
\SUF@LR@MarkSwitch}
}%
\ifsuftesi@article
-\ifsuftesi@authortitle
-\def\SUF@LR@MarkSwitch{\SUF@leftmark}
-\else
-\def\SUF@LR@MarkSwitch{\SUF@rightmark}
-\fi
+ \ifsuftesi@authortitle
+ \def\SUF@LR@MarkSwitch{\SUF@leftmark}
+ \else
+ \def\SUF@LR@MarkSwitch{\SUF@rightmark}
+ \fi
\else
\def\SUF@LR@MarkSwitch{\SUF@leftmark}
\fi
@@ -2351,31 +2425,31 @@ quotesize,footnotestyle,liststyle,captionstyle}
\ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
\ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
\renewenvironment{quotation}
- {\list{}{\listparindent\parindent%
- \itemindent \listparindent
- \leftmargin \parindent
- \SUF@quote@style
- \parsep \z@ \@plus\p@}%
- \item\relax%
- \SUF@quotation@size%
- \noindent\ignorespaces}
- {\endlist}
+ {\list{}{\listparindent\parindent%
+ \itemindent \listparindent
+ \leftmargin \parindent
+ \SUF@quote@style
+ \parsep \z@ \@plus\p@}%
+ \item\relax%
+ \SUF@quotation@size%
+ \noindent\ignorespaces}
+ {\endlist}
\renewenvironment{quote}
- {\list{}{\leftmargin \parindent
- \SUF@quote@style}%
- \item\relax%
- \SUF@quotation@size}% \ignorespaces?
- {\endlist}
+ {\list{}{\leftmargin \parindent
+ \SUF@quote@style}%
+ \item\relax%
+ \SUF@quotation@size}% \ignorespaces?
+ {\endlist}
\renewenvironment{verse}
- {\let\\\@centercr
- \list{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
- \advance\leftmargin 1.5em}%
- \item\relax
- \SUF@quotation@size}
- {\endlist}
+ {\let\\\@centercr
+ \list{}{\itemsep \z@
+ \itemindent -1.5em%
+ \listparindent\itemindent
+ \rightmargin \leftmargin
+ \advance\leftmargin 1.5em}%
+ \item\relax
+ \SUF@quotation@size}
+ {\endlist}
\ifsuftesi@fewfootnotes
\AtBeginDocument{%
\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
@@ -2393,7 +2467,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\def\SUF@mpsetup{%
\itshape
\footnotesize%
- \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+ \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
\tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
\doublehyphendemerits=100000%
\finalhyphendemerits=\doublehyphendemerits}
@@ -2514,10 +2588,10 @@ visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
\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,
+\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.
+Janusz M.~Nowacki.
\endgroup
@@ -2655,8 +2729,8 @@ Janusz M. Nowacki.
[\addvspace{1ex}]
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
-\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
\else
\titlecontents{section}
[\SUF@tochang@sec]
@@ -2672,8 +2746,8 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsec
\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
-\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+ \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
@@ -2689,8 +2763,9 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsubsec
\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
-\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
@@ -2795,8 +2870,8 @@ Janusz M. Nowacki.
[\addvspace{1ex}]
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
-\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
\else
\titlecontents{section}
[\SUF@tocindent@sec]
@@ -2811,8 +2886,8 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsec
\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
-\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+ \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
@@ -2826,8 +2901,9 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsubsec
\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
-\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
-\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
@@ -2871,16 +2947,16 @@ Janusz M. Nowacki.
\ifsuftesi@article
\renewcommand\tableofcontents{%
\vspace{2ex}%
- \section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \section*{\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}%
\thispagestyle{empty}
\ifsuftesi@twocolumntoc
\begin{multicols}{2}
- \@starttoc{toc}%
- \end{multicols}
- \else
- \@starttoc{toc}%
- \fi
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoffigures{%
@@ -2890,11 +2966,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlof
\begin{multicols}{2}
- \@starttoc{lof}%
- \end{multicols}
- \else
- \@starttoc{lof}%
- \fi
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoftables{%
@@ -2904,11 +2980,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlot
\begin{multicols}{2}
- \@starttoc{lot}%
- \end{multicols}
- \else
- \@starttoc{lot}%
- \fi
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\vspace{2ex}%
}
\else
@@ -2925,11 +3001,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumntoc
\begin{multicols}{2}
- \@starttoc{toc}%
- \end{multicols}
- \else
- \@starttoc{toc}%
- \fi
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoffigures{%
@@ -2944,11 +3020,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlof
\begin{multicols}{2}
- \@starttoc{lof}%
- \end{multicols}
- \else
- \@starttoc{lof}%
- \fi
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoftables{%
@@ -2964,11 +3040,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlot
\begin{multicols}{2}
- \@starttoc{lot}%
- \end{multicols}
- \else
- \@starttoc{lot}%
- \fi
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\if@restonecol\twocolumn\fi
}
\fi