texlive[53740] Master/texmf-dist: suftesi (9feb20)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 9 23:10:19 CET 2020
Revision: 53740
http://tug.org/svn/texlive?view=revision&revision=53740
Author: karl
Date: 2020-02-09 23:10:19 +0100 (Sun, 09 Feb 2020)
Log Message:
-----------
suftesi (9feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
===================================================================
--- trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip 2020-02-09 22:10:04 UTC (rev 53739)
+++ trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip 2020-02-09 22:10:19 UTC (rev 53740)
Property changes on: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2020-02-09 22:10:04 UTC (rev 53739)
+++ trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2020-02-09 22:10:19 UTC (rev 53740)
@@ -67,7 +67,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [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]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -175,7 +175,7 @@
%</driver>
% \fi
%
-% \CheckSum{4902}
+% \CheckSum{5108}
%
% \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,8 @@
% 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.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}}
% \changes{v2.9.1}{2018/11/09}{Added \sty{libertinust1math} package for Libertine font. Added \sty{luatex85} for Lua\TeX{} engine}
@@ -360,7 +362,7 @@
%\fontsize{9.5}{11.5}\selectfont
%\begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{7.6cm}}
%\toprule
-%&\textrm{Global}&{caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks},
+%&\textrm{Global}& appendix, {caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks},
%{fancyhdr}, {fixltxhyph}, {fontenc}, {geometry}, {iftex},
%{microtype}, {multicol}, {titlesec}, {titletoc}, {xkeyval}, (cclicenses)\\\midrule
%&\textrm{pdf\LaTeX{} only}&fontenc, substitutefont\\\midrule
@@ -652,6 +654,32 @@
%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}
+% 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}
+%\renewcommand{\appendixpagename}{Appendices}
+%\renewcommand{\appendixname}{Appendix}
+%\addappheadtotoc
+%
+%\begin{document}
+%...
+%\appendixpage
+%
+%\begin{appendices}
+%
+% \chapter{First appendix}
+% Lorem ipsum
+%
+% \chapter{First appendix}
+% Lorem ipsum
+%
+%\end{appendices}
+%\end{document}
+%\end{verbatim}
+%\end{latexcode}
+%
+%
% \section{Options}\label{sec:options}
%
% \subsection{Layout}\label{sec:page-styles}
@@ -797,7 +825,8 @@
% \item[dotroman] As \opt{roman} but followed by a dot.
% \item[dotRoman] As \opt{Roman} but followed by a dot.
% \end{valuelist}
-% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
+% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+% \opt{subsec}, \opt{subsubsec}.
% \end{optionlist}
%
%
@@ -1201,9 +1230,69 @@
% inside the text}
%\end{verbatim}
% \end{latexcode}
-%
% \end{ltxsyntax}
%
+% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
+% \subsection{Section titles}\label{sec:secfont}
+% \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section titles and numbers.}
+%
+% 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})
+%
+% 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}
+% \secfont{\sffamily\fontsize{15.5}{17.5}}
+%\end{verbatim}
+%\end{latexcode}
+%
+% \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}.
+%
+%\begin{latexcode}
+%\begin{verbatim}
+%\chapnumfont{%
+%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
+%\color{gray}\arabic{chapter}\hskip-15cm}
+%\end{verbatim}
+%\end{latexcode}
+% Combining these commands you can get something like this (or something worse/better):
+%\begin{latexcode}
+%\begin{verbatim}
+%\documentclass[pagelayout=periodicalaureo,11pt,
+%version=cscreen,chapstyle=parright]{suftesi}
+%
+%\chapfont{\bfseries\sffamily\scshape\LARGE}
+%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
+%
+%\chapnumfont{\hskip1cm\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%\chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}\hskip-1cm}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%
+%\begin{document}
+%
+%\chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
+%
+%\section{Dolor sit amet}
+%\lipsum[1-2]
+%
+%\section{Lorem ipsum dolor sit amet}
+%\subsection{Dolor sit amet}
+%\lipsum[1]
+%
+%\end{document}
+%\end{verbatim}
+%\end{latexcode}
+%\end{ltxsyntax}
+%
% \subsection{Miscellaneous}
%
% \begin{ltxsyntax}
@@ -1262,38 +1351,7 @@
%
%\end{ltxsyntax}
%
-% \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:
@@ -1398,6 +1456,21 @@
% \cmditem{collectioneditor}{The Editor(s)}
%
% Sets the editor(s) of the collection.
+%
+% \cmditem{titlefont}{definition}\hfill(default=\texttt{empty})
+%
+% \changes{v2.9.4}{2020/001/29}{New commands to change the font of the title of the articles and of the author's name in the collections}
+%
+% \cmditem{authorfont}{definition}\hfill(default=\texttt{empty})
+%
+% Changes the font of the title of the articles and of the author's name. For example:
+%
+%\begin{latexcode}
+%\begin{verbatim}
+% \titlefont{\bfseries\sffamily\scshape}
+% \authorfont{\itshape\sffamily}
+%\end{verbatim}
+%\end{latexcode}
%\end{ltxsyntax}
%
% \section{Known issues}
@@ -1714,13 +1787,16 @@
\define at choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
-\disable at keys{}{secnumstyle}
+%^^A\disable at keys{}{secnumstyle}
+\def\SUF at chapswitch{\thechapter.}
\or
\suftesi at articletrue
\@titlepagefalse
+\def\SUF at chapswitch{}
\or
\suftesi at collectiontrue
\setkeys{}{headerstyle=authortitleinner}
+\def\SUF at chapswitch{}
\fi}
\define at choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -2011,6 +2087,14 @@
% \end{macrocode}
% \subsection*{TOC font}
% \begin{macrocode}
+%^^A\define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+%^^A\ifcase\nr\relax
+%^^A\def\SUF at tocPART@font{\relax}
+%^^A\or
+%^^A\def\SUF at tocPART@font{\itshape}
+%^^A\or
+%^^A\def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
+%^^A\fi}
\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocCHAP@font{\relax}
@@ -2068,27 +2152,27 @@
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{}
+%^^A \def\SUF at PART@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thepart{\textsc{\roman{part}}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{\scshape\@roman}
+%^^A \def\SUF at PART@thecontentslabel{\@roman{\thecontentslabel}}
\or
\def\SUF at thepart{\Roman{part}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{\@Roman}
+%^^A \def\SUF at PART@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{}
+%^^A \def\SUF at PART@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thepart{\textsc{\roman{part}}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+%^^A \def\SUF at PART@thecontentslabel{\@roman{\thecontentslabel}}
\or
\def\SUF at thepart{\Roman{part}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{\@Roman}
+%^^A \def\SUF at PART@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection*{Chapter number style}
@@ -2099,32 +2183,32 @@
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{}
+ \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thechapter{\textsc{\roman{chapter}}}
\def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF at thechapter{\Roman{chapter}}
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thechapter{\textsc{\roman{chapter}}}
\def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF at thechapter{\Roman{chapter}}
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection*{Section number style}
@@ -2132,35 +2216,35 @@
\define at choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF at thesection{\arabic{section}}
+ \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{}
+ \def\SUF at SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesection{\textsc{\roman{section}}}
+ \def\SUF at thesection{\textsc{\SUF at chapswitch\roman{section}}}
\def\SUF at HEAD@thesection{\textsc{\roman{section}}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesection{\Roman{section}}
+ \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF at thesection{\arabic{section}}
+ \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesection{\textsc{\roman{section}}}
+ \def\SUF at thesection{\SUF at chapswitch\textsc{\roman{section}}}
\def\SUF at HEAD@thesection{\textsc{\roman{section}}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesection{\Roman{section}}
+ \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection*{Subsection number style}
@@ -2168,29 +2252,29 @@
\define at choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF at thesubsection{\arabic{subsection}}
+ \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
- \def\SUF at toclabelnum{}
+ \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesubsection{\textsc{\roman{subsection}}}
+ \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
\def\SUF at dotsubsec{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesubsection{\Roman{subsection}}
+ \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF at thesubsection{\arabic{subsection}}
+ \def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesubsection{\textsc{\roman{subsection}}}
+ \def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
\def\SUF at dotsubsec{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesubsection{\Roman{subsection}}
+ \def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection*{Sub-subsection number style}
@@ -2198,29 +2282,29 @@
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF at thesubsubsection{\arabic{subsubsection}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
- \def\SUF at toclabelnum{}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesubsubsection{\textsc{\roman{subsubsection}}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF at dotsubsubsec{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesubsubsection{\Roman{subsubsection}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF at thesubsubsection{\arabic{subsubsection}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesubsubsection{\textsc{\roman{subsubsection}}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF at dotsubsubsec{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesubsubsection{\Roman{subsubsection}}
+ \def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% This option controls the style of small capitals used in the
@@ -2247,6 +2331,23 @@
\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
+%
+\newcommand{\titlefont}[1]{\def\SUF at titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF at authorfont@Switch{#1}}
+%
+%^^A\newcommand{\tocpartfont}[1]{\def\SUF at tocPART@font{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF at tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF at tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF at tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF at tocSUBSUBSEC@font{#1}}
+
+%^^A\newcommand{\tocpartnumfont}[1]{\def\SUF at PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{\def\SUF at CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF at SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF at SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF at SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+
+%
% \end{macrocode}
% \subsection*{Headers}
%
@@ -2836,6 +2937,7 @@
% \subsection*{Execute and process options}
% \begin{macrocode}
\ExecuteOptionsX<>{
+ structure=book,
captionstyle=standard,
marginpar=true,
parindent=compact,
@@ -4111,49 +4213,99 @@
% \end{macrocode}
% \subsection*{Appendix}
% \begin{macrocode}
-\newcommand{\appendicesname}[1]{\def\SUF at appendices{#1}}
- \appendicesname{Appendici}
- \newcommand{\appendixpage}{\SUF at appendixpage}
-\def\SUF at appendixpage{%
- \@mainmattertrue
- \titlecontents{part}
- [0em]
- {\addvspace{3ex}}
- {}
- {}
- {}
- [\addvspace{1ex}]
-\let\contentspage\relax
- \cleardoublepage
- \thispagestyle{empty}
- \addcontentsline{toc}{part}{\SUF at appendices}
- \begingroup
- \centering
- \null\vfil
- {\LARGE\SUF at appendices\par}
- \vfil
- \endgroup
- \cleardoublepage
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname~}
- {\makebox[\SUF at label@part][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
+% \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\newcommand{\appendicesname}[1]{\def\SUF at appendices{#1}}
+%^^A \appendicesname{Appendici}
+%^^A \newcommand{\appendixpage}{\SUF at appendixpage}
+%^^A\def\SUF at appendixpage{%
+%^^A \@mainmattertrue
+%^^A \titlecontents{part}
+%^^A [0em]
+%^^A {\addvspace{3ex}}
+%^^A {}
+%^^A {}
+%^^A {}
+%^^A [\addvspace{1ex}]
+%^^A\let\contentspage\relax
+%^^A \cleardoublepage
+%^^A \thispagestyle{empty}
+%^^A \addcontentsline{toc}{part}{\SUF at appendices}
+%^^A \begingroup
+%^^A \centering
+%^^A \null\vfil
+%^^A {\LARGE\SUF at appendices\par}
+%^^A \vfil
+%^^A \endgroup
+%^^A \cleardoublepage
+%^^A\titlecontents{part}
+%^^A [0em]
+%^^A {\addvspace{3ex}\partname~}
+%^^A {\makebox[\SUF at label@part][l]{%
+%^^A \thecontentslabel}\hspace*{1em}}
+%^^A {}
+%^^A {}
+%^^A [\addvspace{1ex}]
+%^^A}
+\renewcommand{\@chap at pppage}{%
+ \clear at ppage
+ \thispagestyle{plain}%
+ \if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+ \null\vfil
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \SUF at chaptersize\appendixpagename\par}%
+ \if at dotoc@pp
+ \addappheadtotoc
+ \fi
+ \vfil\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi
}
+\renewcommand{\@sec at pppage}{%
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \SUF at chaptersize\appendixpagename%
+ \markboth{}{}\par}%
+ \if at dotoc@pp
+ \addappheadtotoc
+ \fi
+ \nobreak
+ \vskip 3ex
+ \@afterheading
+}
\ifsuftesi at article
\renewcommand\appendix{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\SUF at thesection{\@Alph\c at section}}
+ \gdef\SUF at thesection{\@Alph\c at section}%
+ \gdef\SUF at HEAD@thesection{\@Alph\c at section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
- \gdef\SUF at thechapter{\@Alph\c at chapter}}
+ \gdef\SUF at thechapter{\@Alph\c at chapter}%
+ \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}}
\fi
% \end{macrocode}
% \subsection*{Headings}
@@ -4523,7 +4675,7 @@
[0em]
{\addvspace{3ex}\partname\hspace*{.5em}}
{\makebox[\SUF at label@part][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}}
+ \thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -4595,7 +4747,7 @@
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF at addto@tochang at chap%
\makebox[\SUF at label@chap][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}%
+ \SUF at CHAP@thecontentslabel}\hspace*{1em}%
\SUF at tocCHAP@font}
{\hskip-\SUF at tochang@chap%
\makebox[1em][l]{\thecontentspage}%
@@ -4607,9 +4759,10 @@
{}
{\hskip-\SUF at tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
- \makebox[\SUF at label@sec][l]{%
- \ifsuftesi at article\SUF at toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+%^^A \makebox[\SUF at label@sec][l]{%
+%^^A \ifsuftesi at article\SUF at toclabelnum%
+%^^A \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSEC@font}
{\hskip-\SUF at tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
@@ -4620,7 +4773,7 @@
{}
{\hskip-\SUF at tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
- \makebox[\SUF at label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSEC@font}
{\hskip-\SUF at tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
@@ -4631,7 +4784,7 @@
{}
{\hskip-\SUF at tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
- \makebox[\SUF at label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSUBSEC@font}
{\hskip-\SUF at tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
@@ -4725,7 +4878,7 @@
[\SUF at tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF at tocindent@chap%
- \makebox[\SUF at label@chap][l]{\SUF at toclabelnum\thecontentslabel}%
+ \makebox[\SUF at label@chap][l]{\SUF at CHAP@thecontentslabel}%
\hspace*{1em}%
\SUF at tocCHAP@font}
{\hskip-\SUF at tocindent@chap%
@@ -4736,9 +4889,10 @@
[\SUF at tocindent@sec]
{}
{\hskip-\dimexpr(\SUF at label@sec+1em)%
- \makebox[\SUF at label@sec][l]{%
- \ifsuftesi at article\SUF at toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+%^^A \makebox[\SUF at label@sec][l]{%
+%^^A \ifsuftesi at article\SUF at toclabelnum%
+%^^A \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSEC@font}
{\hskip-\dimexpr(\SUF at label@sec+1em)%
\SUF at tocSEC@font}
@@ -4748,7 +4902,7 @@
[\SUF at tocindent@subsec]
{}
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
- \makebox[\SUF at label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSEC@font}
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
\SUF at tocSUBSEC@font}
@@ -4757,7 +4911,7 @@
[\SUF at tocindent@subsubsec]
{}
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
- \makebox[\SUF at label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSUBSEC@font}
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
\SUF at tocSUBSUBSEC@font}
Modified: trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-02-09 22:10:04 UTC (rev 53739)
+++ trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-02-09 22:10:19 UTC (rev 53740)
@@ -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 at choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
-\disable at keys{}{secnumstyle}
+\def\SUF at chapswitch{\thechapter.}
\or
\suftesi at articletrue
\@titlepagefalse
+\def\SUF at chapswitch{}
\or
\suftesi at collectiontrue
\setkeys{}{headerstyle=authortitleinner}
+\def\SUF at chapswitch{}
\fi}
\define at choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -434,27 +434,21 @@
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{}
\or
\def\SUF at thepart{\textsc{\roman{part}}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{\scshape\@roman}
\or
\def\SUF at thepart{\Roman{part}}
\def\SUF at dotpart{}
- \def\SUF at toclabelnum{\@Roman}
\or
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{}
\or
\def\SUF at thepart{\textsc{\roman{part}}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{\scshape\@roman}
\or
\def\SUF at thepart{\Roman{part}}
\def\SUF at dotpart{.}
- \def\SUF at toclabelnum{\@Roman}
\fi}
\define at choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
dotarabic,dotroman,dotRoman}[arabic]{%
@@ -462,119 +456,119 @@
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{}
+ \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thechapter{\textsc{\roman{chapter}}}
\def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF at thechapter{\Roman{chapter}}
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF at thechapter{\textsc{\roman{chapter}}}
\def\SUF at HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF at thechapter{\Roman{chapter}}
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF at thesection{\arabic{section}}
+ \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{}
+ \def\SUF at SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesection{\textsc{\roman{section}}}
+ \def\SUF at thesection{\textsc{\SUF at chapswitch\roman{section}}}
\def\SUF at HEAD@thesection{\textsc{\roman{section}}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesection{\Roman{section}}
+ \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF at thesection{\arabic{section}}
+ \def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{}
+ \def\SUF at SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF at thesection{\textsc{\roman{section}}}
+ \def\SUF at thesection{\SUF at chapswitch\textsc{\roman{section}}}
\def\SUF at HEAD@thesection{\textsc{\roman{section}}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{\scshape\@roman}
+ \def\SUF at SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF at thesection{\Roman{section}}
+ \def\SUF at thesection{\SUF at chapswitch\Roman{section}}
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{.}
- \def\SUF at toclabelnum{\@Roman}
+ \def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
-\def\SUF at thesubsection{\arabic{subsection}}
+\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
-\def\SUF at toclabelnum{}
+\def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
\or
-\def\SUF at thesubsection{\textsc{\roman{subsection}}}
+\def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
\def\SUF at dotsubsec{}
-\def\SUF at toclabelnum{\scshape\@roman}
+\def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
-\def\SUF at thesubsection{\Roman{subsection}}
+\def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{}
-\def\SUF at toclabelnum{\@Roman}
+\def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
-\def\SUF at thesubsection{\arabic{subsection}}
+\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{.}
-\def\SUF at toclabelnum{}
+\def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
\or
-\def\SUF at thesubsection{\textsc{\roman{subsection}}}
+\def\SUF at thesubsection{\SUF at thesection.\textsc{\roman{subsection}}}
\def\SUF at dotsubsec{.}
-\def\SUF at toclabelnum{\scshape\@roman}
+\def\SUF at SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
-\def\SUF at thesubsection{\Roman{subsection}}
+\def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{.}
-\def\SUF at toclabelnum{\@Roman}
+\def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
-\def\SUF at thesubsubsection{\arabic{subsubsection}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
-\def\SUF at toclabelnum{}
+\def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
\or
-\def\SUF at thesubsubsection{\textsc{\roman{subsubsection}}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF at dotsubsubsec{}
-\def\SUF at toclabelnum{\scshape\@roman}
+\def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
-\def\SUF at thesubsubsection{\Roman{subsubsection}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{}
-\def\SUF at toclabelnum{\@Roman}
+\def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
-\def\SUF at thesubsubsection{\arabic{subsubsection}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{.}
-\def\SUF at toclabelnum{}
+\def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
\or
-\def\SUF at thesubsubsection{\textsc{\roman{subsubsection}}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF at dotsubsubsec{.}
-\def\SUF at toclabelnum{\scshape\@roman}
+\def\SUF at SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
-\def\SUF at thesubsubsection{\Roman{subsubsection}}
+\def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{.}
-\def\SUF at toclabelnum{\@Roman}
+\def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{smallcapsstyle}[\val\nr]
{low,upper}[low]{%
@@ -594,6 +588,18 @@
\newcommand{\secnumfont}[1]{\def\SUF at thesection{#1}}
\newcommand{\subsecnumfont}[1]{\def\SUF at thesubsection{#1}}
\newcommand{\subsubsecnumfont}[1]{\def\SUF at thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF at titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF at authorfont@Switch{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF at tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF at tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF at tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF at tocSUBSUBSEC@font{#1}}
+
+\newcommand{\tocchapnumfont}[1]{\def\SUF at CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF at SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF at SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF at SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+
\define at choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
authortitlecenter}[inner]{%
@@ -1112,6 +1118,7 @@
\def\SUF at authorfont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
\ExecuteOptionsX<>{
+ structure=book,
captionstyle=standard,
marginpar=true,
parindent=compact,
@@ -2200,49 +2207,66 @@
\columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
-\newcommand{\appendicesname}[1]{\def\SUF at appendices{#1}}
- \appendicesname{Appendici}
- \newcommand{\appendixpage}{\SUF at appendixpage}
-\def\SUF at appendixpage{%
- \@mainmattertrue
- \titlecontents{part}
- [0em]
- {\addvspace{3ex}}
- {}
- {}
- {}
- [\addvspace{1ex}]
-\let\contentspage\relax
- \cleardoublepage
- \thispagestyle{empty}
- \addcontentsline{toc}{part}{\SUF at appendices}
- \begingroup
- \centering
- \null\vfil
- {\LARGE\SUF at appendices\par}
- \vfil
- \endgroup
- \cleardoublepage
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname~}
- {\makebox[\SUF at label@part][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
+\RequirePackage{appendix}
+\renewcommand{\appendixpagename}{Appendici}
+\renewcommand{\appendixtocname}{Appendici}
+\renewcommand{\appendixname}{Appendice}
+\noappendicestocpagenum
+\AtBeginEnvironment{appendices}{\appendix\mainmatter}
+\renewcommand{\@chap at pppage}{%
+\clear at ppage
+\thispagestyle{plain}%
+\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+\null\vfil
+\markboth{}{}%
+{\centering
+\interlinepenalty \@M
+\normalfont
+\SUF at chaptersize\appendixpagename\par}%
+\if at dotoc@pp
+\addappheadtotoc
+\fi
+\vfil\newpage
+\if at twoside
+\if at openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if at tempswa
+\twocolumn
+\fi
}
+\renewcommand{\@sec at pppage}{%
+\par
+\addvspace{4ex}%
+\@afterindentfalse
+{\parindent \z@ \raggedright
+\interlinepenalty \@M
+\normalfont
+\SUF at chaptersize\appendixpagename%
+\markboth{}{}\par}%
+\if at dotoc@pp
+\addappheadtotoc
+\fi
+\nobreak
+\vskip 3ex
+\@afterheading
+}
\ifsuftesi at article
\renewcommand\appendix{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\SUF at thesection{\@Alph\c at section}}
+ \gdef\SUF at thesection{\@Alph\c at section}%
+ \gdef\SUF at HEAD@thesection{\@Alph\c at section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
- \gdef\SUF at thechapter{\@Alph\c at chapter}}
+ \gdef\SUF at thechapter{\@Alph\c at chapter}%
+ \gdef\SUF at HEAD@thechapter{\@Alph\c at chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version at string{#1}}
@@ -2528,7 +2552,7 @@
[0em]
{\addvspace{3ex}\partname\hspace*{.5em}}
{\makebox[\SUF at label@part][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}}
+ \thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -2591,7 +2615,7 @@
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF at addto@tochang at chap%
\makebox[\SUF at label@chap][l]{%
- \SUF at toclabelnum\thecontentslabel}\hspace*{1em}%
+ \SUF at CHAP@thecontentslabel}\hspace*{1em}%
\SUF at tocCHAP@font}
{\hskip-\SUF at tochang@chap%
\makebox[1em][l]{\thecontentspage}%
@@ -2603,9 +2627,7 @@
{}
{\hskip-\SUF at tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
- \makebox[\SUF at label@sec][l]{%
- \ifsuftesi at article\SUF at toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSEC@font}
{\hskip-\SUF at tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at sec%
@@ -2616,7 +2638,7 @@
{}
{\hskip-\SUF at tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
- \makebox[\SUF at label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSEC@font}
{\hskip-\SUF at tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsec%
@@ -2627,7 +2649,7 @@
{}
{\hskip-\SUF at tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
- \makebox[\SUF at label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSUBSEC@font}
{\hskip-\SUF at tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF at addto@tochang at subsubsec%
@@ -2715,7 +2737,7 @@
[\SUF at tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF at tocindent@chap%
- \makebox[\SUF at label@chap][l]{\SUF at toclabelnum\thecontentslabel}%
+ \makebox[\SUF at label@chap][l]{\SUF at CHAP@thecontentslabel}%
\hspace*{1em}%
\SUF at tocCHAP@font}
{\hskip-\SUF at tocindent@chap%
@@ -2726,9 +2748,7 @@
[\SUF at tocindent@sec]
{}
{\hskip-\dimexpr(\SUF at label@sec+1em)%
- \makebox[\SUF at label@sec][l]{%
- \ifsuftesi at article\SUF at toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@sec][l]{\SUF at SEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSEC@font}
{\hskip-\dimexpr(\SUF at label@sec+1em)%
\SUF at tocSEC@font}
@@ -2738,7 +2758,7 @@
[\SUF at tocindent@subsec]
{}
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
- \makebox[\SUF at label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsec][l]{\SUF at SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSEC@font}
{\hskip-\dimexpr(\SUF at label@subsec+1em)%
\SUF at tocSUBSEC@font}
@@ -2747,7 +2767,7 @@
[\SUF at tocindent@subsubsec]
{}
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
- \makebox[\SUF at label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF at label@subsubsec][l]{\SUF at SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF at tocSUBSUBSEC@font}
{\hskip-\dimexpr(\SUF at label@subsubsec+1em)%
\SUF at tocSUBSUBSEC@font}
More information about the tex-live-commits
mailing list.