summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-11 22:10:41 +0000
committerKarl Berry <karl@freefriends.org>2020-02-11 22:10:41 +0000
commit88fe7722f2fdee1eac872d6c6fbb15d85cf6a6b9 (patch)
tree8bd24feb977d6cef2e097210fa17b6fcfda59518 /Master/texmf-dist/tex/latex/suftesi
parente3b4a159cf41e3aa51b8a48e50ec38fc7f6d51b6 (diff)
suftesi (11feb20)
git-svn-id: svn://tug.org/texlive/trunk@53759 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls107
1 files changed, 91 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 78c01dde37c..152ccc50507 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,7 +19,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2020/02/04 v2.9.5 A class for typesetting theses, books and articles]
+ [2020/02/11 v2.9.6a A class for typesetting theses, books and articles]
+
\ClassWarningNoLine{suftesi}{%
******************************************\MessageBreak
@@ -76,6 +77,9 @@
\newif\ifsuftesi@twocolumnlot
\newif\ifsuftesi@reverseauthortitle
\newif\ifsuftesi@collection
+\newif\ifsuftesi@toccompactsec
+\newif\ifsuftesi@toccompactsubsec
+\newif\ifsuftesi@toccompactsubsubsec
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -122,6 +126,7 @@
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
supercompactaureo,periodicalaureo}[standard]{%
\ifcase\nr\relax
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -136,6 +141,7 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -151,6 +157,7 @@
marginparsep= 12pt}
\or
\suftesi@periodicaltrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -167,6 +174,7 @@
marginparsep= 10pt}
\or
\suftesi@compacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -183,6 +191,7 @@
marginparsep= 9pt}
\or
\suftesi@compactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -199,6 +208,7 @@
marginparsep= 9pt}
\or
\suftesi@supercompacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -215,6 +225,7 @@
marginparsep= 8pt}
\or
\suftesi@supercompactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -231,6 +242,7 @@
marginparsep= 7pt}
\or
\suftesi@periodicalaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -703,18 +715,16 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\relax
\fi}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define@choicekey{}{captionstyle}[\val\nr]
{standard,sanserif,italic,smallcaps}[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}
+ \captionsetup{labelfont=sc}
\fi
}
\define@choicekey{}{marginpar}[\val\nr]
@@ -739,6 +749,30 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\or
\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}
+ \def\suf@ctocdotsec{.}
+ \def\suf@ctocdotssec{}
+ \def\suf@ctocdotsssec{}
+\or
+\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}
+ \def\suf@ctocdotsssec{.}
+\fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -1476,7 +1510,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\SUF@CHAP@StyleSwitch}
\fi
\ifsuftesi@numparchap
- \setlength{\SUF@ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF@ADJnumparchap}{-6ex}
\else
\setlength{\SUF@ADJnumparchap}{0pt}
\fi}
@@ -1530,7 +1564,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\SUF@default@CHAPTER
\SUF@default@SECTIONS
\ifsuftesi@periodical
- \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@periodicalaureo
@@ -1588,13 +1622,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\fi
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -1602,13 +1636,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\else
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -2212,7 +2246,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\renewcommand{\appendixtocname}{Appendici}
\renewcommand{\appendixname}{Appendice}
\noappendicestocpagenum
-\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+\def\appendicesname{%
+ \ClassError{suftesi}%
+ {Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead. See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
+{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}%
@@ -2222,7 +2263,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\centering
\interlinepenalty \@M
\normalfont
-\SUF@chaptersize\appendixpagename\par}%
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
\if@dotoc@pp
\addappheadtotoc
\fi
@@ -2245,7 +2287,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\parindent \z@ \raggedright
\interlinepenalty \@M
\normalfont
-\SUF@chaptersize\appendixpagename%
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
\markboth{}{}\par}%
\if@dotoc@pp
\addappheadtotoc
@@ -2259,14 +2302,16 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\setcounter{section}{0}%
\setcounter{subsection}{0}%
\gdef\SUF@thesection{\@Alph\c@section}%
- \gdef\SUF@HEAD@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}}
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2622,6 +2667,10 @@ Janusz M. Nowacki.
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tochang@chap]{}{%
+\SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tochang@sec]
{}
@@ -2633,6 +2682,11 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
\SUF@tocSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
{}
@@ -2644,6 +2698,11 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
\SUF@tocSUBSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
{}
@@ -2655,6 +2714,7 @@ Janusz M. Nowacki.
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
\SUF@tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF@tochang@par]
{}
@@ -2744,6 +2804,10 @@ Janusz M. Nowacki.
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tocindent@chap]{}{%
+\SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tocindent@sec]
{}
@@ -2754,6 +2818,11 @@ Janusz M. Nowacki.
\SUF@tocSEC@font}
{\ifsuftesi@article\SUF@chaptitlerule%
\else\SUF@titlerule\fi\contentspage}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
{}
@@ -2763,6 +2832,11 @@ Janusz M. Nowacki.
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
\SUF@tocSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
{}
@@ -2772,6 +2846,7 @@ Janusz M. Nowacki.
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF@tocindent@par]
{}