diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/suftesi/suftesi.pdf | bin | 1098391 -> 1104231 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/suftesi/suftesi.dtx | 214 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 139 |
3 files changed, 289 insertions, 64 deletions
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf Binary files differindex a786249db9b..243d1d378a2 100644 --- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf +++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx index 3b278f52ef6..1c39a5238eb 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx @@ -4,7 +4,7 @@ \input docstrip \preamble - Copyright 2009-2019 by Ivan Valbusa + Copyright 2009-2020 by Ivan Valbusa This program is provided under the terms of the LaTeX Project Public License distributed from CTAN @@ -44,7 +44,7 @@ \endgroup %</internal> % -% Copyright (C) 2009-2019 by Ivan Valbusa +% Copyright (C) 2009-2020 by Ivan Valbusa % <ivan dot valbusa at univr dot it> % ------------------------------------------------------- % @@ -67,7 +67,7 @@ %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<class>\ProvidesClass{suftesi} %<*class> - [2019/10/26 v2.9.2 A class for typesetting theses, books and articles] + [2020/01/29 v2.9.3 A class for typesetting theses, books and articles] %</class> %<*driver> \documentclass{ltxdoc} @@ -175,7 +175,7 @@ %</driver> % \fi % -% \CheckSum{4656} +% \CheckSum{4902} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -193,6 +193,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v2.9.3}{2020/01/29}{Updated documentation.} % \changes{v2.9.2}{2019/10/26}{Added \cmd{protect} to \cmd{SUF@thechapter} and \cmd{SUF@thesection} in the definitions of \cmd{chaptermark} and \cmd{sectionmark} to correct a bug when loading \texttt{greek} option with \sty{babel}} % \changes{v2.9.1}{2018/11/09}{Added \sty{libertinust1math} package for Libertine font. Added \sty{luatex85} for Lua\TeX{} engine} % \changes{v2.9}{2016/04/04}{New options \opt{tocauthorfont} and \opt{toctitlefont}. Added macros\cmd{suftesi@MakeTextTOCLowercase} and \cmd{SUF@TOCtitlesmallcaps}. Improved \cmd{xheadbreak} command. New templates \texttt{book}, \texttt{theses-template-article}, \texttt{theses-template-book}.} @@ -1263,6 +1264,36 @@ % % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}} % +% \section{Sections font}\label{sec:secfont} +% +% \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section/number title} +% +% +%\begin{ltxsyntax} +% \cmditem{<level>font}{commands}\hfill(default=\texttt{empty}) +% +% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example: +% +%\begin{latexcode} +%\begin{verbatim} +% \chapfont{\bfseries\sffamily\scshape\Huge} +%\end{verbatim} +%\end{latexcode} +% +%^^A \cmditem{{level}numfont}{commands}\hfill(default=\texttt{empty}) +% +% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. Note that you have to adjust the spacing accordingly. For example, with the default chapter style: +% +%\begin{latexcode} +%\begin{verbatim} +%\chapnumfont{% + %\chapnumfont{\bfseries\fontsize{160}{50}\selectfont + %\color{gray}\arabic{chapter}\hskip-15cm} +%\end{verbatim} +%\end{latexcode} +% +%\end{ltxsyntax} +% % \section{Collections}\label{sec:collection} % % The \opt{collection} document structure is thought to create a collection of papers. Each paper has to be typeset in a separate \file{.tex} file inside the \env{article} environment: @@ -1976,6 +2007,7 @@ \or \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} +% % \end{macrocode} % \subsection*{TOC font} % \begin{macrocode} @@ -2065,26 +2097,32 @@ dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{} \def\SUF@toclabelnum{} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{} \def\SUF@toclabelnum{\@Roman} \or \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{\@Roman} \fi} @@ -2095,30 +2133,96 @@ dotarabic,dotroman,dotRoman}[arabic]{% {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesection{\arabic{section}} + \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{} \def\SUF@toclabelnum{} \or \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thesection{\Roman{section}} + \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{} \def\SUF@toclabelnum{\@Roman} \or \def\SUF@thesection{\arabic{section}} + \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{} \or \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thesection{\Roman{section}} + \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{\@Roman} \fi} % \end{macrocode} +% \subsubsection*{Subsection number style} +% \begin{macrocode} +\define@choicekey{}{subsecnumstyle}[\val\nr] +{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + \ifcase\nr\relax + \def\SUF@thesubsection{\arabic{subsection}} + \def\SUF@dotsubsec{} + \def\SUF@toclabelnum{} + \or + \def\SUF@thesubsection{\textsc{\roman{subsection}}} + \def\SUF@dotsubsec{} + \def\SUF@toclabelnum{\scshape\@roman} + \or + \def\SUF@thesubsection{\Roman{subsection}} + \def\SUF@dotsubsec{} + \def\SUF@toclabelnum{\@Roman} + \or + \def\SUF@thesubsection{\arabic{subsection}} + \def\SUF@dotsubsec{.} + \def\SUF@toclabelnum{} + \or + \def\SUF@thesubsection{\textsc{\roman{subsection}}} + \def\SUF@dotsubsec{.} + \def\SUF@toclabelnum{\scshape\@roman} + \or + \def\SUF@thesubsection{\Roman{subsection}} + \def\SUF@dotsubsec{.} + \def\SUF@toclabelnum{\@Roman} + \fi} +% \end{macrocode} +% \subsubsection*{Sub-subsection number style} +% \begin{macrocode} +\define@choicekey{}{subsubsecnumstyle}[\val\nr] +{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + \ifcase\nr\relax + \def\SUF@thesubsubsection{\arabic{subsubsection}} + \def\SUF@dotsubsubsec{} + \def\SUF@toclabelnum{} + \or + \def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} + \def\SUF@dotsubsubsec{} + \def\SUF@toclabelnum{\scshape\@roman} + \or + \def\SUF@thesubsubsection{\Roman{subsubsection}} + \def\SUF@dotsubsubsec{} + \def\SUF@toclabelnum{\@Roman} + \or + \def\SUF@thesubsubsection{\arabic{subsubsection}} + \def\SUF@dotsubsubsec{.} + \def\SUF@toclabelnum{} + \or + \def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} + \def\SUF@dotsubsubsec{.} + \def\SUF@toclabelnum{\scshape\@roman} + \or + \def\SUF@thesubsubsection{\Roman{subsubsection}} + \def\SUF@dotsubsubsec{.} + \def\SUF@toclabelnum{\@Roman} + \fi} +% \end{macrocode} % This option controls the style of small capitals used in the % title of chapters and sections using \opt{\meta{level}font=smallcaps} option: % \begin{macrocode} @@ -2132,6 +2236,18 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\suftesi@MakeTextTOCLowercase{\relax} \fi} % \end{macrocode} +% \subsubsection*{Fine adjustment of sections font}%EXPERIMENTAL +% \begin{macrocode} +\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}} +\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}} +\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{\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}} +% \end{macrocode} % \subsection*{Headers} % % \subsubsection*{Header style} @@ -2744,9 +2860,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} subsecfont=roman, subsubsecfont=roman, headerfont=roman, - secnumstyle=arabic, partnumstyle=Roman, chapnumstyle=arabic, + secnumstyle=arabic, + subsecnumstyle=arabic, + subsubsecnumstyle=arabic, smallcapsstyle=low, titlefont=italic, authorfont=roman, @@ -3140,54 +3258,84 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} % \begin{macrocode} \def\SUF@default@SECTIONS{ \ifsuftesi@numparsec +%\titleformat{\section}[display] +% {\SUF@sectionsize\SUF@lr@SECSwitch} +% {\ifsuftesi@article\SUF@thesection +% \else\thesection\fi\SUF@dotsec} +% {0ex} +% {\SUF@SEC@StyleSwitch} \titleformat{\section}[display] - {\SUF@sectionsize\SUF@lr@SECSwitch} - {\ifsuftesi@article\SUF@thesection - \else\thesection\fi\SUF@dotsec} - {0ex} - {\SUF@SEC@StyleSwitch} +{\SUF@sectionsize\SUF@lr@SECSwitch} +{\SUF@thesection\SUF@dotsec} +{0ex} +{\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else +%\titleformat{\section}[hang] +% {\SUF@sectionsize\SUF@lr@SECSwitch} +% {\ifsuftesi@article\SUF@thesection +% \else\thesection\fi\SUF@dotsec} +% {1em} +% {\SUF@SEC@StyleSwitch} \titleformat{\section}[hang] - {\SUF@sectionsize\SUF@lr@SECSwitch} - {\ifsuftesi@article\SUF@thesection - \else\thesection\fi\SUF@dotsec} - {1em} - {\SUF@SEC@StyleSwitch} +{\SUF@sectionsize\SUF@lr@SECSwitch} +{\SUF@thesection\SUF@dotsec} +{1em} +{\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] \fi % \end{macrocode} % \begin{macrocode} \ifsuftesi@numparsubsec +%\titleformat{\subsection}[display] +% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +% {\textnormal\thesubsection} +% {0ex} +% {\SUF@SUBSEC@StyleSwitch} \titleformat{\subsection}[display] - {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} - {\textnormal\thesubsection} - {0ex} - {\SUF@SUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +{\textnormal\SUF@thesubsection\SUF@dotsubsec} +{0ex} +{\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] \else +%\titleformat{\subsection}[hang] +% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +% {\textnormal\thesubsection} +% {1em} +% {\SUF@SUBSEC@StyleSwitch} \titleformat{\subsection}[hang] - {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} - {\textnormal\thesubsection} - {1em} - {\SUF@SUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +{\textnormal\SUF@thesubsection\SUF@dotsubsec} +{1em} +{\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi % \end{macrocode} % \begin{macrocode} \ifsuftesi@numparsubsubsec +%\titleformat{\subsubsection}[display] +% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +% {\textnormal\thesubsubsection} +% {0ex} +% {\SUF@SUBSUBSEC@StyleSwitch} \titleformat{\subsubsection}[display] - {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} - {\textnormal\thesubsubsection} - {0ex} - {\SUF@SUBSUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} +{0ex} +{\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] \else +%\titleformat{\subsubsection}[hang] +% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +% {\textnormal\thesubsubsection} +% {1em} +% {\SUF@SUBSUBSEC@StyleSwitch} \titleformat{\subsubsection}[hang] - {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} - {\textnormal\thesubsubsection} - {1em} - {\SUF@SUBSUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} +{1em} +{\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi } @@ -4022,9 +4170,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} % \paragraph{The \opt{default} headers} % \begin{macrocode} \renewcommand{\chaptermark}[1]{% - \markboth{\chaptertitlename\ \protect\SUF@thechapter}{#1}} + \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}} \ifsuftesi@article - \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@thesection.\ #1}} + \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}} \else \renewcommand{\sectionmark}[1]{} \fi diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index d39558c925d..4bd843329d5 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -6,7 +6,7 @@ %% %% suftesi.dtx (with options: `class') %% -%% Copyright 2009-2019 by Ivan Valbusa +%% Copyright 2009-2020 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN @@ -19,8 +19,10 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2019/10/26 v2.9.2 A class for typesetting theses, books and articles] + [2020/01/29 v2.9.3 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 @@ -458,26 +460,32 @@ dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{} \def\SUF@toclabelnum{} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{} \def\SUF@toclabelnum{\@Roman} \or \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@HEAD@thechapter{\arabic{chapter}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{} \or \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@HEAD@thechapter{\Roman{chapter}} \def\SUF@dotchap{.} \def\SUF@toclabelnum{\@Roman} \fi} @@ -485,29 +493,89 @@ dotarabic,dotroman,dotRoman}[arabic]{% {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesection{\arabic{section}} + \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{} \def\SUF@toclabelnum{} \or \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thesection{\Roman{section}} + \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{} \def\SUF@toclabelnum{\@Roman} \or \def\SUF@thesection{\arabic{section}} + \def\SUF@HEAD@thesection{\arabic{section}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{} \or \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@HEAD@thesection{\textsc{\roman{section}}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{\scshape\@roman} \or \def\SUF@thesection{\Roman{section}} + \def\SUF@HEAD@thesection{\Roman{section}} \def\SUF@dotsec{.} \def\SUF@toclabelnum{\@Roman} \fi} +\define@choicekey{}{subsecnumstyle}[\val\nr] +{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% +\ifcase\nr\relax +\def\SUF@thesubsection{\arabic{subsection}} +\def\SUF@dotsubsec{} +\def\SUF@toclabelnum{} +\or +\def\SUF@thesubsection{\textsc{\roman{subsection}}} +\def\SUF@dotsubsec{} +\def\SUF@toclabelnum{\scshape\@roman} +\or +\def\SUF@thesubsection{\Roman{subsection}} +\def\SUF@dotsubsec{} +\def\SUF@toclabelnum{\@Roman} +\or +\def\SUF@thesubsection{\arabic{subsection}} +\def\SUF@dotsubsec{.} +\def\SUF@toclabelnum{} +\or +\def\SUF@thesubsection{\textsc{\roman{subsection}}} +\def\SUF@dotsubsec{.} +\def\SUF@toclabelnum{\scshape\@roman} +\or +\def\SUF@thesubsection{\Roman{subsection}} +\def\SUF@dotsubsec{.} +\def\SUF@toclabelnum{\@Roman} +\fi} +\define@choicekey{}{subsubsecnumstyle}[\val\nr] +{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% +\ifcase\nr\relax +\def\SUF@thesubsubsection{\arabic{subsubsection}} +\def\SUF@dotsubsubsec{} +\def\SUF@toclabelnum{} +\or +\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} +\def\SUF@dotsubsubsec{} +\def\SUF@toclabelnum{\scshape\@roman} +\or +\def\SUF@thesubsubsection{\Roman{subsubsection}} +\def\SUF@dotsubsubsec{} +\def\SUF@toclabelnum{\@Roman} +\or +\def\SUF@thesubsubsection{\arabic{subsubsection}} +\def\SUF@dotsubsubsec{.} +\def\SUF@toclabelnum{} +\or +\def\SUF@thesubsubsection{\textsc{\roman{subsubsection}}} +\def\SUF@dotsubsubsec{.} +\def\SUF@toclabelnum{\scshape\@roman} +\or +\def\SUF@thesubsubsection{\Roman{subsubsection}} +\def\SUF@dotsubsubsec{.} +\def\SUF@toclabelnum{\@Roman} +\fi} \define@choicekey{}{smallcapsstyle}[\val\nr] {low,upper}[low]{% \ifcase\nr\relax @@ -517,6 +585,15 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\suftesi@MakeTextLowercase{\relax} \def\suftesi@MakeTextTOCLowercase{\relax} \fi} +\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}} +\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}} +\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{\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}} \define@choicekey{}{headerstyle}[\val\nr] {inner,center,plain,authortitleinner, authortitlecenter}[inner]{% @@ -1059,9 +1136,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} subsecfont=roman, subsubsecfont=roman, headerfont=roman, - secnumstyle=arabic, partnumstyle=Roman, chapnumstyle=arabic, + secnumstyle=arabic, + subsecnumstyle=arabic, + subsubsecnumstyle=arabic, smallcapsstyle=low, titlefont=italic, authorfont=roman, @@ -1397,49 +1476,47 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \def\SUF@default@SECTIONS{ \ifsuftesi@numparsec \titleformat{\section}[display] - {\SUF@sectionsize\SUF@lr@SECSwitch} - {\ifsuftesi@article\SUF@thesection - \else\thesection\fi\SUF@dotsec} - {0ex} - {\SUF@SEC@StyleSwitch} +{\SUF@sectionsize\SUF@lr@SECSwitch} +{\SUF@thesection\SUF@dotsec} +{0ex} +{\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\section}[hang] - {\SUF@sectionsize\SUF@lr@SECSwitch} - {\ifsuftesi@article\SUF@thesection - \else\thesection\fi\SUF@dotsec} - {1em} - {\SUF@SEC@StyleSwitch} +{\SUF@sectionsize\SUF@lr@SECSwitch} +{\SUF@thesection\SUF@dotsec} +{1em} +{\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsec \titleformat{\subsection}[display] - {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} - {\textnormal\thesubsection} - {0ex} - {\SUF@SUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +{\textnormal\SUF@thesubsection\SUF@dotsubsec} +{0ex} +{\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\subsection}[hang] - {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} - {\textnormal\thesubsection} - {1em} - {\SUF@SUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} +{\textnormal\SUF@thesubsection\SUF@dotsubsec} +{1em} +{\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsubsec \titleformat{\subsubsection}[display] - {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} - {\textnormal\thesubsubsection} - {0ex} - {\SUF@SUBSUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} +{0ex} +{\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\subsubsection}[hang] - {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} - {\textnormal\thesubsubsection} - {1em} - {\SUF@SUBSUBSEC@StyleSwitch} +{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} +{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} +{1em} +{\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi } @@ -2176,9 +2253,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \renewcommand{\footnoterule}{} \def\SUF@versionstring{\texttt{\version@string{} \today}} \renewcommand{\chaptermark}[1]{% - \markboth{\chaptertitlename\ \protect\SUF@thechapter}{#1}} + \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}} \ifsuftesi@article - \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@thesection.\ #1}} + \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}} \else \renewcommand{\sectionmark}[1]{} \fi |