texlive[53759] Master/texmf-dist: suftesi (11feb20)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 11 23:10:42 CET 2020
Revision: 53759
http://tug.org/svn/texlive?view=revision&revision=53759
Author: karl
Date: 2020-02-11 23:10:41 +0100 (Tue, 11 Feb 2020)
Log Message:
-----------
suftesi (11feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2020-02-11 22:10:31 UTC (rev 53758)
+++ trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2020-02-11 22:10:41 UTC (rev 53759)
@@ -67,7 +67,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [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]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -175,7 +175,7 @@
%</driver>
% \fi
%
-% \CheckSum{5108}
+% \CheckSum{5283}
%
% \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,7 +193,9 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}.}
+% \changes{v2.9.6a}{2020/02/11}{Maintenance release}
+% \changes{v2.9.6}{2020/02/10}{New option \opt{compacttoc}. The appendix page title is printed in the font of the chapters by default. Removed \cmd{apepndicesname} command.}
+% \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}. New mechanism for the appendices through the \sty{appendix} package.}
% \changes{v2.9.4}{2020/01/01}{Updated documentation.}
% \changes{v2.9.3}{2020/01/29}{Updated documentation.}
% \changes{v2.9.2}{2019/10/26}{Added \cmd{protect} to \cmd{SUF at thechapter} and \cmd{SUF at thesection} in the definitions of \cmd{chaptermark} and \cmd{sectionmark} to correct a bug when loading \texttt{greek} option with \sty{babel}}
@@ -594,7 +596,27 @@
%\end{tikzpicture}
%\caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
%\end{figure}
+
%
+% \subsection{The cover page}
+% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
+%\begin{latexcode}
+ %\begin{verbatim}
+ %\Cauthor{Bruce Lee}
+ %\Ctitle{The Art of Kicking}
+ %\Csubtitle{How to survive in the modern societies}
+ %\Ceditor{edited by\\ Walker Texas Ranger}
+ %\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+ %\Cpagecolor{white!90!black}
+ %\Ctextcolor{white}
+ %\Cfootcolor{black}
+ %
+ %\makecover[ball color=DarkBlue,draw=none]
+ %\end{verbatim}
+ %\end{latexcode}
+%
+%To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
+%
% \subsection{The frontispiece} \enlargethispage{\baselineskip}
%
% The class has an original frontispiece (see figure \ref{fig:frontispiece}) now directly available
@@ -634,27 +656,7 @@
%
%^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
%
-% \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
-%\begin{latexcode}
-%\begin{verbatim}
-%\Cauthor{Bruce Lee}
-%\Ctitle{The Art of Kicking}
-%\Csubtitle{How to survive in the modern societies}
-%\Ceditor{edited by\\ Walker Texas Ranger}
-%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
-%\Cpagecolor{white!90!black}
-%\Ctextcolor{white}
-%\Cfootcolor{black}
-%
-%\makecover[ball color=DarkBlue,draw=none]
-%\end{verbatim}
-%\end{latexcode}
-%
-%To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
-%
-%
-% \subsection{Appendices}
+% \subsection{The appendices}
% Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment.
%\begin{latexcode}
%\begin{verbatim}
@@ -846,6 +848,13 @@
% \item[leftpage] Prints a table of contents with page numbers
% on the left margin.
% \end{valuelist}
+% \optitem[sec]{compacttoc}{\opt{sec}, \opt{subsec},
+% \opt{subsubsec}}
+% \begin{valuelist}
+% \item[sec] Prints the sections, subsections and sub-subsections in a single paragraph. Note that in this case the option \opt{tocstyle=dotted} in uneffective as the dots are not printed for chapter entries.
+% \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
+% \item[subsubsec] Prints the sub-subsections in a single paragraph.
+% \end{valuelist}
% \optitem[roman]{toc\meta{level}font}{\opt{roman}, \opt{italic},
% \opt{smallcaps}}
% \begin{valuelist}
@@ -969,7 +978,7 @@
% \end{optionlist}
%
%
-% \subsection{Miscellaneous}
+% \subsection{Miscellaneous}\label{sec:miscellaneous}
%
%\begin{optionlist}
% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
@@ -1239,26 +1248,23 @@
% The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on.
%
%\begin{ltxsyntax}
-% \cmditem{<level>font}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}font}{definition}\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:
+% 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, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
%
%\begin{latexcode}
%\begin{verbatim}
-% \chapfont{\bfseries\sffamily\scshape\Huge}
-% \secfont{\sffamily\fontsize{15.5}{17.5}}
+%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
%\end{verbatim}
%\end{latexcode}
+% \cmditem*{\meta{level}numfont}{definition}\hfill(default=\texttt{empty})
%
-% \cmditem{<level>numfont}{definition}\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}. For example:
%
-% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
-%
%\begin{latexcode}
%\begin{verbatim}
-%\chapnumfont{%
%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-%\color{gray}\arabic{chapter}\hskip-15cm}
+% \color{gray}\arabic{chapter}\hskip-15cm}
%\end{verbatim}
%\end{latexcode}
% Combining these commands you can get something like this (or something worse/better):
@@ -1267,6 +1273,8 @@
%\documentclass[pagelayout=periodicalaureo,11pt,
%version=cscreen,chapstyle=parright]{suftesi}
%
+%\usepackage{xcolor,lipsum}
+%
%\chapfont{\bfseries\sffamily\scshape\LARGE}
%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
%
@@ -1343,12 +1351,16 @@
%
% \cmditem{appendixpage}
%
-% Prints a page with the argument of \cmd{appendicesname} (default=\texttt{Appendici}) at the center. Particularly useful if you have two or more appendices.
+% Prints a page with the title provided by \cmd{appendixpagename} (default=\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
+%\begin{latexcode}
+%\begin{verbatim}
+% \renewcommand{\appendixpagename}{Appendices}
+%\end{verbatim}
+%\end{latexcode}%
+%^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
+%^^A
+%^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
%
-% \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
-%
-% Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
-%
%\end{ltxsyntax}
%
%
@@ -1762,6 +1774,9 @@
\newif\ifsuftesi at twocolumnlot
\newif\ifsuftesi at reverseauthortitle
\newif\ifsuftesi at collection
+\newif\ifsuftesi at toccompactsec
+\newif\ifsuftesi at toccompactsubsec
+\newif\ifsuftesi at toccompactsubsubsec
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -1818,6 +1833,7 @@
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
supercompactaureo,periodicalaureo}[standard]{%
\ifcase\nr\relax
+ \DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
\DeclareRobustCommand{\SUF at sectionsize}{\large}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1832,6 +1848,7 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
\DeclareRobustCommand{\SUF at sectionsize}{\large}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1847,6 +1864,7 @@
marginparsep= 12pt}
\or
\suftesi at periodicaltrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1863,6 +1881,7 @@
marginparsep= 10pt}
\or
\suftesi at compacttrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1879,6 +1898,7 @@
marginparsep= 9pt}
\or
\suftesi at compactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1895,6 +1915,7 @@
marginparsep= 9pt}
\or
\suftesi at supercompacttrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1911,6 +1932,7 @@
marginparsep= 8pt}
\or
\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -1927,6 +1949,7 @@
marginparsep= 7pt}
\or
\suftesi at periodicalaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -2472,18 +2495,16 @@
% \subsubsection*{Captions}
% \begin{macrocode}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define at 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
}
% \end{macrocode}
@@ -2514,6 +2535,30 @@
\or
\suftesi at pagelefttoctrue
\fi}
+\define at choicekey{}{compacttoc}[\val\nr]{%
+ sec,subsec,subsubsec}[sec]{%
+ \ifcase\nr\relax
+ \suftesi at toccompactsectrue
+ \suftesi at toccompactsubsectrue
+ \suftesi at toccompactsubsubsectrue
+ \def\suf at sscorrect{\hskip.5em}
+ \def\suf at ssscorrect{\hskip.5em}
+ \def\suf at ctocdotsec{.}
+ \def\suf at ctocdotssec{}
+ \def\suf at ctocdotsssec{}
+ \or
+ \suftesi at toccompactsubsectrue
+ \suftesi at toccompactsubsubsectrue
+ \def\suf at sscorrect{\relax}
+ \def\suf at ssscorrect{\hskip.5em}
+ \def\suf at ctocdotssec{.}
+ \def\suf at ctocdotsssec{}
+ \or
+ \suftesi at toccompactsubsubsectrue
+ \def\suf at sscorrect{\relax}
+ \def\suf at ssscorrect{\relax}
+ \def\suf at ctocdotsssec{.}
+ \fi}
\define at choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -3352,7 +3397,7 @@
{\SUF at CHAP@StyleSwitch}
\fi
\ifsuftesi at numparchap
- \setlength{\SUF at ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF at ADJnumparchap}{-6ex}
\else
\setlength{\SUF at ADJnumparchap}{0pt}
\fi}
@@ -3444,7 +3489,7 @@
\SUF at default@CHAPTER
\SUF at default@SECTIONS
\ifsuftesi at periodical
- \titlespacing*{\chapter}{0em}{0\SUF at ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi at periodicalaureo
@@ -3513,13 +3558,13 @@
\fi
\ifsuftesi at numparpart
\titleformat{\part}[display]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{2ex}
{\SUF at PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{1em}
{\SUF at PART@StyleSwitch}
@@ -3530,13 +3575,13 @@
% \begin{macrocode}
\ifsuftesi at numparpart
\titleformat{\part}[display]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{2ex}
{\SUF at PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{1em}
{\SUF at PART@StyleSwitch}
@@ -4213,13 +4258,21 @@
% \end{macrocode}
% \subsection*{Appendix}
% \begin{macrocode}
-% \changes{v2.9.5}{2020/02/04}{New mechanism for the appendices through the \sty{appendix} package.}
\RequirePackage{appendix}
\renewcommand{\appendixpagename}{Appendici}
\renewcommand{\appendixtocname}{Appendici}
\renewcommand{\appendixname}{Appendice}
\noappendicestocpagenum
-\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+%^^A Bug using defaultfont=none,libertine,standard,compatibility
+%^^A \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}}}}
%^^A\newcommand{\appendicesname}[1]{\def\SUF at appendices{#1}}
%^^A \appendicesname{Appendici}
%^^A \newcommand{\appendixpage}{\SUF at appendixpage}
@@ -4261,7 +4314,8 @@
{\centering
\interlinepenalty \@M
\normalfont
- \SUF at chaptersize\appendixpagename\par}%
+ \SUF at chaptersize
+ \SUF at CHAP@StyleSwitch\expandafter\appendixpagename\par}%
\if at dotoc@pp
\addappheadtotoc
\fi
@@ -4284,7 +4338,8 @@
{\parindent \z@ \raggedright
\interlinepenalty \@M
\normalfont
- \SUF at chaptersize\appendixpagename%
+ \SUF at chaptersize
+ \SUF at CHAP@StyleSwitch\expandafter\appendixpagename%
\markboth{}{}\par}%
\if at dotoc@pp
\addappheadtotoc
@@ -4298,7 +4353,8 @@
\setcounter{section}{0}%
\setcounter{subsection}{0}%
\gdef\SUF at thesection{\@Alph\c at section}%
- \gdef\SUF at HEAD@thesection{\@Alph\c at section}}
+ \gdef\SUF at HEAD@thesection{\@Alph\c at section}%
+ \renewcommand{\thesection}{\@Alph\c at section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
@@ -4305,7 +4361,8 @@
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
\gdef\SUF at thechapter{\@Alph\c at chapter}%
- \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}}
+ \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}%
+ \renewcommand{\thechapter}{\@Alph\c at chapter}}
\fi
% \end{macrocode}
% \subsection*{Headings}
@@ -4754,6 +4811,10 @@
\hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi at toccompactsec
+\titlecontents*{section}[\SUF at tochang@chap]{}{%
+ \SUF at SEC@thecontentslabel\ \SUF at tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsec]
+\else
\titlecontents{section}
[\SUF at tochang@sec]
{}
@@ -4768,6 +4829,11 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
\SUF at tocSEC@font}
{}
+\fi
+\ifsuftesi at toccompactsubsec
+\titlecontents*{subsection}[\SUF at tochang@sec]{\suf at sscorrect}{%
+ \SUF at SUBSEC@thecontentslabel\ \SUF at tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF at tochang@subsec]
{}
@@ -4779,6 +4845,11 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
\SUF at tocSUBSEC@font}
{}
+\fi
+\ifsuftesi at toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF at tochang@subsec]{\suf at ssscorrect}{%
+ \SUF at SUBSUBSEC@thecontentslabel\ \SUF at tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF at tochang@subsubsec]
{}
@@ -4790,6 +4861,7 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
\SUF at tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF at tochang@par]
{}
@@ -4885,6 +4957,10 @@
\SUF at tocCHAP@font}
{\SUF at chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi at toccompactsec
+\titlecontents*{section}[\SUF at tocindent@chap]{}{%
+ \SUF at SEC@thecontentslabel\ \SUF at tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsec]
+\else
\titlecontents{section}
[\SUF at tocindent@sec]
{}
@@ -4898,6 +4974,11 @@
\SUF at tocSEC@font}
{\ifsuftesi at article\SUF at chaptitlerule%
\else\SUF at titlerule\fi\contentspage}
+\fi
+\ifsuftesi at toccompactsubsec
+\titlecontents*{subsection}[\SUF at tocindent@sec]{\suf at sscorrect}{%
+ \SUF at SUBSEC@thecontentslabel\ \SUF at tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF at tocindent@subsec]
{}
@@ -4907,6 +4988,11 @@
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
\SUF at tocSUBSEC@font}
{\SUF at titlerule\contentspage}
+\fi
+\ifsuftesi at toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF at tocindent@subsec]{\suf at ssscorrect}{%
+ \SUF at SUBSUBSEC@thecontentslabel\ \SUF at tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF at tocindent@subsubsec]
{}
@@ -4916,6 +5002,7 @@
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
\SUF at tocSUBSUBSEC@font}
{\SUF at titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF at tocindent@par]
{}
Modified: trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-02-11 22:10:31 UTC (rev 53758)
+++ trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-02-11 22:10:41 UTC (rev 53759)
@@ -19,8 +19,9 @@
%%
\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
* DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
@@ -76,6 +77,9 @@
\newif\ifsuftesi at twocolumnlot
\newif\ifsuftesi at reverseauthortitle
\newif\ifsuftesi at collection
+\newif\ifsuftesi at toccompactsec
+\newif\ifsuftesi at toccompactsubsec
+\newif\ifsuftesi at 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 at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
\DeclareRobustCommand{\SUF at sectionsize}{\large}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -136,6 +141,7 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
\DeclareRobustCommand{\SUF at sectionsize}{\large}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -151,6 +157,7 @@
marginparsep= 12pt}
\or
\suftesi at periodicaltrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -167,6 +174,7 @@
marginparsep= 10pt}
\or
\suftesi at compacttrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -183,6 +191,7 @@
marginparsep= 9pt}
\or
\suftesi at compactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -199,6 +208,7 @@
marginparsep= 9pt}
\or
\suftesi at supercompacttrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -215,6 +225,7 @@
marginparsep= 8pt}
\or
\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -231,6 +242,7 @@
marginparsep= 7pt}
\or
\suftesi at periodicalaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
\DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
@@ -703,18 +715,16 @@
\relax
\fi}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define at 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 at choicekey{}{marginpar}[\val\nr]
@@ -739,6 +749,30 @@
\or
\suftesi at pagelefttoctrue
\fi}
+\define at choicekey{}{compacttoc}[\val\nr]{%
+sec,subsec,subsubsec}[sec]{%
+\ifcase\nr\relax
+\suftesi at toccompactsectrue
+\suftesi at toccompactsubsectrue
+\suftesi at toccompactsubsubsectrue
+\def\suf at sscorrect{\hskip.5em}
+\def\suf at ssscorrect{\hskip.5em}
+ \def\suf at ctocdotsec{.}
+ \def\suf at ctocdotssec{}
+ \def\suf at ctocdotsssec{}
+\or
+\suftesi at toccompactsubsectrue
+\suftesi at toccompactsubsubsectrue
+\def\suf at sscorrect{\relax}
+\def\suf at ssscorrect{\hskip.5em}
+ \def\suf at ctocdotssec{.}
+ \def\suf at ctocdotsssec{}
+\or
+\suftesi at toccompactsubsubsectrue
+\def\suf at sscorrect{\relax}
+\def\suf at ssscorrect{\relax}
+ \def\suf at ctocdotsssec{.}
+\fi}
\define at choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -1476,7 +1510,7 @@
{\SUF at CHAP@StyleSwitch}
\fi
\ifsuftesi at numparchap
- \setlength{\SUF at ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF at ADJnumparchap}{-6ex}
\else
\setlength{\SUF at ADJnumparchap}{0pt}
\fi}
@@ -1530,7 +1564,7 @@
\SUF at default@CHAPTER
\SUF at default@SECTIONS
\ifsuftesi at periodical
- \titlespacing*{\chapter}{0em}{0\SUF at ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi at periodicalaureo
@@ -1588,13 +1622,13 @@
\fi
\ifsuftesi at numparpart
\titleformat{\part}[display]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{2ex}
{\SUF at PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{1em}
{\SUF at PART@StyleSwitch}
@@ -1602,13 +1636,13 @@
\else
\ifsuftesi at numparpart
\titleformat{\part}[display]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{2ex}
{\SUF at PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF at chaptersize\SUF at lr@PARTSwitch}
+ {\SUF at partsize\SUF at lr@PARTSwitch}
{\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
{1em}
{\SUF at PART@StyleSwitch}
@@ -2212,7 +2246,14 @@
\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 at pppage}{%
\clear at ppage
\thispagestyle{plain}%
@@ -2222,7 +2263,8 @@
{\centering
\interlinepenalty \@M
\normalfont
-\SUF at chaptersize\appendixpagename\par}%
+\SUF at chaptersize
+ \SUF at CHAP@StyleSwitch\expandafter\appendixpagename\par}%
\if at dotoc@pp
\addappheadtotoc
\fi
@@ -2245,7 +2287,8 @@
{\parindent \z@ \raggedright
\interlinepenalty \@M
\normalfont
-\SUF at chaptersize\appendixpagename%
+\SUF at chaptersize
+ \SUF at CHAP@StyleSwitch\expandafter\appendixpagename%
\markboth{}{}\par}%
\if at dotoc@pp
\addappheadtotoc
@@ -2259,7 +2302,8 @@
\setcounter{section}{0}%
\setcounter{subsection}{0}%
\gdef\SUF at thesection{\@Alph\c at section}%
- \gdef\SUF at HEAD@thesection{\@Alph\c at section}}
+ \gdef\SUF at HEAD@thesection{\@Alph\c at section}%
+ \renewcommand{\thesection}{\@Alph\c at section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
@@ -2266,7 +2310,8 @@
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
\gdef\SUF at thechapter{\@Alph\c at chapter}%
- \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}}
+ \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}%
+ \renewcommand{\thechapter}{\@Alph\c at chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version at string{#1}}
@@ -2622,6 +2667,10 @@
\hskip\SUF at addto@tochang at chap\SUF at tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi at toccompactsec
+\titlecontents*{section}[\SUF at tochang@chap]{}{%
+\SUF at SEC@thecontentslabel\ \SUF at tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsec]
+\else
\titlecontents{section}
[\SUF at tochang@sec]
{}
@@ -2633,6 +2682,11 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
\SUF at tocSEC@font}
{}
+\fi
+\ifsuftesi at toccompactsubsec
+\titlecontents*{subsection}[\SUF at tochang@sec]{\suf at sscorrect}{%
+\SUF at SUBSEC@thecontentslabel\ \SUF at tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF at tochang@subsec]
{}
@@ -2644,6 +2698,11 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
\SUF at tocSUBSEC@font}
{}
+\fi
+\ifsuftesi at toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF at tochang@subsec]{\suf at ssscorrect}{%
+\SUF at SUBSUBSEC@thecontentslabel\ \SUF at tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF at tochang@subsubsec]
{}
@@ -2655,6 +2714,7 @@
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
\SUF at tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF at tochang@par]
{}
@@ -2744,6 +2804,10 @@
\SUF at tocCHAP@font}
{\SUF at chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi at toccompactsec
+\titlecontents*{section}[\SUF at tocindent@chap]{}{%
+\SUF at SEC@thecontentslabel\ \SUF at tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsec]
+\else
\titlecontents{section}
[\SUF at tocindent@sec]
{}
@@ -2754,6 +2818,11 @@
\SUF at tocSEC@font}
{\ifsuftesi at article\SUF at chaptitlerule%
\else\SUF at titlerule\fi\contentspage}
+\fi
+\ifsuftesi at toccompactsubsec
+\titlecontents*{subsection}[\SUF at tocindent@sec]{\suf at sscorrect}{%
+\SUF at SUBSEC@thecontentslabel\ \SUF at tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF at tocindent@subsec]
{}
@@ -2763,6 +2832,11 @@
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
\SUF at tocSUBSEC@font}
{\SUF at titlerule\contentspage}
+\fi
+\ifsuftesi at toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF at tocindent@subsec]{\suf at ssscorrect}{%
+\SUF at SUBSUBSEC@thecontentslabel\ \SUF at tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf at ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF at tocindent@subsubsec]
{}
@@ -2772,6 +2846,7 @@
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
\SUF at tocSUBSUBSEC@font}
{\SUF at titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF at tocindent@par]
{}
More information about the tex-live-commits
mailing list.