From be62d2b5acee8e8e957d32cae1c8e82171d1960c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jun 2021 21:07:54 +0000 Subject: suftesi git-svn-id: svn://tug.org/texlive/trunk@59582 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 213 ++++++++++++------------ 1 file changed, 108 insertions(+), 105 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 1091de55c48..8e0ec9131fc 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2021/06/05 v3.1.2 A class for typesetting theses, books and articles] + [2021/06/06 v3.1.3 A class for typesetting theses, books and articles] \RequirePackage{xkeyval} \newif\ifsuftesi@article \newif\ifsuftesi@collection @@ -105,7 +105,6 @@ \def\SUF@chapswitch{} \or \suftesi@collectiontrue - \SUF@titlepagefalse \setkeys{}{headerstyle=authortitleinner} \def\SUF@chapswitch{} \fi} @@ -1326,6 +1325,7 @@ \ifLuaTeX \RequirePackage{luatex85} \fi +\RequirePackage{etoolbox} \ifsuftesi@FSPL \RequirePackage{cclicenses} \fi @@ -1886,39 +1886,6 @@ \section{#1}}} {\relax}} \fi -\newcommand{\partfont}[1]{\def\SUF@PART@font{#1}} -\newcommand{\chapfont}[1]{\def\SUF@CHAP@font{#1}} -\newcommand{\secfont}[1]{\def\SUF@SEC@font{#1}} -\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@font{#1}} -\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@font{#1}} -\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@titlestyle{#1}\let\SUF@titlefont\relax} -\newcommand{\authorfont}[1]{\def\SUF@authorstyle{#1}\let\SUF@authorfont\relax} -\newcommand{\datefont}[1]{\def\SUF@datefont{#1}} -\newif\ifbreakintoc\breakintocfalse -\newif\ifbreakinbody\breakinbodytrue -\DeclareRobustCommand{\breakintoc} - {\ifbreakintoc\\\else\fi} -\DeclareRobustCommand{\breakinbody} - {\ifbreakinbody\\\else\fi} -\DeclareRobustCommand{\breakinbodyleft} - {\ifbreakinbody\newline\else\fi} -\let\origtableofcontents\tableofcontents -\renewcommand{\tableofcontents}{% - \begingroup - \breakintoctrue\breakinbodyfalse% - \origtableofcontents - \endgroup} -\DeclareRobustCommand{\headbreak} - {\ifbreakintoc\\\else\fi} -\DeclareRobustCommand{\xheadbreak} - {\ifbreakinbody\\\else\fi} -\DeclareRobustCommand{\yheadbreak} - {\ifbreakinbody\newline\else\fi} \ifsuftesi@collection \newenvironment{abstract}{% \if@twocolumn @@ -2627,30 +2594,6 @@ \if@restonecol\twocolumn\fi } \fi -\newcommand{\tocpartname}[1]{\def\SUF@tocpartname{#1}} - \tocpartname{\partname} -\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{\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@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\newcommand{\tocsecnumfont}[1]{% - \def\SUF@SEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\newcommand{\tocsubsecnumfont}[1]{% - \def\SUF@SUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\newcommand{\tocsubsubsecnumfont}[1]{% - \def\SUF@SUBSUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\newcommand{\tocparnumfont}[1]{% - \def\SUF@PAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\newcommand{\tocsubparnumfont}[1]{% - \def\SUF@SUBPAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}} -\tocparnumfont{} -\tocsubparnumfont{} \newcommand{\partialtocsize}[1]{% \def\@partialtocsize{#1}} \newcommand{\partialtocsecfont}[1]{% @@ -2696,6 +2639,63 @@ \partialtocafterspace{2\baselineskip} \partialtocbeforecode{} \partialtocaftercode{} +\newcommand{\partfont}[1]{\def\SUF@PART@font{#1}} +\newcommand{\chapfont}[1]{\def\SUF@CHAP@font{#1}} +\newcommand{\secfont}[1]{\def\SUF@SEC@font{#1}} +\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@font{#1}} +\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@font{#1}} +\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@titlestyle{#1}\let\SUF@titlefont\relax} +\newcommand{\authorfont}[1]{\def\SUF@authorstyle{#1}\let\SUF@authorfont\relax} +\newcommand{\datefont}[1]{\def\SUF@datefont{#1}} +\newcommand{\tocpartname}[1]{\def\SUF@tocpartname{#1}} + \tocpartname{\partname} +\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{\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@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\newcommand{\tocsecnumfont}[1]{% + \def\SUF@SEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\newcommand{\tocsubsecnumfont}[1]{% + \def\SUF@SUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\newcommand{\tocsubsubsecnumfont}[1]{% + \def\SUF@SUBSUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\newcommand{\tocparnumfont}[1]{% + \def\SUF@PAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\newcommand{\tocsubparnumfont}[1]{% + \def\SUF@SUBPAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}} +\tocparnumfont{} +\tocsubparnumfont{} +\newif\ifbreakintoc\breakintocfalse +\newif\ifbreakinbody\breakinbodytrue +\DeclareRobustCommand{\breakintoc} + {\ifbreakintoc\\\else\fi} +\DeclareRobustCommand{\breakinbody} + {\ifbreakinbody\\\else\fi} +\DeclareRobustCommand{\breakinbodyleft} + {\ifbreakinbody\newline\else\fi} +\let\origtableofcontents\tableofcontents +\renewcommand{\tableofcontents}{% + \begingroup + \breakintoctrue\breakinbodyfalse% + \origtableofcontents + \endgroup} +\DeclareRobustCommand{\headbreak} + {\ifbreakintoc\\\else\fi} +\DeclareRobustCommand{\xheadbreak} + {\ifbreakinbody\\\else\fi} +\DeclareRobustCommand{\yheadbreak} + {\ifbreakinbody\newline\else\fi} \RequirePackage{fancyhdr} \newcommand{\versionstring}[1]{\def\version@string{#1}} \versionstring{Version of} @@ -2909,52 +2909,6 @@ \penalty\@highpenalty \endgroup \fi} -\renewcommand\maketitle{\par - \begingroup - \renewcommand\thefootnote{\@fnsymbol\c@footnote}% - \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}% - \long\def\@makefntext##1{\parindent 1em\noindent - \hb@xt@1.8em{% - \hss\@textsuperscript{\normalfont\@thefnmark}}##1}% - \if@twocolumn - \ifnum \col@number=\@ne - \@maketitle - \else - \twocolumn[\@maketitle]% - \fi - \else - \newpage - \global\@topnum\z@ % Prevents figures from going at top of page. - \@maketitle - \fi - \thispagestyle{plain}\@thanks% - \endgroup - \setcounter{section}{0}% - \global\let\and\relax - \let\thanks\@gobble} -\AtBeginDocument{\def\@maketitle{% - \refstepcounter{article} - \SUF@chaptersize - \SUF@authortitle@align - \let\footnote\thanks - \parindent=0pt - {\SUF@second\par}% - \label{begin:\thearticle} - \@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}{% - {\SUF@tocAUT@font{\@author}}\texorpdfstring{\newline}{, }% - {\SUF@tocTIT@font{\@headtitle}}} - \endgroup% - \par\nobreak\vspace{2ex} - {\SUF@first\par% - \vskip1.5cm}}% - } \newenvironment{article} {\begingroup \setcounter{section}{0} @@ -3017,6 +2971,54 @@ \protect\ClassWarningNoLine{suftesi}{% No \string\author\space given\MessageBreak% See the class documentation for explanation}} +\ifsuftesi@collection +\renewcommand\maketitle{\par + \begingroup + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% + \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}% + \long\def\@makefntext##1{\parindent 1em\noindent + \hb@xt@1.8em{% + \hss\@textsuperscript{\normalfont\@thefnmark}}##1}% + \if@twocolumn + \ifnum \col@number=\@ne + \@maketitle + \else + \twocolumn[\@maketitle]% + \fi + \else + \newpage + \global\@topnum\z@ % Prevents figures from going at top of page. + \@maketitle + \fi + \thispagestyle{plain}\@thanks% + \endgroup + \setcounter{section}{0}% + \global\let\and\relax + \let\thanks\@gobble} +\AtBeginDocument{\def\@maketitle{% + \refstepcounter{article} + \SUF@chaptersize + \SUF@authortitle@align + \let\footnote\thanks + \parindent=0pt + {\SUF@second\par}% + \label{begin:\thearticle} + \@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}{% + {\SUF@tocAUT@font{\@author}}\texorpdfstring{\newline}{, }% + {\SUF@tocTIT@font{\@headtitle}}} + \endgroup% + \par\nobreak\vspace{2ex} + {\SUF@first\par% + \vskip1.5cm}}% + } +\else \ifSUF@titlepage \renewcommand\maketitle{% \begin{titlepage} @@ -3088,6 +3090,7 @@ \end{center}% \par \vskip 1.5em} + \fi \fi \newcommand{\Ctitle}[1]{\def\@Ctitle{#1}} \newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}} -- cgit v1.2.3