From 3ed4824e5746044a28f67f06cd92d80a9beb1002 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Feb 2020 22:10:19 +0000 Subject: suftesi (9feb20) git-svn-id: svn://tug.org/texlive/trunk@53740 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 216 +++++++++++++----------- 1 file changed, 118 insertions(+), 98 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 4bd843329d5..78c01dde37c 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -19,10 +19,8 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2020/01/29 v2.9.3 A class for typesetting theses, books and articles] + [2020/02/04 v2.9.5 A class for typesetting theses, books and articles] - %\chapnumfont{\bfseries\fontsize{160}{50}\selectfont - %\color{gray}\arabic{chapter}\hskip-15cm} \ClassWarningNoLine{suftesi}{% ******************************************\MessageBreak * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak @@ -97,13 +95,15 @@ \define@choicekey{}{structure}[\val\nr] {book,article,collection}[book]{% \ifcase\nr\relax -\disable@keys{}{secnumstyle} +\def\SUF@chapswitch{\thechapter.} \or \suftesi@articletrue \@titlepagefalse +\def\SUF@chapswitch{} \or \suftesi@collectiontrue \setkeys{}{headerstyle=authortitleinner} +\def\SUF@chapswitch{} \fi} \define@choicekey{}{documentstructure}[\val\nr] {book,article,collection}[book]{% @@ -434,27 +434,21 @@ \ifcase\nr\relax \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{} - \def\SUF@toclabelnum{} \or \def\SUF@thepart{\textsc{\roman{part}}} \def\SUF@dotpart{} - \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thepart{\Roman{part}} \def\SUF@dotpart{} - \def\SUF@toclabelnum{\@Roman} \or \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{.} - \def\SUF@toclabelnum{} \or \def\SUF@thepart{\textsc{\roman{part}}} \def\SUF@dotpart{.} - \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thepart{\Roman{part}} \def\SUF@dotpart{.} - \def\SUF@toclabelnum{\@Roman} \fi} \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman, dotarabic,dotroman,dotRoman}[arabic]{% @@ -462,119 +456,119 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@thechapter{\arabic{chapter}} \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{} - \def\SUF@toclabelnum{} + \def\SUF@CHAP@thecontentslabel{\thecontentslabel} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{} - \def\SUF@toclabelnum{\scshape\@roman} + \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or \def\SUF@thechapter{\Roman{chapter}} \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{} - \def\SUF@toclabelnum{\@Roman} + \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}} \or \def\SUF@thechapter{\arabic{chapter}} \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{.} - \def\SUF@toclabelnum{} + \def\SUF@CHAP@thecontentslabel{\thecontentslabel} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{.} - \def\SUF@toclabelnum{\scshape\@roman} + \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or \def\SUF@thechapter{\Roman{chapter}} \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{.} - \def\SUF@toclabelnum{\@Roman} + \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{secnumstyle}[\val\nr] {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax - \def\SUF@thesection{\arabic{section}} + \def\SUF@thesection{\SUF@chapswitch\arabic{section}} \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{} - \def\SUF@toclabelnum{} + \def\SUF@SEC@thecontentslabel{\thecontentslabel} \or - \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}} \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{} - \def\SUF@toclabelnum{\scshape\@roman} + \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or - \def\SUF@thesection{\Roman{section}} + \def\SUF@thesection{\SUF@chapswitch\Roman{section}} \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{} - \def\SUF@toclabelnum{\@Roman} + \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}} \or - \def\SUF@thesection{\arabic{section}} + \def\SUF@thesection{\SUF@chapswitch\arabic{section}} \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{.} - \def\SUF@toclabelnum{} + \def\SUF@SEC@thecontentslabel{\thecontentslabel} \or - \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}} \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{.} - \def\SUF@toclabelnum{\scshape\@roman} + \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or - \def\SUF@thesection{\Roman{section}} + \def\SUF@thesection{\SUF@chapswitch\Roman{section}} \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{.} - \def\SUF@toclabelnum{\@Roman} + \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{subsecnumstyle}[\val\nr] {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax -\def\SUF@thesubsection{\arabic{subsection}} +\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}} \def\SUF@dotsubsec{} -\def\SUF@toclabelnum{} +\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel} \or -\def\SUF@thesubsection{\textsc{\roman{subsection}}} +\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}} \def\SUF@dotsubsec{} -\def\SUF@toclabelnum{\scshape\@roman} +\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or -\def\SUF@thesubsection{\Roman{subsection}} +\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}} \def\SUF@dotsubsec{} -\def\SUF@toclabelnum{\@Roman} +\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}} \or -\def\SUF@thesubsection{\arabic{subsection}} +\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}} \def\SUF@dotsubsec{.} -\def\SUF@toclabelnum{} +\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel} \or -\def\SUF@thesubsection{\textsc{\roman{subsection}}} +\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}} \def\SUF@dotsubsec{.} -\def\SUF@toclabelnum{\scshape\@roman} +\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or -\def\SUF@thesubsection{\Roman{subsection}} +\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}} \def\SUF@dotsubsec{.} -\def\SUF@toclabelnum{\@Roman} +\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{\arabic{subsubsection}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}} \def\SUF@dotsubsubsec{} -\def\SUF@toclabelnum{} +\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel} \or -\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}} \def\SUF@dotsubsubsec{} -\def\SUF@toclabelnum{\scshape\@roman} +\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or -\def\SUF@thesubsubsection{\Roman{subsubsection}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}} \def\SUF@dotsubsubsec{} -\def\SUF@toclabelnum{\@Roman} +\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}} \or -\def\SUF@thesubsubsection{\arabic{subsubsection}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}} \def\SUF@dotsubsubsec{.} -\def\SUF@toclabelnum{} +\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel} \or -\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}} \def\SUF@dotsubsubsec{.} -\def\SUF@toclabelnum{\scshape\@roman} +\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}} \or -\def\SUF@thesubsubsection{\Roman{subsubsection}} +\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}} \def\SUF@dotsubsubsec{.} -\def\SUF@toclabelnum{\@Roman} +\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{smallcapsstyle}[\val\nr] {low,upper}[low]{% @@ -594,6 +588,18 @@ dotarabic,dotroman,dotRoman}[arabic]{% \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{\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{\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]{% @@ -1112,6 +1118,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps} \fi} \ExecuteOptionsX<>{ + structure=book, captionstyle=standard, marginpar=true, parindent=compact, @@ -2200,49 +2207,66 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} -\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}} - \appendicesname{Appendici} - \newcommand{\appendixpage}{\SUF@appendixpage} -\def\SUF@appendixpage{% - \@mainmattertrue - \titlecontents{part} - [0em] - {\addvspace{3ex}} - {} - {} - {} - [\addvspace{1ex}] -\let\contentspage\relax - \cleardoublepage - \thispagestyle{empty} - \addcontentsline{toc}{part}{\SUF@appendices} - \begingroup - \centering - \null\vfil - {\LARGE\SUF@appendices\par} - \vfil - \endgroup - \cleardoublepage -\titlecontents{part} - [0em] - {\addvspace{3ex}\partname~} - {\makebox[\SUF@label@part][l]{% - \SUF@toclabelnum\thecontentslabel}\hspace*{1em}} - {} - {} - [\addvspace{1ex}] +\RequirePackage{appendix} +\renewcommand{\appendixpagename}{Appendici} +\renewcommand{\appendixtocname}{Appendici} +\renewcommand{\appendixname}{Appendice} +\noappendicestocpagenum +\AtBeginEnvironment{appendices}{\appendix\mainmatter} +\renewcommand{\@chap@pppage}{% +\clear@ppage +\thispagestyle{plain}% +\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi +\null\vfil +\markboth{}{}% +{\centering +\interlinepenalty \@M +\normalfont +\SUF@chaptersize\appendixpagename\par}% +\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\appendixpagename% +\markboth{}{}\par}% +\if@dotoc@pp +\addappheadtotoc +\fi +\nobreak +\vskip 3ex +\@afterheading } \ifsuftesi@article \renewcommand\appendix{\par \setcounter{section}{0}% \setcounter{subsection}{0}% - \gdef\SUF@thesection{\@Alph\c@section}} + \gdef\SUF@thesection{\@Alph\c@section}% + \gdef\SUF@HEAD@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@thechapter{\@Alph\c@chapter}% + \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}} \fi \RequirePackage{fancyhdr} \newcommand{\versionstring}[1]{\def\version@string{#1}} @@ -2528,7 +2552,7 @@ Janusz M. Nowacki. [0em] {\addvspace{3ex}\partname\hspace*{.5em}} {\makebox[\SUF@label@part][l]{% - \SUF@toclabelnum\thecontentslabel}\hspace*{1em}} + \thecontentslabel}\hspace*{1em}} {} {} [\addvspace{1ex}] @@ -2591,7 +2615,7 @@ Janusz M. Nowacki. \makebox[1em][l]{\thecontentspage}% \hskip\SUF@addto@tochang@chap% \makebox[\SUF@label@chap][l]{% - \SUF@toclabelnum\thecontentslabel}\hspace*{1em}% + \SUF@CHAP@thecontentslabel}\hspace*{1em}% \SUF@tocCHAP@font} {\hskip-\SUF@tochang@chap% \makebox[1em][l]{\thecontentspage}% @@ -2603,9 +2627,7 @@ Janusz M. Nowacki. {} {\hskip-\SUF@tochang@sec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec% - \makebox[\SUF@label@sec][l]{% - \ifsuftesi@article\SUF@toclabelnum% - \else\fi\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}% \SUF@tocSEC@font} {\hskip-\SUF@tochang@sec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec% @@ -2616,7 +2638,7 @@ Janusz M. Nowacki. {} {\hskip-\SUF@tochang@subsec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec% - \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}% \SUF@tocSUBSEC@font} {\hskip-\SUF@tochang@subsec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec% @@ -2627,7 +2649,7 @@ Janusz M. Nowacki. {} {\hskip-\SUF@tochang@subsubsec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec% - \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}% \SUF@tocSUBSUBSEC@font} {\hskip-\SUF@tochang@subsubsec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec% @@ -2715,7 +2737,7 @@ Janusz M. Nowacki. [\SUF@tocindent@chap] {\addvspace{2ex}} {\hskip-\SUF@tocindent@chap% - \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}% + \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}% \hspace*{1em}% \SUF@tocCHAP@font} {\hskip-\SUF@tocindent@chap% @@ -2726,9 +2748,7 @@ Janusz M. Nowacki. [\SUF@tocindent@sec] {} {\hskip-\dimexpr(\SUF@label@sec+1em)% - \makebox[\SUF@label@sec][l]{% - \ifsuftesi@article\SUF@toclabelnum% - \else\fi\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}% \SUF@tocSEC@font} {\hskip-\dimexpr(\SUF@label@sec+1em)% \SUF@tocSEC@font} @@ -2738,7 +2758,7 @@ Janusz M. Nowacki. [\SUF@tocindent@subsec] {} {\hskip-\dimexpr(\SUF@label@subsec+1em)% - \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}% \SUF@tocSUBSEC@font} {\hskip-\dimexpr(\SUF@label@subsec+1em)% \SUF@tocSUBSEC@font} @@ -2747,7 +2767,7 @@ Janusz M. Nowacki. [\SUF@tocindent@subsubsec] {} {\hskip-\dimexpr(\SUF@label@subsubsec+1em)% - \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}% + \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}% \SUF@tocSUBSUBSEC@font} {\hskip-\dimexpr(\SUF@label@subsubsec+1em)% \SUF@tocSUBSUBSEC@font} -- cgit v1.2.3