texlive[57196] Master/texmf-dist: suftesi (21dec20)
commits+karl at tug.org
commits+karl at tug.org
Mon Dec 21 23:19:32 CET 2020
Revision: 57196
http://tug.org/svn/texlive?view=revision&revision=57196
Author: karl
Date: 2020-12-21 23:19:32 +0100 (Mon, 21 Dec 2020)
Log Message:
-----------
suftesi (21dec20)
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-12-21 22:19:11 UTC (rev 57195)
+++ trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2020-12-21 22:19:32 UTC (rev 57196)
@@ -56,12 +56,13 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2020/06/26 v2.9.10 A class for typesetting theses, books and articles]
+ [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass[12pt]{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
+\usepackage[fontsize=12pt]{fontsize}
\usepackage[greek.ancient,english]{babel}
%--------------------------------------------------------
% GRAPHICS
@@ -120,10 +121,14 @@
% OTHER PACKAGES
% --------------------------------------------------------
\usepackage[autostyle]{csquotes}
-\usepackage[style=philosophy-classic,backend=biber]{biblatex}
+\usepackage[style=philosophy-classic]{biblatex}
\addbibresource{suftesi.bib}
\DeclareBibliographyCategory{pkgs-loaded}
-\addtocategory{pkgs-loaded}{appendix,caption,color,crop,enumitem,emptypage,fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,cochineal,mathpazo,bera,amsthm}
+\addtocategory{pkgs-loaded}{appendix,caption,color,crop,enumitem,emptypage,
+fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,
+iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,
+substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,
+cochineal,mathpazo,bera,amsthm}
\usepackage{array}
\usepackage{booktabs}
\usepackage{multirow}
@@ -144,23 +149,20 @@
\newenvironment{ttquote}{%
\begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
-% Correct (?) \optitem to use \meta inside #2
\makeatletter
-\renewcommand*{\ltd at ol@optitem}[3][]{%
+% Customizing option and value list:
+\renewcommand*{\ltd at ol@optitem}[3][]{%To use \meta inside #2
\ifblank{#1}
{\ltd at option{}{#2}{#3}{}}
{\ltd at option{}{#2}{#3}{\ltd at textverb{#1}}}}%
-\renewenvironment*{valuelist}[1][]
-{\list{}{%
- \ifblank{#1}
- {\setlength{\labelwidth}{5em}}
- {\setlength{\labelwidth}{#1}}%
- \setlength{\labelsep}{1em}%
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \setlength{\itemsep}{0pt}%
- \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
-{\endlist}
+\patchcmd{\optionlist}{\marglistwidth}{0pt}{}{}
+\patchcmd{\optionlist}{\hss}{\phantom{\rule{1pt}{20pt}}\hss}{}{}
+\patchcmd{\ltd at option@i}{\linewidth}{\linewidth-\marglistwidth}{}{}
+\pretocmd{\valuelist}{\let\optionlistfont\valuelistfont}{}{}
+\patchcmd{\ltxsyntax}{\marglistwidth}{0pt}{}{}
+\patchcmd{\ltd at option@i}{=}{\ = }{}{}
+\expandafter\patchcmd\csname\string\valuelist\endcsname{{\leftmargin}{\labelsep}}{{\leftmargin}{3\labelsep}}{}{}
+% New color for items
\newcommand*{\valuelistfont}{%
\color{olive}\sffamily\displayverbfont}
\renewcommand*{\optionlistfont}{%
@@ -190,7 +192,8 @@
\def\latintxt{Aliquam auctor, pede consequat
laoreet varius, eros tellus maris quam, pellentesque hendrerit.}
\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
- nibh est placerat.}
+ nihil est placerat pro cuius loquentis verba. Sed maleficium in quibusdam
+ aeternitaem manet.}
\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ
ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί
ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}
@@ -204,14 +207,18 @@
\usepackage{hyperref}
\hypersetup{%
hidelinks,
- pdftitle={User's Guide to \textsf{suftesi}},
- pdfsubject={A document class for typesetting theses,
- books and articles},
- pdfauthor={Ivan Valbusa},
- pdfkeywords={thesis, humanities, books}}
+ pdftitle={User's guide to \textsf{suftesi}},
+ pdfsubject={A document class for typesetting theses,
+ books and articles},
+ pdfauthor={Ivan Valbusa},
+ pdfkeywords={thesis, humanities, books}}
% --------------------------------------------------------
% FINAL SETTINGS
% --------------------------------------------------------
+\setcounter{tocdepth}{2}
+\widowpenalty=10000
+\clubpenalty=10000
+
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -223,7 +230,7 @@
%</driver>
% \fi
%
-% \CheckSum{5386}
+% \CheckSum{5398}
%
% \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
@@ -241,6 +248,7 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v2.9.11}{2020/12/21}{New page layouts: \opt{pocketa}, \opt{pocketb}, \opt{pocketc}. New commands \cmd{breakinbody}, \cmd{breakinbodyleft}, \cmd{breakintoc} (old names: \cmd{headbreak} and \cmd{xheadbreak}). Changed definitions of \cmd{appendixpagename}, \cmd{appendixtocname} and \cmd{appendixname} commands (default: english). The \cmd{part} command has been completely redefined. Updated documentation.}
% \changes{v2.9.10}{2020/06/26}{Corrected a bug using the \env{otherlanguage} environment with \opt{greekfont} option. Updated documentation.}
% \changes{v2.9.9}{2020/05/21}{Removed a bug with \cmd{appendix} and roman chapter numbers in table of contents. Updated documentation.}
% \changes{v2.9.8}{2020/02/24}{Removed license restrictions. Updated documentation.}
@@ -359,7 +367,7 @@
% \section*{Legalese}
% ^^A
% ^^A ----------------------------------------------------------------
-%
+%
% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
% \smallskip
%
@@ -385,7 +393,7 @@
%
% \begin{center}
% {\color{philA}\bfseries\sffamily
-% \Huge User's Guide to \texttt{suftesi}\\[3mm]}
+% \huge User's guide to \texttt{suftesi}\\[3mm]}
% {\large\bfseries\sffamily A document class for typesetting theses, books and articles}
% \vspace{.8cm}
%
@@ -417,9 +425,7 @@
% ^^A
% ^^A ----------------------------------------------------------------
%
-% \clearpage
%
-%
% ^^A ----------------------------------------------------------------
% ^^A
% \section*{A brief history}
@@ -427,13 +433,13 @@
% ^^A ----------------------------------------------------------------
%
% The \sty{suftesi} class was born as a result of the course \emph{Introduzione
- % a \hologo{LaTeX} per le scienze umane} (\emph{Introduction to \hologo{LaTeX} for the human
- % sciences}) which I held at the Graduate School of Human Sciences and Philosophy
-% (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e
-% \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June
-% 2010. Originally thought as a class to typeset theses, during these years
+% a \hologo{LaTeX} per le scienze umane} (\emph{Introduction to \hologo{LaTeX} for
+% the Human Sciences}) which I held at the Graduate School of Human Sciences and
+% Philosophy (\textcolor{sufred}{\textbf{S}}cienze \textcolor{sufred}{\textbf{U}}mane
+% e \textcolor{sufred}{\textbf{F}}ilosofia) of Verona University (Italy) in June
+% 2010. Originally thought as a class to typeset theses, through the years
% it has developed many new features and styles. Finally it has become the
-% referential class of the Joint Project \emph{Formal Style for PhD
+% referential class of the Joint Project \emph{Formal Style for PhD
% Theses with \hologo{LaTeX}} of the University of Verona.
%
% ^^A ----------------------------------------------------------------
@@ -443,7 +449,8 @@
% ^^A ----------------------------------------------------------------
%
% I would like to thank Professors Paola Di~Nicola,
-% Director of the Graduate School, and Ugo Savardi who suggested to propose
+% Director of the Graduate School of Human Sciences and
+% Philosophy, and Ugo Savardi who suggested to propose
% the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and
% Antonio Rinaldi, who installed \hologo{LaTeX} on the computers used during the course;
% Catia Cordioli, for her help in the organization of the lessons;
@@ -453,7 +460,7 @@
% for the \TeX pert support and his priceless ``magic formulas'', and Tommaso
% Gordini for his valuable advice in choosing and improving the class
% features during these years. I would finally thank all the participants
-% to the course who patiently resisted the four intensive lessons.
+% to the course who patiently endured the four intensive lessons.
% This work is dedicated to them.
%
% ^^A ----------------------------------------------------------------
@@ -474,9 +481,9 @@
% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper},
%\opt{legalpaper}, \opt{executivepaper} and \opt{landscape}), which are
% automatically disabled. The class loads the packages listed in
-% the following table.
+% table \ref{tab:pkgloaded}.
%
-% \begin{table}[h]
+% \begin{table}
% \centering
% \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
% \toprule
@@ -525,7 +532,7 @@
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsection{Document structure}
+% \subsection{Document structures}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -553,7 +560,48 @@
% useful as they show the output in its real size. See section
% \ref{sec:page-styles} for details.
%
-%\begin{table}[h]
+% You can define your own layouts through the \cmd{geometry} command
+% and you can change the value of \cmd{baselineskip} too. For example
+% you can resize the typeblock of the \texttt{supercompactaureo} layout
+% to fit particular needs, or simply because the font used requires
+% a smaller line width. Remember that if you change the line spacing with
+% the \cmd{linespread} command, you need to add \cmd{normalsize}. As you can see
+% in the following example, you can change many aspects of the layout,
+% using the parameters available for the \cmd{geometry} command. Here we have
+% modified also the margin ratio, the value of the upper margin and the
+% distance between the head and the beginning of the text. For the other parameters
+% sees the documentation of the \sty{geometry} package \parencite{geometry}.
+% \medskip
+%
+%\begin{minipage}{.4\textwidth}
+%\begin{latexcode}
+%\begin{verbatim}
+%\linespread{0.956}
+%\normalsize
+%\geometry{
+% ignoreall,
+% paperwidth = 140mm,
+% paperheight = 210mm,
+% textheight = 165mm,
+% textwidth = 100mm,
+% marginratio = 1:1,
+% top = 2.07cm,
+% headsep = 5.5mm,
+% heightrounded}
+%\end{verbatim}
+% \end{latexcode}
+%\end{minipage}
+%\hfill
+%\begin{minipage}{.555\textwidth}
+%\begin{tikzpicture}[scale=2.81]
+%\draw (0,0) rectangle (1.40cm,2.10cm);
+%\draw[xshift=2mm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+%\draw[xshift=1.6cm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+%\draw[xshift=1.40cm] (0,0) rectangle (1.40cm,2.10cm);
+%\end{tikzpicture}
+%\end{minipage}
+%
+%\begin{table}
%\centering
%\begin{tabular}{@{}lccccr@{\,$:$\,}lr@{\,$:$\,}lcr@{\,$:$\,}l@{}}
%\toprule
@@ -593,35 +641,14 @@
% \opt{periodical} & 110 & 165 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $1$ & $\sqrt{2}$ \\
% \opt{periodicalaureo} & 120 & 194 & 170 & 240 & $2$ & $3$ & $2$ & $3$ &
% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}} & $1$ & $\sqrt{2}$ \\
+% \opt{pocketa} & 102 & 153 & 135 & 208 & $2$ & $3$ & $1$ & $1$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{pocketb} & 99 & 165 & 140 & 210 & $2$ & $3$ & $1$ & $1$ & 3\,:\,5 & $2$ & $3$ \\
+% \opt{pocketc} & 90 & 150 & 116 & 193 & $2$ & $3$ & $1$ & $1$ & 3\,:\,5 & $3$ & $5$ \\
%\bottomrule\\[-2ex]
%\multicolumn{12}{r}{\footnotesize\textsuperscript{*}5\,:\,8\,$\approx$\,1\,:\,1,618}
%\end{tabular}\\[-3ex]
%\caption{The layouts of \sty{suftesi}}\label{tab:layouts}
%\end{table}
-%
-% You can define your own layouts through the \cmd{geometry} command
-% and you can change the value of \cmd{baselineskip} too. For example
-% you can resize the typeblock of the \texttt{supercompactaureo} layout
-% to fit your particular needs. In this case remember to declare
-% \cmd{normalsize} like in the following example:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\linespread{0.95}
-%\normalsize
-%\geometry{
-% textheight= 162mm,
-% textwidth= 100mm,
-% paperwidth= 140mm,
-% paperheight= 210mm,
-% hmarginratio= 2:3,
-% vmarginratio= 1:1,
-% marginparwidth= 11mm,
-% marginparsep= 7pt,
-% ignoreall,
-% heightrounded}
-%\end{verbatim}
-% \end{latexcode}%
% ^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
%
% ^^A\begin{figure}[h!]\centering
@@ -657,7 +684,7 @@
% (see section \ref{sec:options} for details).
%
% Today there are several Garamond-like fonts in \TeX~Live distribution.
-% See, for example Garamond Libre (OpenType only) and Cormorant Garamond.
+% See, for example Garamond Libre and Cormorant Garamond.
% The Bembo-like fonts Etbb and fbb should also be considered if you
% appreciate humanist fonts. In any case, before using a font, read the
% license carefully.
@@ -666,7 +693,7 @@
% bold weight and mathematical support, is made available by the
% \sty{garamondx} package by Michael Sharpe, which provides an extension
% of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the
-% package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}.
+% package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}).
% They are not distributed as part of \TeX~Live, but they may be downloaded
% using the \texttt{getnonfreefonts} script. See the instructions for
% installation at \url{http://tug.org/fonts/getnonfreefonts/}.
@@ -759,26 +786,26 @@
% \opt{defaultfont=none} option.
%
% \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]\vskip-\baselineskip
-% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{\mygrsize}
-% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{\mygrsize}
-% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{\mygrsize}
-% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{\mygrsize}
-% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{\mygrsize}
-% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{\mygrsize}
-% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{\mygrsize}
-% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{\mygrsize}
-% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{\mygrsize}
-% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{\mygrsize}
-% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{\mygrsize}
-% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{\mygrsize}
-% \greekexample{zplosf}{porson}{New PX/Porson}{\mygrsize}
-% \greekexample{zplosf}{lmr}{New PX/CB Greek}{\mygrpxsize}
-% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{\mygrsize}
+%\greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{12.15}
+%\greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{11.25}
+%\greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{11.8}
+%\greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{\mygrsize}
+%\greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{\mygrsize}
+%\greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{\mygrsize}
+%\greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{11.2}
+%\greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{11.7}
+%\greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{\mygrsize}
+%\greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{\mygrsize}
+%\greekexample{zplosf}{bodoni}{New PX/Bodoni}{11.8}
+%\greekexample{zplosf}{artemisia}{New PX/Artemisia}{12.5}
+%\greekexample{zplosf}{porson}{New PX/Porson}{12.9}
+%\greekexample{zplosf}{lmr}{New PX/CB Greek}{12.9}
+%\greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{\mygrsize}
% \end{mdframed}
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsection{The cover page}
+% \subsection{Cover page}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -798,18 +825,17 @@
%\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.
+% take a look at the \sty{bookcover} class by Tibor \textcite{bookcover}.
%
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsection{The frontispiece} \enlargethispage{\baselineskip}
+% \subsection{Frontispiece}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -818,7 +844,7 @@
%\centering
%\begin{tikzpicture}[scale=0.4]%
%\draw[draw=gray,fill=white,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
-%\draw[line width=.1mm,fill=black!70,text=white,draw=black!300] (-4.2,18.1) circle (13mm) node {\parbox{10mm}{\centering\tiny ---*---\\ St. Anford\\ University\\ ---*--- }};
+%\draw[line width=.1pt,draw=black] (-4.2,18.1) circle (13mm) node {\parbox{10mm}{\centering\tiny ---*---\\[-.5mm] St. Anford\\ University\\ ---*--- }};
% \node[scale=0.4,anchor=north west] at (-2.5cm,19cm) {%
% \parbox{8cm}{%
% \small University of St. Anford\par
@@ -846,7 +872,7 @@
%
% {\normalsize\sffamily Research supervisors:\par}
% \small J. H. Quick\par
-% B. L. User\vspace{4cm}
+% B. L. User\vspace{3.5cm}
%
% Thesis submitted in 2010
% }
@@ -870,7 +896,7 @@
% {\smallskip\normalsize How to survive in the modern societies\\}
%
% {\vspace*{2\baselineskip}\scriptsize edited by\\ Walker Texas Ranger\\}}};
-% \node[align=center] at (0,2) {\scriptsize \textcolor{black}{Punch Press}\\\textcolor{black}{\bfseries P\&P}};
+% \node[align=center] at (0,2) {\scriptsize \textcolor{black}{Punch Press}\\\textcolor{black}{\bfseries\small P\&P}};
%\end{tikzpicture}
%\caption{A cover page of \sty{suftesi}}\label{fig:cover}
%\end{minipage}
@@ -910,7 +936,7 @@
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsection{The appendices}
+% \subsection{Appendices}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -924,18 +950,16 @@
%\addappheadtotoc
%
%\begin{document}
-%...
+%...
%\appendixpage
%
%\begin{appendices}
-%
% \chapter{First appendix}
% Lorem ipsum
-%
% \chapter{First appendix}
% Lorem ipsum
+%\end{appendices}
%
-%\end{appendices}
%\end{document}
%\end{verbatim}
% \end{latexcode}
@@ -965,7 +989,7 @@
% \end{valuelist}
% \optitem[standard]{pagelayout}{\opt{standard}\OR\opt{standardaureo}%
% \OR\opt{periodical}\OR\opt{periodicalaureo}\OR\opt{compact}\OR
-% \opt{compactaureo}\OR\opt{supercompact}\OR\opt{supercompactaureo}}
+% \opt{compactaureo}\OR\opt{supercompact}\OR\opt{supercompactaureo}\OR\opt{pocketa}\OR\opt{pocketb}\OR\opt{pocketc}}
% \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
% \begin{valuelist}
% \item[standard] Prints an A4 page with a
@@ -993,6 +1017,17 @@
% The same as \opt{supercompact} but with
% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
% \end{valuelist}
+% \begin{valuelist}
+% \item[pocketa]
+% Prints a page of $\SI{135}{cm} \times \SI{208}{cm}$ with a typeblock of
+% $\SI{102}{cm} \times \SI{153}{cm}$.
+% \item[pocketb]
+% Prints a page of $\SI{140}{cm} \times \SI{210}{cm}$ with a typeblock of
+% $\SI{99}{cm} \times \SI{165}{cm}$.
+% \item[pocketc]
+% Prints a page of $\SI{116}{cm} \times \SI{193}{cm}$ with a typeblock of
+% $\SI{90}{cm} \times \SI{150}{cm}$.
+% \end{valuelist}
% The details of this option are shown in table \ref{tab:layouts}.
% \optitem[final]{version}{\opt{screen}\OR\opt{cscreen}\OR\opt{draft}
% \OR\opt{final}}
@@ -1026,16 +1061,15 @@
% \begin{optionlist}
% \optitem[10\OR 10pt]{fontsize}{\meta{dimen}}
% Sets the main font sizes for the document, changing the \cmd{baselineskip}
-% accordingly (possible values: 10\OR 11pt\OR 10.7\OR 1.2ex\dots). It is based on the \sty{fontsize} package \parencite{fontsize}.
-% Remember that using \hologo{XeLaTeX} or \hologo{LuaLaTeX} you can change the default
-% font size also with the option \opt{SizeFeatures} of \sty{fontspec}.
-% For example:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
-%\end{verbatim}
-% \end{latexcode}
+% accordingly. This option is based on the \sty{fontsize} package \parencite{fontsize}. The \meta{fontsize} can be given in any unit recognized
+% by TeX (for example: \opt{6mm}, \opt{1ex}, \opt{11.5pt}).
+% If the unit is not declared it defaults to \texttt{pt}.
+% If you want to set a specific value for \cmd{baselineskip}
+% you have to use the \cmd{changefontsize}\oarm{baselineskip}\arm{fontsize} command.
+% Lastly Remember that using \hologo{XeLaTeX} or \hologo{LuaLaTeX}
+% you can change the default font size also with the option
+% \opt{SizeFeatures} of \sty{fontspec}.
+% For example |\setmainfont[SizeFeatures={Size=11.5}]{EB Garamond}|.
%
% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
@@ -1056,9 +1090,7 @@
% \item[none] Does not load any Greek font. This is the default with
% \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
% \item[artemisia] Loads the Artemisia font by the Greek Font Society.
-% \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font (\sty{suftesi} <v.2.4) has been written by Enrico
-% Gregorio. Claudio Beccari successively added the code to improve the
-% scale factor when using this greek font in combination with Palatino.}
+% \item[porson] Loads the Porson font by the Greek Font Society.
% \item[bodoni] Loads the Bodoni font by the Greek Font Society.
% \item[cbgreek] Loads the standard CB~Greek font by Claudio Beccari.
% \end{valuelist}
@@ -1090,6 +1122,8 @@
% ^^A
% ^^A ----------------------------------------------------------------
%
+% In the following options \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+% \opt{subsec}, \opt{subsubsec}.
% \begin{optionlist}
% \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
% \opt{smallcaps}}
@@ -1099,8 +1133,6 @@
% \item[smallcaps] Prints the \meta{level} title
% in \textsc{\lsstyle spaced small caps}
% \end{valuelist}
-% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-% \opt{subsec}, \opt{subsubsec}.
% \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR
% \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR
% \opt{parright}}
@@ -1108,16 +1140,10 @@
% \item[left] Aligns the \meta{level} title on the left.
% \item[center] Centers the \meta{level} title.
% \item[right] Aligns the \meta{level} title on the right.
-% \end{valuelist}
-% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}
-% \opt{subsec}, \opt{subsubsec}.
-% \begin{valuelist}
% \item[parleft] As \opt{left} but with the title below the number.
% \item[parcenter] As \opt{center} but with the title below the number.
% \item[parright] As \opt{right} but with the title below the number.
% \end{valuelist}
-% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-% \opt{subsec}, \opt{subsubsec}.
% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR
% \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
% \opt{dotRoman}}
@@ -1129,8 +1155,6 @@
% \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},
-% \opt{subsec}, \opt{subsubsec}.
% \end{optionlist}
%
% ^^A ----------------------------------------------------------------
@@ -1164,12 +1188,12 @@
% \optitem[roman]{toc\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
% \opt{smallcaps}}
% \begin{valuelist}
-% \item[roman] Prints the \meta{level} TOC entry in roman.
-% \item[italic] Prints the \meta{level} TOC entry in \emph{italic}.
-% \item[smallcaps] Prints the \meta{level} TOC entry
+% \item[roman] Prints the \meta{level} ToC entry in roman.
+% \item[italic] Prints the \meta{level} ToC entry in \emph{italic}.
+% \item[smallcaps] Prints the \meta{level} ToC entry
% in \textsc{\lsstyle spaced small caps}
% \end{valuelist}
-% Where \meta{level} can be \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
+% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
% \optitem[all]{twocolcontents}{\opt{toc}\OR\opt{lof}\OR
% \opt{lot}\OR\opt{toclof}\OR\opt{toclot}\OR\opt{loflot}\OR\opt{all}}
% This option activates the \opt{tocstyle=ragged} option
@@ -1309,7 +1333,7 @@
% \end{valuelist}
% \optitem[false]{partpage}{\opt{true}\OR\opt{false}}
% \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
-% Active only with \opt{structure=article}.
+% Active only with \opt{structure=article}. With \opt{book} structure it is ineffective.
% \begin{valuelist}
% \item[true] Prints the part title in a separate page as in
% \opt{structure=book}
@@ -1361,7 +1385,7 @@
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsection{Composing and printing the cover page}
+% \subsection{Composing the cover page}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -1430,17 +1454,10 @@
% \end{latexcode}
%
% Then you can print the cover page with:
-%
% \begin{ttquote}
-% \cmd{makecover}\phantom{\oar{\meta{tikz options}}}
+% \cmd{makecover}
% \end{ttquote}
%
-% or
-%
-% \begin{ttquote}
-% \cmd{makecover}\oar{\meta{tikz options}}
-% \end{ttquote}
-%
% You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
%
% \begin{latexcode}
@@ -1562,22 +1579,26 @@
% ^^A ----------------------------------------------------------------
%
% \begin{ltxsyntax}
-% \cmditem{headbreak}
+% \cmditem{breakintoc}
%
% A manual break which is active for the table of contents but not in the text or in the headers.
%
% \begin{latexcode}
%\begin{verbatim}
-%\section{This title will be break here \headbreak{} inside the table of contents}
+%\section{This title will be break here \breakintoc inside the contents}
%\end{verbatim}
% \end{latexcode}
-% \cmditem{xheadbreak}
+% \cmditem{breakinbody}
+% \cmditem{breakinbodyleft}
%
-% A manual break which is active in the text but not in the headers and in the table of contents.
+% Manual breaks which are active in the body text but not in the headers
+% and in the table of contents. The difference between the two
+% commands is that the former executes |\\| while the latter uses \cmd{newline}. The second one should be used with the \opt{\meta{level}style=left} options to avoid bad line alignments.
%
% \begin{latexcode}
%\begin{verbatim}
-%\section{This title will be break here \xheadbreak{} inside the text}
+%\section{This title will be break here \breakinbody inside the body text}
+%\section{This title will be break here \breakinbodyleft inside the body text}
%\end{verbatim}
% \end{latexcode}
% \end{ltxsyntax}
@@ -1595,29 +1616,31 @@
% 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*{\meta{level}font}{definition}\hfill default:\texttt{empty}
+% \cmditem*{\meta{level}font}{definition}
+% \cmditem*{toc\meta{level}font}{definition}
%
-% 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:
+% Changes the font of the \meta{level} title, where \meta{level} can be \opt{part},
+% \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
+% The second command changes the ToC entry.
%
+% \cmditem*{\meta{level}numfont}{definition}
+% \cmditem*{toc\meta{level}numfont}{definition}
+%
+% Changes the font of the \meta{level} number, where \meta{level} can be \opt{part},
+% \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
+% The second command changes the ToC entry.
+%
+% For example, if you used the \opt{chapfont=smallcaps} option, you can change the size of the chapter title accordingly with:
% \begin{latexcode}
%\begin{verbatim}
%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
%\end{verbatim}
% \end{latexcode}
-% \cmditem*{\meta{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:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\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,
+%\documentclass[pagelayout=periodical\partnameaureo,11pt,
%version=cscreen,chapstyle=parright]{suftesi}
%
%\usepackage{xcolor,lipsum}
@@ -1659,10 +1682,6 @@
% symbols given in the optional argument (default:\texttt{*}).
% It does not increment the footnote counter.
%
-% \begin{ttquote}
-% \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
-% \end{ttquote}
-%
% \cmditem{title}[short title for headers]{complete title for titlepage}
% \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command}
%
@@ -1675,13 +1694,7 @@
% \cmditem{toclabelwidth}{level}{dim}
% \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
%
-% Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\toclabelwidth{chap}{1em}
-%\end{verbatim}
-% \end{latexcode}
+% Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with |\toclabelwidth{chap}{1em}|.
% \end{ltxsyntax}
%
% \begin{ltxsyntax}
@@ -1697,21 +1710,33 @@
%
% \cmditem{appendixpage}
%
-% 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):
+% Prints a page with the title provided by \cmd{appendixpagename} (default:\texttt{Appendices}) at the center according to the \opt{partfont} option.
+% To redefine the \cmd{appendixpagename} command see the \sty{appendix} package documentation.
+%
+% \cmditem*{tocpartname}{definition}\hfill default:\cmd{partname}
+%
+% Changes the definition of ``Part'' name in ToC. For example:
% \begin{latexcode}
%\begin{verbatim}
-%\renewcommand{\appendixpagename}{Appendices}
+%\tocpartname{\begingroup\sffamily\Huge Part\endgroup}
%\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.
-%
+% \end{latexcode}
+% To change the definition of \cmd{partname} you have to use the commands provided
+% by the \sty{babel} package. For example, if the document is in Italian you will
+% need something like this:
+% \begin{latexcode}
+%\begin{verbatim}
+%\addto{\captionsitalian}{%
+% \renewcommand{\partname}{\begingroup\sffamily\Huge Parte\endgroup}
+%\end{verbatim}
+% \end{latexcode}
+% Note that in both cases the definition must be enclosed in a group
+% to prevent it from changing what follows (i.e. the part number and the part title).
% \end{ltxsyntax}
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \section{Collections}\label{sec:collection}
+% \section{The \opt{collection} structure}\label{sec:collection}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -1756,6 +1781,7 @@
% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as \emph{Table of Contents}, \emph{Index}, \emph{Bibliography}, etc.
%
% \begin{optionlist}
+%\addtolength{\linewidth}{-2em}
% \optitem[left]{papertitlestyle}{\opt{left}\OR\opt{center}\OR\opt{right}}
% \begin{valuelist}
% \item[left] Aligns the author-title block on the left.
@@ -1791,16 +1817,16 @@
% \end{valuelist}
% \optitem[italic]{toctitlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
-% \item[roman] Prints the title TOC entry in roman.
-% \item[italic] Prints the title TOC entry in \emph{italic}.
-% \item[smallcaps] Prints the title TOC entry
+% \item[roman] Prints the title ToC entry in roman.
+% \item[italic] Prints the title ToC entry in \emph{italic}.
+% \item[smallcaps] Prints the title ToC entry
% in \textsc{\lsstyle spaced small caps}.
% \end{valuelist}
% \optitem[roman]{tocauthorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
-% \item[roman] Prints the author’s name TOC entry in roman.
-% \item[italic] Prints the author’s name TOC entry in \emph{italic}.
-% \item[smallcaps] Prints the author’s name TOC entry
+% \item[roman] Prints the author’s name ToC entry in roman.
+% \item[italic] Prints the author’s name ToC entry in \emph{italic}.
+% \item[smallcaps] Prints the author’s name ToC entry
% in \textsc{\lsstyle spaced small caps}.
% \end{valuelist}
% \end{optionlist}
@@ -1827,11 +1853,11 @@
%
% Sets the editor(s) of the collection.
%
-% \cmditem{titlefont}{definition}\hfill default:\texttt{empty}
+% \cmditem{titlefont}{definition}
%
% \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}
+% \cmditem{authorfont}{definition}
%
% Changes the font of the title of the articles and of the author's name. For example:
%
@@ -1845,31 +1871,31 @@
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \section{Known issues}
+% ^^A \section{Known issues}
% ^^A
% ^^A ----------------------------------------------------------------
+% ^^A
+% ^^A A problem occurs with the \opt{article} document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
+% ^^A \begin{latexcode}
+% ^^A \begin{verbatim}
+% ^^A \markboth{Section title}{Section title}
+% ^^A \part{The title of the part}
+% ^^A
+% ^^A \section{Section title}
+% ^^A \end{verbatim}
+% ^^A \end{latexcode}
+% ^^A If the title of the part is at the beginning of the page you will need the \sty{afterpage} package \parencite{afterpage} and the \cmd{afterpage} command:
+% ^^A \begin{latexcode}
+% ^^A \begin{verbatim}
+% ^^A \afterpage{
+% ^^A \markboth{Section title}{Section title}
+% ^^A \part{The title of the part}
+% ^^A }
+% ^^A
+% ^^A \section{Section title}
+% ^^A \end{verbatim}
+% ^^A \end{latexcode}
%
-% A problem occurs with the article document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
-% \begin{latexcode}
-%\begin{verbatim}
-%\markboth{Section title}{Section title}
-%\part{The title of the part}
-%
-%\section{Section title}
-%\end{verbatim}
-% \end{latexcode}
-% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterpage} command:
-% \begin{latexcode}
-%\begin{verbatim}
-%\afterpage{
-% \markboth{Section title}{Section title}
-% \part{The title of the part}
-% }
-%
-% \section{Section title}
-%\end{verbatim}
-% \end{latexcode}
-%
% ^^A ----------------------------------------------------------------
% ^^A
% \section{Backward compatibility}
@@ -1877,48 +1903,29 @@
% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
+%\addtolength{\linewidth}{-2em}
+% \optitem[book]{documentstructure}{\opt{book}\OR\opt{article}
+% \OR\opt{collection}}
+% An alias for \opt{structure}
+%\end{optionlist}
+%\begin{optionlist}
+%\addtolength{\linewidth}{-2em}
% \optitem{defaultfont}{\opt{compatibility}}
% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (GFS Artemisia) add the \opt{greekfont=artemisia} option.
-% \optitem[book]{documentstructure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
-% An alias for \opt{structure}
% \optitem[true]{crop}{\opt{true}\OR\opt{false}}
-% \begin{valuelist}
-% \item[true] An alias for \opt{version=draft} option.
-% \item[false] An alias for \opt{version=center} option.
-% \end{valuelist}
+% An alias for the old options \opt{version=draft} and \opt{version=center} respectively.
% \optitem{parindent}{\opt{1em}, \opt{1.5em}}
-% An alias fo \opt{parindent=compact} and \opt{parindent=wide} respectively.
+% An alias for the old options \opt{parindent=compact} and \opt{parindent=wide} respectively.
% \optitem{style}{\opt{FSPLa}\OR\opt{FSPLb}\OR\opt{FSPLc}}
% These styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with \hologo{LaTeX}} of the Verona University (Italy).
-% \end{optionlist}
+%\end{optionlist}
%
% \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
-% \noindent The \cmd{FSPLcolophon}\ar{\meta{Name Surname}} command is provided to typeset the colophon according to these styles:
-% \medskip
-%
-% \noindent\rule{\textwidth}{.4pt}
-%
-% \noindent\textcircled{\raisebox{1pt}{\scalebox{.7}{cc}}} \the\year{} \meta{Name Surname}%
-% \vskip1ex
-%
-%
-% \small\noindent This work is licensed under the Creative Commons
-% Attribution-NonCommercial-NoDerivs 3.0 Unported License.
-%
-% \noindent To view a copy of this license,
-% visit http://creativecommons.org/licenses/by-nc-nd/3.0/.
-%
-% \footnotesize
-%
-% \bigskip
-%
-% \noindent Typeset with \hologo{LaTeX} in collaboration with the Joint Project
-% \emph{Formal Style for PhD Theses with \hologo{LaTeX}} (University of Verona,
-% Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
-% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M.~ Nowacki.
-%
-% \noindent\rule{\textwidth}{.4pt}
-% \changes{v0.9a}{2012/08/31}{New option, \opt{defaultparindent},
+% \begin{ltxsyntax}
+% \cmditem{FSPLcolophon}{Name Surname}
+% \end{ltxsyntax}
+% A command is provided to typeset the colophon according to the \opt{FSPL} styles.
+% \changes{v0.9a}{2012/08/31}{New options, \opt{defaultparindent},
% \opt{ralignquotation}, \opt{smallquotation}, \opt{dottedfootnote}, \opt{indentlist},
% \opt{alignlist}, \opt{centerpart}, \opt{centerchap}, \opt{centersec}, \opt{rightpart},
% \opt{rightchap}, \opt{rightsec}, \opt{numparpart}, \opt{numparchap}, \opt{numparsec},
@@ -1933,23 +1940,21 @@
% \changes{v0.5}{2011/10/21}{New option \opt{elements}, \opt{nomarginpar}, \opt{nocrop},
% \opt{sufelements}, \opt{compact}, \opt{supercompact}}
%
+% \StopEventually{
% \defbibnote{note}{\sffamily This bibliography has been typeset with
% the \sty{biblatex-philosophy} package, created by the same author of this class.}
+% \printbibliography[heading=bibintoc,prenote=note]
+% \PrintChanges\PrintIndex}
%
-% \addcontentsline{toc}{section}{\refname}
-% \printbibliography[prenote=note]
-%
-% \StopEventually{\PrintChanges\PrintIndex}
-%
+% \iffalse
+%<*class>
+% \fi
% ^^A ----------------------------------------------------------------
% ^^A
-% \section*{The Code}
+% \section{The Code}
% ^^A
% ^^A ----------------------------------------------------------------
-% \addcontentsline{toc}{section}{The Code}
-% \iffalse
-%<*class>
-% \fi
+%
% \begin{macrocode}
\RequirePackage{xkeyval}
\newif\ifsuftesi at compatibility
@@ -2001,7 +2006,7 @@
\newif\ifsuftesi at toccompactsubsec
\newif\ifsuftesi at toccompactsubsubsec
% \end{macrocode}
-% The \sty{suftesi} class is based on the standard \sty{book} class but the following options are disabled as they contrast with the layouts provided by the class. Specifically, the first five options are actually ineffective, while the \opt{landscape} option rotates the page correctly, but sets the text width according to the class options, effectively making it unusable.
+% The class is based on the standard \sty{book} class but the following options are disabled as they contrast with the layouts provided by the class. Specifically, the first five options are actually ineffective, while the \opt{landscape} option rotates the page correctly, but sets the text width according to the class options, effectively making it unusable.
% \begin{macrocode}
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
@@ -2027,21 +2032,22 @@
\ExecuteOptionsX{parindent=\baselineskip}
\ProcessOptionsX*\relax
% \end{macrocode}
-% \subsection*{Document structure}
+% \subsection{Options definition}
+% \subsubsection{Structure}
% \begin{macrocode}
\define at choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
% \disable at keys{}{secnumstyle}
-\def\SUF at chapswitch{\thechapter.}
+ \def\SUF at chapswitch{\thechapter.}
\or
-\suftesi at articletrue
-\@titlepagefalse
-\def\SUF at chapswitch{}
+ \suftesi at articletrue
+ \@titlepagefalse
+ \def\SUF at chapswitch{}
\or
-\suftesi at collectiontrue
- \setkeys{}{headerstyle=authortitleinner}
-\def\SUF at chapswitch{}
+ \suftesi at collectiontrue
+ \setkeys{}{headerstyle=authortitleinner}
+ \def\SUF at chapswitch{}
\fi}
\define at choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -2056,12 +2062,57 @@
\setkeys{}{structure=collection}
\fi}
% \end{macrocode}
-% \subsection*{Page layout}
+% \subsubsection{Fonts}
+% \paragraph{Roman fonts}
% \begin{macrocode}
+\define at choicekey{}{defaultfont}[\val\nr]{%
+none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\ifcase\nr\relax
+ \suftesi at nofonttrue
+\or
+ \suftesi at cochinealtrue
+\or
+ \suftesi at libertinetrue
+\or
+ \suftesi at palatinotrue
+\or
+ \suftesi at standardtrue
+\or
+ \suftesi at compatibilitytrue
+\fi}
+\define at choicekey{}{mathfont}[\val\nr]{%
+none,minimal,extended}[minimal]{%
+\ifcase\nr\relax
+ \suftesi at mathminimalfalse
+ \suftesi at mathextendedfalse
+\or
+ \suftesi at mathminimaltrue
+\or
+ \suftesi at mathextendedtrue
+\fi}
+% \end{macrocode}
+% \paragraph{Greek fonts}
+% \begin{macrocode}
+\define at choicekey{}{greekfont}[\val\nr]{%
+none,artemisia,porson,bodoni,cbgreek}[none]{%
+\ifcase\nr\relax
+\suftesi at greekfontfalse
+\or
+ \suftesi at greekfonttrue\suftesi at artemisiatrue
+\or
+ \suftesi at greekfonttrue\suftesi at porsontrue
+\or
+ \suftesi at greekfonttrue\suftesi at bodonitrue
+\or
+ \suftesi at greekfonttrue\suftesi at cbgreektrue
+\fi}
+% \end{macrocode}
+% \subsubsection{Layouts}
+% \begin{macrocode}
\RequirePackage{geometry}
\define at choicekey{}{pagelayout}[\val\nr]
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
- supercompactaureo,periodicalaureo}[standard]{%
+ supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
@@ -2194,213 +2245,195 @@
marginratio= 2:3,
marginparwidth= 62pt,
marginparsep= 10pt}
-\or
+\or% pocketa
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 153mm,
+ textwidth= 102mm,
+ paperwidth= 135mm,
+ paperheight= 208mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 12mm,
+ marginparsep= 7pt}
+\or% pocketb
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 165mm,
+ textwidth= 99mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 15mm,
+ marginparsep= 7pt}
+\or% pocketc
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 150mm,
+ textwidth= 90mm,
+ paperwidth= 116mm,
+ paperheight= 193mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 8mm,
+ marginparsep= 7pt}
\fi}
% \end{macrocode}
-% \subsection*{Sections style}
+% \subsubsection{Sections style}
% \begin{macrocode}
\define at choicekey{}{partstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@PARTSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@PARTSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@PARTSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numpar
\def\SUF at lr@PARTSwitch{\filright}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@PARTSwitch{\filcenter}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@PARTSwitch{\filleft}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{chapstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@CHAPSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@CHAPSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@CHAPSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numparchap
\def\SUF at lr@CHAPSwitch{\filright}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@CHAPSwitch{\filcenter}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@CHAPSwitch{\filleft}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{secstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numparsec
\def\SUF at lr@SECSwitch{\filright}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SECSwitch{\filcenter}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SECSwitch{\filleft}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SUBSECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SUBSECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSUBSECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SUBSUBSECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SUBSUBSECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
% \end{macrocode}
-% \subsection*{Sections font}
+% \subsubsection{Sections font}
% \begin{macrocode}
\define at choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at PART@StyleSwitch{\relax}
+ \def\SUF at PART@StyleSwitch{\relax}
\or
-\def\SUF at PART@StyleSwitch{\itshape}
+ \def\SUF at PART@StyleSwitch{\itshape}
\or
-\def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at CHAP@StyleSwitch{\relax}
+ \def\SUF at CHAP@StyleSwitch{\relax}
\or
-\def\SUF at CHAP@StyleSwitch{\itshape}
+ \def\SUF at CHAP@StyleSwitch{\itshape}
\or
-\def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
-\def\SUF at SEC@StyleSwitch{\relax}
+ \def\SUF at SEC@StyleSwitch{\relax}
\or
-\def\SUF at SEC@StyleSwitch{\itshape}
+ \def\SUF at SEC@StyleSwitch{\itshape}
\or
-\def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at SUBSEC@StyleSwitch{\relax}
+ \def\SUF at SUBSEC@StyleSwitch{\relax}
\or
-\def\SUF at SUBSEC@StyleSwitch{\itshape}
+ \def\SUF at SUBSEC@StyleSwitch{\itshape}
\or
-\def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at SUBSUBSEC@StyleSwitch{\relax}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\relax}
\or
-\def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
\or
-\def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
% \end{macrocode}
-% \subsection*{TOC font}
+% \paragraph{Small capitals style}
% \begin{macrocode}
-% \define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-% \ifcase\nr\relax
-% \def\SUF at tocPART@font{\relax}
-% \or
-% \def\SUF at tocPART@font{\itshape}
-% \or
-% \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
-% \fi}
-\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{smallcapsstyle}[\val\nr]
+{low,upper}[low]{%
\ifcase\nr\relax
-\def\SUF at tocCHAP@font{\relax}
+ \def\suftesi at MakeTextLowercase{\MakeLowercase}
+ \def\suftesi at MakeTextTOCLowercase{\lowercase}
\or
-\def\SUF at tocCHAP@font{\itshape}
-\or
-\def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
+ \def\suftesi at MakeTextLowercase{\relax}
+ \def\suftesi at MakeTextTOCLowercase{\relax}
\fi}
-\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
-\def\SUF at tocSEC@font{\relax}
-\or
-\def\SUF at tocSEC@font{\itshape}
-\or
-\def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocSUBSEC@font{\relax}
-\or
-\def\SUF at tocSUBSEC@font{\itshape}
-\or
-\def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocSUBSUBSEC@font{\relax}
-\or
-\def\SUF at tocSUBSUBSEC@font{\itshape}
-\or
-\def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocAUT@font{\relax}
-\or
-\def\SUF at tocAUT@font{\itshape}
-\or
-\def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
-\def\SUF at tocTIT@font{\relax}
-\or
-\def\SUF at tocTIT@font{\itshape}
-\or
-\def\SUF at tocTIT@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
% \end{macrocode}
-% \subsection*{Sections number style}
-% \subsubsection*{Part number style}
+% \subsubsection{Sections number}
+% \paragraph{Part number style}
% \begin{macrocode}
\define at choicekey{}{partnumstyle}[\val\nr]
- {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
@@ -2421,11 +2454,11 @@
\def\SUF at dotpart{.}
\fi}
% \end{macrocode}
-% \subsubsection*{Chapter number style}
+% \paragraph{Chapter number style}
% \begin{macrocode}
\define at choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
- dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{}
@@ -2455,13 +2488,13 @@
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{.}
\def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
% \end{macrocode}
-% \subsubsection*{Section number style}
+% \paragraph{Section number style}
% \begin{macrocode}
\define at choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{}
@@ -2491,13 +2524,13 @@
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{.}
\def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
% \end{macrocode}
-% \subsubsection*{Subsection number style}
+% \paragraph{Subsection number style}
% \begin{macrocode}
\define at choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
\def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
@@ -2521,13 +2554,13 @@
\def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{.}
\def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
% \end{macrocode}
-% \subsubsection*{Sub-subsection number style}
+% \paragraph{Sub-subsection number style}
% \begin{macrocode}
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
\def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
@@ -2551,52 +2584,143 @@
\def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{.}
\def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
% \end{macrocode}
-% \subsubsection*{Small capitals style}
+% \subsubsection{Table of contents}
+% \paragraph{Table of contents style}
% \begin{macrocode}
-\define at choicekey{}{smallcapsstyle}[\val\nr]
- {low,upper}[low]{%
+\define at choicekey{}{tocstyle}[\val\nr]{%
+standard,dotted,ragged,leftpage}[standard]{%
\ifcase\nr\relax
- \def\suftesi at MakeTextLowercase{\MakeLowercase}
- \def\suftesi at MakeTextTOCLowercase{\lowercase}
+ \def\SUF at titlerule{\titlerule*{}}
+ \def\SUF at chaptitlerule{\titlerule*{}}
\or
- \def\suftesi at MakeTextLowercase{\relax}
- \def\suftesi at MakeTextTOCLowercase{\relax}
+\suftesi at dottedtoctrue
+ \def\SUF at titlerule{\titlerule*{\footnotesize .\ }}
+ \def\SUF at chaptitlerule{\titlerule*{}}
+\or
+\suftesi at raggedtoctrue
+ \def\SUF at titlerule{\hspace{1em}}
+ \def\SUF at chaptitlerule{\hspace{1em}}
+\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
+ \suftesi at twocolumntoctrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnloftrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnloftrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\fi
+}
% \end{macrocode}
-% \subsubsection*{Fine adjustment of sections font}
+% \paragraph{Table of contents font}
% \begin{macrocode}
-\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
-\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{\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}}
-\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}}
+\define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocPART@font{\relax}
+\or
+ \def\SUF at tocPART@font{\itshape}
+\or
+ \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocCHAP@font{\relax}
+\or
+ \def\SUF at tocCHAP@font{\itshape}
+\or
+ \def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+ \def\SUF at tocSEC@font{\relax}
+\or
+ \def\SUF at tocSEC@font{\itshape}
+\or
+ \def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocSUBSEC@font{\relax}
+\or
+ \def\SUF at tocSUBSEC@font{\itshape}
+\or
+ \def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocSUBSUBSEC@font{\relax}
+\or
+ \def\SUF at tocSUBSUBSEC@font{\itshape}
+\or
+ \def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocAUT@font{\relax}
+\or
+ \def\SUF at tocAUT@font{\itshape}
+\or
+ \def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+ \def\SUF at tocTIT@font{\relax}
+\or
+ \def\SUF at tocTIT@font{\itshape}
+\or
+ \def\SUF at tocTIT@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
% \end{macrocode}
-% \subsection*{Headers}
-% \subsubsection*{Header style}
+% \subsubsection{Headers}
+% \paragraph{Header style}
% \begin{macrocode}
\define at choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
@@ -2621,7 +2745,7 @@
\suftesi at centerheadertrue
\fi}
% \end{macrocode}
-% \subsubsection*{Header font}
+% \paragraph{Header font}
% \begin{macrocode}
\define at choicekey{}{headerfont}[\val\nr]
{roman,italic,smallcaps}[roman]{%
@@ -2639,8 +2763,8 @@
\def\SUF at thepage{\SUF at headingsmallcaps{\thepage}}
\fi}
% \end{macrocode}
-% \subsection*{Text elements}
-% \subsubsection*{Lists}
+% \subsubsection{Text elements}
+% \paragraph{Lists}
% \begin{macrocode}
\RequirePackage[inline]{enumitem}
\renewcommand\labelitemi{\color{sufgray}\textbullet}
@@ -2649,46 +2773,45 @@
\define at choicekey{}{liststyle}[\val\nr]
{bulged,aligned,indented}[bulged]{%
\ifcase\nr\relax
- \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=0pt}
- \setlist[itemize,2]{leftmargin=1.3\parindent}
- \setlist[itemize,3]{leftmargin=1.3\parindent}
+ \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=0pt} \setlist[itemize,2]{leftmargin=1.3\parindent}
+ \setlist[itemize,3]{leftmargin=1.3\parindent}
\or
- \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=1\parindent}
- \setlist[itemize,2]{leftmargin=1.5\parindent}
- \setlist[itemize,3]{leftmargin=1.5\parindent}
+ \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=1\parindent}
+ \setlist[itemize,2]{leftmargin=1.5\parindent}
+ \setlist[itemize,3]{leftmargin=1.5\parindent}
\or
- \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=2\parindent}
- \setlist[itemize,2]{leftmargin=2.5\parindent}
- \setlist[itemize,3]{leftmargin=2.5\parindent}
+ \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=2\parindent}
+ \setlist[itemize,2]{leftmargin=2.5\parindent}
+ \setlist[itemize,3]{leftmargin=2.5\parindent}
\fi}
% \end{macrocode}
-% \subsubsection*{Quotations}
+% \paragraph{Quotations}
% \begin{macrocode}
\define at choicekey{}{quotestyle}[\val\nr]
{center,right}[center]{%
\ifcase\nr\relax
-\def\SUF at quote@style{\rightmargin=\parindent}
+ \def\SUF at quote@style{\rightmargin=\parindent}
\or
-\def\SUF at quote@style{}
+ \def\SUF at quote@style{}
\fi}
\define at choicekey{}{quotesize}[\val\nr]
{footnotesize,small}[footnotesize]{%
\ifcase\nr\relax
-\def\SUF at quotation@size{\footnotesize}
+ \def\SUF at quotation@size{\footnotesize}
\or
-\def\SUF at quotation@size{\small}
+ \def\SUF at quotation@size{\small}
\fi}
% \end{macrocode}
-% \subsubsection*{Footnotes}
+% \paragraph{Footnotes}
% \begin{macrocode}
\define at choicekey{}{footnotestyle}[\val\nr]
{bulged,hung,dotted,superscript}[bulged]{%
@@ -2714,7 +2837,7 @@
\relax
\fi}
% \end{macrocode}
-% \subsubsection*{Captions}
+% \paragraph{Captions}
% \begin{macrocode}
\RequirePackage{caption}
\captionsetup{labelsep=period,font=small,textformat=period}
@@ -2730,7 +2853,7 @@
\fi
}
% \end{macrocode}
-% \subsubsection*{Marginal notes}
+% \paragraph{Marginal notes}
% \begin{macrocode}
\define at choicekey{}{marginpar}[\val\nr]
{true,false}[true]{%
@@ -2739,127 +2862,9 @@
\renewcommand\marginpar[2][]{}
\fi}
% \end{macrocode}
-% \subsubsection*{Table of contents}
+% \subsubsection{Other options}
+% \paragraph{Part page}
% \begin{macrocode}
-\define at choicekey{}{tocstyle}[\val\nr]{%
- standard,dotted,ragged,leftpage}[standard]{%
-\ifcase\nr\relax
- \def\SUF at titlerule{\titlerule*{}}
- \def\SUF at chaptitlerule{\titlerule*{}}
-\or
-\suftesi at dottedtoctrue
- \def\SUF at titlerule{\titlerule*{\footnotesize .\ }}
- \def\SUF at chaptitlerule{\titlerule*{}}
-\or
-\suftesi at raggedtoctrue
- \def\SUF at titlerule{\hspace{1em}}
- \def\SUF at chaptitlerule{\hspace{1em}}
-\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
- \suftesi at twocolumntoctrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnloftrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnloftrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnloftrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnloftrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\fi
-}
-% \end{macrocode}
-% \subsection*{Fonts}
-% \subsubsection*{Roman fonts}
-% \begin{macrocode}
-\define at choicekey{}{defaultfont}[\val\nr]{%
- none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
-\ifcase\nr\relax
- \suftesi at nofonttrue
-\or
- \suftesi at cochinealtrue
-\or
- \suftesi at libertinetrue
-\or
- \suftesi at palatinotrue
-\or
- \suftesi at standardtrue
-\or
- \suftesi at compatibilitytrue
-\fi}
-\define at choicekey{}{mathfont}[\val\nr]{%
- none,minimal,extended}[minimal]{%
-\ifcase\nr\relax
- \suftesi at mathminimalfalse
- \suftesi at mathextendedfalse
-\or
- \suftesi at mathminimaltrue
-\or
- \suftesi at mathextendedtrue
-\fi}
-% \end{macrocode}
-% \subsubsection*{Greek fonts}
-% \begin{macrocode}
-\define at choicekey{}{greekfont}[\val\nr]{%
- none,artemisia,porson,bodoni,cbgreek}[none]{%
-\ifcase\nr\relax
-\suftesi at greekfontfalse
-\or
-\suftesi at greekfonttrue\suftesi at artemisiatrue
-\or
-\suftesi at greekfonttrue\suftesi at porsontrue
-\or
-\suftesi at greekfonttrue\suftesi at bodonitrue
-\or
-\suftesi at greekfonttrue\suftesi at cbgreektrue
-\fi}
-% \end{macrocode}
-% \subsection*{Other options}
-% \subsubsection*{Part page}
-% \begin{macrocode}
\define at choicekey{}{partpage}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\suftesi at partpagetrue
@@ -2867,7 +2872,7 @@
\relax
\fi}
% \end{macrocode}
-% \subsubsection*{Draftdate}
+% \paragraph{Draftdate}
% \begin{macrocode}
\define at choicekey{}{draftdate}[\val\nr]
{true,false}[true]{%
@@ -2874,9 +2879,10 @@
\ifcase\nr\relax
\suftesi at draftdatetrue
\or
+ \relax
\fi}
% \end{macrocode}
-% \subsubsection*{View mode}
+% \paragraph{View mode}
% \begin{macrocode}
\define at choicekey{}{version}[\val\nr]
{screen,cscreen,draft,final}[draft]{%
@@ -2886,6 +2892,7 @@
\suftesi at screentrue
\suftesi at screencenteredtrue
\or
+ \relax
\or
\AtBeginDocument{\crop[off]}
\fi}
@@ -2900,7 +2907,7 @@
\setkeys{}{version=screen}
\fi}
% \end{macrocode}
-% \subsubsection*{Titlepage}
+% \paragraph{Titlepage}
% \begin{macrocode}
\define at choicekey{}{titlepage}[\val\nr]
{true,false}[true]{%
@@ -2910,7 +2917,7 @@
\@titlepagefalse
\fi}
% \end{macrocode}
-% \subsubsection*{Pre-defined styles}
+% \paragraph{Pre-defined styles}
% \begin{macrocode}
\define at choicekey{}{style}[\val\nr]
{roman1,roman2,roman3,roman4,roman5,roman6,
@@ -2922,7 +2929,7 @@
[roman1]{%
\ifcase\nr\relax
% \end{macrocode}
-% \paragraph{The `roman' styles}
+% \subparagraph{The `roman' styles}
% \begin{macrocode}
\setkeys{}{chapstyle=left}
\or
@@ -2937,7 +2944,7 @@
\setkeys{}{chapstyle=parright}
\or
% \end{macrocode}
-% \paragraph{The `italic' styles}
+% \subparagraph{The `italic' styles}
% \begin{macrocode}
\setkeys{}{
chapstyle=left,
@@ -3018,7 +3025,7 @@
headerfont=italic}
\or
% \end{macrocode}
-% \paragraph{The smallcaps' styles}
+% \subparagraph{The `smallcaps' styles}
% \begin{macrocode}
\setkeys{}{
chapstyle=left,
@@ -3099,7 +3106,7 @@
headerfont=smallcaps}
\or
% \end{macrocode}
-% \paragraph{The \opt{FSPL} styles}
+% \subparagraph{The \opt{FSPL} styles}
% \begin{macrocode}
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
@@ -3156,7 +3163,7 @@
quotesize,footnotestyle,liststyle,captionstyle}
\fi}
% \end{macrocode}
-% \subsubsection*{Options for \opt{collection} document structure}
+% \paragraph{Options for the \opt{collection} document structure}
% \begin{macrocode}
\define at choicekey{}{papertitlestyle}[\val\nr]{%
left,center,right}[left]{%
@@ -3170,27 +3177,28 @@
\define at choicekey{}{revauthortitle}[\val\nr]
{true,false}[false]{%
\ifcase\nr\relax
-\suftesi at reverseauthortitletrue
-\or\relax
+ \suftesi at reverseauthortitletrue
+\or
+ \relax
\fi}
\define at choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at titlefont@Switch{\relax}
+ \def\SUF at titlefont@Switch{\relax}
\or
-\def\SUF at titlefont@Switch{\itshape}
+ \def\SUF at titlefont@Switch{\itshape}
\or
-\def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at authorfont@Switch{\relax}
+ \def\SUF at authorfont@Switch{\relax}
\or
-\def\SUF at authorfont@Switch{\itshape}
+ \def\SUF at authorfont@Switch{\itshape}
\or
-\def\SUF at authorfont@Switch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at authorfont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
% \end{macrocode}
-% \subsection*{Execute and process options}
+% \subsubsection{Execute options}
% \begin{macrocode}
\ExecuteOptionsX<>{
structure=book,
@@ -3229,6 +3237,7 @@
tocauthorfont=roman,
revauthortitle=false,
papertitlestyle=left,
+ tocpartfont=roman,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
@@ -3267,14 +3276,14 @@
% \begin{macrocode}
\def\XKV at classoptionslist{}
% \end{macrocode}
-% \subsection*{Basic packages}
+% \subsection{Basic packages}
% \begin{macrocode}
\RequirePackage{multicol}
\RequirePackage{emptypage}
\RequirePackage{microtype}
\RequirePackage{color}
-\definecolor{sufred}{rgb}{0.5,0,0}
-\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+ \definecolor{sufred}{rgb}{0.5,0,0}
+ \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
\ifLuaTeX
\RequirePackage{luatex85}
@@ -3288,24 +3297,23 @@
\else
\fi
% \end{macrocode}
-% \subsection*{Page layouts}
+% If \opt{version=screen} or \opt{version=cscreen} the \sty{crop} package is not loaded. This can create problems if the \cmd{crop} command has been used in the document, for example to remove the crop marks from a certain page onwards (with \cmd{crop}|[off]|). For this reason, the \cmd{crop} command is defined (in practice it is rendered ineffective) so as not to produce errors if it had been used within the document.
% \begin{macrocode}
\ifsuftesi at screen
\newcommand*\crop[1][]{}
\ifsuftesi at screencentered
\geometry{hmarginratio=1:1}
- \else
- \fi
+ \fi
\else
\RequirePackage[a4,cam,center]{crop}
\fi
% \end{macrocode}
-% \subsection*{Fonts}
+% \subsection{Fonts}
% If you use \hologo{XeLaTeX} or \hologo{LuaLaTeX} no default font is loaded.
% Anyway the \sty{fontspec} package is required because some commands
-% of the class are base on it.
+% of the class are base on it. If \sty{fontspec} is not loaded, a class error will be issued.
% \begin{macrocode}
-\unless\ifPDFTeX%if xelatex or lualatex
+\unless\ifPDFTeX
\AtBeginDocument{%
\@ifpackageloaded{fontspec}
{\relax}
@@ -3343,10 +3351,10 @@
\ifsuftesi at standard
\RequirePackage{lmodern}
\ifsuftesi at greekfont
- \ClassWarningNoLine{suftesi}{%
- Unused 'greekfont' option}%
- \suftesi at greekfontfalse
- \else\suftesi at greekfontfalse\fi
+ \ClassWarningNoLine{suftesi}{%
+ Unused 'greekfont' option}%
+ \suftesi at greekfontfalse
+ \else\suftesi at greekfontfalse\fi
\else
% \end{macrocode}
% Previous versions of the class were based on
@@ -3355,77 +3363,77 @@
% for backward compatibility.
% \begin{macrocode}
\ifsuftesi at compatibility
- \RequirePackage[osf,sc]{mathpazo}
- \RequirePackage[scaled=0.8]{beramono}
- \renewcommand{\sfdefault}{iwona}
- \ifsuftesi at greekfont
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.96}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.97}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.18}
- \else
- \ifsuftesi at cbgreek
- \def\lmfntscale{1.06}
- \else
- \fi
- \fi
- \fi
- \fi
- \else
- \ClassWarningNoLine{suftesi}{\MessageBreak
- If you need the Greek font remember\MessageBreak
- to set one of the following options:\MessageBreak
- greekfont=artemisia,\MessageBreak
- greekfont=porson,\MessageBreak
- greekfont=cbgreek}
- \fi
+ \RequirePackage[osf,sc]{mathpazo}
+ \RequirePackage[scaled=0.8]{beramono}
+ \renewcommand{\sfdefault}{iwona}
+ \ifsuftesi at greekfont
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.96}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.97}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.17}
+ \else
+ \ifsuftesi at cbgreek
+ \def\lmfntscale{1.06}
+ \else
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ClassWarningNoLine{suftesi}{\MessageBreak
+ If you need the Greek font remember\MessageBreak
+ to set one of the following options:\MessageBreak
+ greekfont=artemisia,\MessageBreak
+ greekfont=porson,\MessageBreak
+ greekfont=cbgreek}
+ \fi
\else
\ifsuftesi at palatino
\RequirePackage[full]{textcomp}
- \RequirePackage{newpxtext}
- \RequirePackage[scaled=1.06]{biolinum}
- \RequirePackage[varqu,varl]{inconsolata}
- \ifsuftesi at mathextended
- \RequirePackage{amsthm}
- \RequirePackage[bigdelims,vvarbb]{newpxmath}
- \RequirePackage[cal=boondoxo]{mathalpha}
- \else
- \ifsuftesi at mathminimal
- \RequirePackage[bigdelims,vvarbb]{newpxmath}
- \else
- \fi
- \fi
- \useosf
- \useproportional
- \ifsuftesi at greekfont
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.96}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.97}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.18}
- \else
- \ifsuftesi at cbgreek
- \def\lmfntscale{1.06}
- \else
- \fi
- \fi
- \fi
- \fi
- \else
- \ClassWarningNoLine{suftesi}{\MessageBreak
- If you need the Greek font remember\MessageBreak
- to set one of the following options:\MessageBreak
- greekfont=artemisia,\MessageBreak
- greekfont=porson,\MessageBreak
- greekfont=cbgreek}
- \fi
+ \RequirePackage{newpxtext}
+ \RequirePackage[scaled=1.06]{biolinum}
+ \RequirePackage[varqu,varl]{inconsolata}
+ \ifsuftesi at mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage[bigdelims,vvarbb]{newpxmath}
+ \RequirePackage[cal=boondoxo]{mathalpha}
+ \else
+ \ifsuftesi at mathminimal
+ \RequirePackage[bigdelims,vvarbb]{newpxmath}
+ \else
+ \fi
+ \fi
+ \useosf
+ \useproportional
+ \ifsuftesi at greekfont
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.96}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.97}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.17}
+ \else
+ \ifsuftesi at cbgreek
+ \def\lmfntscale{1.06}
+ \else
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ClassWarningNoLine{suftesi}{\MessageBreak
+ If you need the Greek font remember\MessageBreak
+ to set one of the following options:\MessageBreak
+ greekfont=artemisia,\MessageBreak
+ greekfont=porson,\MessageBreak
+ greekfont=cbgreek}
+ \fi
\else
\ifsuftesi at libertine
\RequirePackage{textcomp}
@@ -3441,60 +3449,57 @@
\else
\fi
\fi
- \useosf
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.9}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.91}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.1}
- \else
- \fi
- \fi
- \fi
+ \useosf
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.9}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.91}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.1}
+ \else
+ \fi
+ \fi
+ \fi
\else
\ifsuftesi at cochineal
\RequirePackage{textcomp}
- \RequirePackage{cochineal}
- \RequirePackage[varqu,varl,var0]{inconsolata}
- \RequirePackage{biolinum}
- \ifsuftesi at mathextended
- \RequirePackage{amsthm}
- \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \RequirePackage[cal=boondoxo]{mathalpha}
- \else
- \ifsuftesi at mathminimal
- \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \else
- \fi
- \fi
- \useosf
- \useproportional
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.9}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.905}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.1}
- \else
- \fi
- \fi
- \fi
+ \RequirePackage{cochineal}
+ \RequirePackage[varqu,varl,var0]{inconsolata}
+ \RequirePackage{biolinum}
+ \ifsuftesi at mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
+ \ifsuftesi at mathminimal
+ \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+ \else
\fi
\fi
+ \useosf
+ \useproportional
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.9}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.905}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.1}
+ \else
+ \fi
+ \fi
+ \fi
+ \else
\fi
\fi
\fi
\fi
+ \fi
+ \fi
\fi
-%
-%
-% \begin{macrocode}
\unless\ifPDFTeX\else
\ifsuftesi at greekfont
\ifsuftesi at artemisia
@@ -3516,17 +3521,21 @@
% \end{macrocode}
%The following macro was created by Claudio Beccari. Some time later, Massimiliano Dominici suggested the use of \cmd{AtEndPreamble} instead of \cmd{AtBeginDocument}, to make the \env{otherlanguage} environment work.
% \begin{macrocode}
-\AtEndPreamble{
+\AtEndPreamble{
\substitutefont{LGR}{\rmdefault}{\SUF at greekfamily}
\DeclareRobustCommand{\greektext}{%
- \usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
- \def\encodingdefault{LGR}}
- \DeclareTextFontCommand{\textgreek}{\greektext}}
+ \usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
+ \def\encodingdefault{LGR}}
+ \DeclareTextFontCommand{\textgreek}{\greektext}
+}
\ifsuftesi at cbgreek
\else
% \end{macrocode}
% We redefine the font definitions of the GFS fonts
% in order to scale the fonts according to the roman default.
+% The first code for the Porson font (\sty{suftesi} <v.2.4) has been written
+% by Enrico Gregorio. Claudio Beccari successively added the code to improve the
+% scale factor when using this greek font in combination with Palatino.
% \begin{macrocode}
\DeclareFontFamily{LGR}{bodoni}{}
\DeclareFontShape{LGR}{bodoni}{m}{n}{<-> s * [\SUFfntscale] gbodonirg6a}{}
@@ -3573,9 +3582,9 @@
\fi
\fi
% \end{macrocode}
-% \subsection*{Section titles}
+% \subsection{Section titles}
% \begin{macrocode}
-\RequirePackage{titlesec}
+\RequirePackage[newparttoc]{titlesec}
\newlength{\sectionsep}
\setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
\unless\ifPDFTeX% if xetex or luatex
@@ -3594,7 +3603,7 @@
\scshape\suftesi at MakeTextLowercase{\textls*{#1}}}%
\fi
% \end{macrocode}
-% Default styles:
+% \subsubsection{Default styles}
% \begin{macrocode}
\newlength\SUF at ADJnumparchap
\def\SUF at default@CHAPTER{
@@ -3616,8 +3625,6 @@
\else
\setlength{\SUF at ADJnumparchap}{0pt}
\fi}
-% \end{macrocode}
-% \begin{macrocode}
\def\SUF at default@SECTIONS{
\ifsuftesi at numparsec
% \titleformat{\section}[display]
@@ -3646,8 +3653,6 @@
{\SUF at SEC@StyleSwitch}
\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
-% \end{macrocode}
-% \begin{macrocode}
\ifsuftesi at numparsubsec
% \titleformat{\subsection}[display]
% {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
@@ -3673,8 +3678,6 @@
{\SUF at SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
-% \end{macrocode}
-% \begin{macrocode}
\ifsuftesi at numparsubsubsec
% \titleformat{\subsubsection}[display]
% {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
@@ -3699,10 +3702,12 @@
{1em}
{\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
- \fi
-}
+ \fi}
\SUF at default@CHAPTER
\SUF at default@SECTIONS
+% \end{macrocode}
+% \subsubsection{Sections spacing}
+% \begin{macrocode}
\ifsuftesi at periodical
\titlespacing*{\chapter}{0em}{\SUF at ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
@@ -3737,71 +3742,111 @@
\fi
\fi
% \end{macrocode}
-% \paragraph{Redefinitions for \opt{`article'} mode}
+% Some redefinitions for \opt{article} mode:
% \begin{macrocode}
\ifsuftesi at article
\def\chapter#1{\ClassError{suftesi}
- {\noexpand\chapter level is undefined
- using 'structure=article'}
- {\noexpand\chapter level is undefined
- using 'structure=article'}}
- \setcounter{tocdepth}{3}
- \setcounter{secnumdepth}{3}
- \renewcommand\thesection{%
- \@arabic\c at section}
- \renewcommand\thesubsection{%
- \thesection.\@arabic\c at subsection}
- \renewcommand\thesubsubsection{%
- \thesubsection.\@arabic\c at subsubsection}
- \renewcommand\theparagraph{%
- \thesubsubsection.\@arabic\c at paragraph}
- \renewcommand\thesubparagraph{%
- \theparagraph.\@arabic\c at subparagraph}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\renewcommand\thesection{%
+ \@arabic\c at section}
+\renewcommand\thesubsection{%
+ \thesection.\@arabic\c at subsection}
+\renewcommand\thesubsubsection{%
+ \thesubsection.\@arabic\c at subsubsection}
+\renewcommand\theparagraph{%
+ \thesubsubsection.\@arabic\c at paragraph}
+\renewcommand\thesubparagraph{%
+ \theparagraph.\@arabic\c at subparagraph}
% \end{macrocode}
-% The \opt{partpage} options allows you to print a standard part page
-% in \opt{article} mode, which is similar to a
-% \cmd{section} but with more vertical space before and after.
+% \subsection*{The \cmd{part} command}
% \begin{macrocode}
-\ifsuftesi at partpage
- \relax
- \else
- \titleclass{\part}{straight}
- \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\renewcommand\part{%
+ \ifsuftesi at partpage
+ \if at openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \fi
+ \if at twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \ifsuftesi at partpage
+ \null\vfil
+ \fi
+ \secdef\@part\@spart}
\fi
-\ifsuftesi at numparpart
-\titleformat{\part}[display]
- {\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}
+
+\def\@part[#1]#2{%
+ \ifnum \c at secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
+ \SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
+ \else
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocPART@font#1}%
+ \fi
+ \markboth{}{}%
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \ifnum \c at secnumdepth >-2\relax
+ \noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
+ \ifsuftesi at numparpart
+ \par
+ \vskip2ex
+ \else
+ \hspace{1em}
+ \fi
+ \noindent\SUF at PART@StyleSwitch#2\par}%
+ \@endpart}
+
+\def\@spart#1{%
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \noindent\SUF at PART@StyleSwitch#1\par}%
+ \@endpart}
+
+\ifsuftesi at article
+\def\@endpart{%
+ \ifsuftesi at partpage
+ \vfil\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\else
-\titleformat{\part}[hang]
- {\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}
+\def\@endpart{\vfil\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\fi
-\else
% \end{macrocode}
-% \paragraph{The default \opt{`book'} mode}
+% Other sublevels:
% \begin{macrocode}
-\ifsuftesi at numparpart
-\titleformat{\part}[display]
- {\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 partsize\SUF at lr@PARTSwitch}
- {\SUF at PART@StyleSwitch\partname\hskip.5em\SUF at thepart\SUF at dotpart}
- {1em}
- {\SUF at PART@StyleSwitch}
-\fi
-\fi
-
-% \end{macrocode}
-% \begin{macrocode}
\titleformat{\paragraph}[runin]
{}
{\theparagraph}
@@ -3809,8 +3854,6 @@
{\itshape}
[{.}\hspace*{1em}]
\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-% \end{macrocode}
-% \begin{macrocode}
\titleformat{\subparagraph}[runin]
{}
{\thesubparagraph}
@@ -3828,71 +3871,67 @@
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
- \section*{#1}%
- \markboth{#1}{#1}}
- \defbibheading{shorthands}[\losname]{%
- \section*{#1}%
- \markboth{#1}{#1}}
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
+ \defbibheading{biblist}[\biblistname]{%
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \markboth{#1}{#1}}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
+ \defbibheading{biblistintoc}[\biblistname]{%
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
- \section{#1}%
- \if at twoside\markright{#1}\fi}
- \defbibheading{losnumbered}[\losname]{%
- \section{#1}%
- \if at twoside\markright{#1}\fi}
+ \section{#1}}
+ \defbibheading{biblistnumbered}[\biblistname]{%
+ \section{#1}}
\defbibheading{subbibliography}[\refname]{%
- \subsection*{#1}}
+ \subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
- \subsection*{#1}%
- \addcontentsline{toc}{subsection}{#1}}
+ \subsection*{#1}%
+ \addcontentsline{toc}{subsection}{#1}}
\defbibheading{subbibnumbered}[\refname]{%
- \subsection{#1}}}%
- {\relax}%
+ \subsection{#1}}
}%
+{\relax}}
\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
- \chapter*{#1}%
- \markboth{#1}{#1}}
- \defbibheading{shorthands}[\losname]{%
- \chapter*{#1}%
- \markboth{#1}{#1}}
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
+ \defbibheading{biblist}[\biblistname]{%
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\bibname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \markboth{#1}{#1}}
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
+ \defbibheading{biblistintoc}[\biblistname]{%
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
- \chapter{#1}%
- \if at twoside\markright{#1}\fi}
- \defbibheading{losnumbered}[\losname]{%
- \chapter{#1}%
- \if at twoside\markright{#1}\fi}
+ \chapter{#1}}
+ \defbibheading{biblistnumbered}[\biblistname]{%
+ \chapter{#1}}
\defbibheading{subbibliography}[\refname]{%
- \section*{#1}%
- \if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibnumbered}[\refname]{%
- \section{#1}}}
- {\relax}%
+ \section{#1}}
}%
+{\relax}}
\fi
% \end{macrocode}
-% \subsection*{Cover page}
+% \subsection{Cover page}
% \begin{macrocode}
\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
@@ -3965,7 +4004,7 @@
************************************}}}
}
% \end{macrocode}
-% \subsection*{Title page}
+% \subsection{Title page}
% The new \cmd{title} command has an optional argument
% which can be used in the headers.
% \begin{macrocode}
@@ -3994,7 +4033,7 @@
No \string\author\space given\MessageBreak%
See the class documentation for explanation}}
% \end{macrocode}
-% For |titlepage| (default) option:
+% \subsubsection{For \opt{titlepage} (default) option}
% \begin{macrocode}
\if at titlepage% titlepage
\renewcommand\maketitle{\begin{titlepage}%
@@ -4038,7 +4077,7 @@
\global\let\date\relax
\global\let\and\relax}
% \end{macrocode}
-% Reproduces the standard |\maketitle| style:
+% \paragraph{The standard \cmd{aketitle} style}
% \begin{macrocode}
\newcommand\standardtitle{\begin{titlepage}%
\let\footnotesize\small
@@ -4069,7 +4108,7 @@
\global\let\and\relax}
\else
% \end{macrocode}
-% For |notitlepage| option:
+% \subsubsection{For \opt{notitlepage} option}
% \begin{macrocode}
\renewcommand\maketitle{\par
\begingroup
@@ -4130,7 +4169,7 @@
\par
\vskip 1.5em}
% \end{macrocode}
-% Reproduces the standard |\maketitle| style:
+% \paragraph{The standard \cmd{maketitle} style}
% \begin{macrocode}
\newcommand\standardtitle{\par
\begingroup
@@ -4180,7 +4219,7 @@
\vskip 1.5em}
\fi
% \end{macrocode}
-% \subsection*{The \opt{collection} document structure}
+% \subsection{The \opt{collection} structure}
% \begin{macrocode}
\ifsuftesi at collection
\newcounter{journalnumber}
@@ -4221,8 +4260,6 @@
\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
\def\@collectioneditor{\@latex at warning@no at line{%
No \noexpand\collectioneditor given}}
-% \end{macrocode}
-% \begin{macrocode}
\renewcommand*{\title}[2][]{%
\gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
\edef\title{\noexpand\@dblarg
@@ -4270,8 +4307,6 @@
\penalty\@highpenalty
\endgroup
\fi}
-% \end{macrocode}
-% \begin{macrocode}
\renewcommand\maketitle{\par
\begingroup
\renewcommand\thefootnote{\@fnsymbol\c at footnote}%
@@ -4352,10 +4387,6 @@
\cleardoublepage
\global\let\@thanks\@empty
\endgroup}
-% \end{macrocode}
-% A command to typeset
-% the frontispiece of the collection.
-% \begin{macrocode}
\newcommand{\frontispiece}{%
\thispagestyle{empty}%
\begingroup
@@ -4392,7 +4423,7 @@
\else
\fi
% \end{macrocode}
-% \subsection*{Frontispiece}
+% \subsection{Frontispiece}
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackagewith{frontespizio}{suftesi}{%
@@ -4443,6 +4474,7 @@
\fi\fi\fi\fi\fi\fi}
{\relax}}}
% \end{macrocode}
+% \subsection{The index}
% \begin{macrocode}
\renewenvironment{theindex}
{\if at twocolumn
@@ -4465,12 +4497,9 @@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
-% \subsection*{Appendix}
+% \subsection{Appendices}
% \begin{macrocode}
\RequirePackage{appendix}
-\renewcommand{\appendixpagename}{Appendici}
-\renewcommand{\appendixtocname}{Appendici}
-\renewcommand{\appendixname}{Appendice}
\noappendicestocpagenum
% Bug using defaultfont=none,libertine,standard,compatibility
% \AtBeginEnvironment{appendices}{\appendix\mainmatter}
@@ -4484,38 +4513,6 @@
Redefine the \noexpand\appendixpagename command instead.
See the 'appendix' package documentation.\MessageBreak
\noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
-% \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]{%
-% \thecontentslabel}\hspace*{1em}}
-% {}
-% {}
-% [\addvspace{1ex}]
-% }
\renewcommand{\@chap at pppage}{%
\clear at ppage
\thispagestyle{plain}%
@@ -4654,7 +4651,7 @@
\renewcommand{\thechapter}{\@Alph\c at chapter}}
\fi
% \end{macrocode}
-% \subsection*{Headings}
+% \subsection{Headings}
% \begin{macrocode}
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version at string{#1}}
@@ -4693,8 +4690,8 @@
\fancyhf{}%
\fancyfoot[RE,LO]{%
\ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
- \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF at rightmark}
- \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+ \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+ \fancyhead[CE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
\fancyfoot[C]{\footnotesize\SUF at thepage}%
}%
@@ -4706,8 +4703,8 @@
\fancyfoot[RE,LO]{%
\ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
\fancyhead[LE,RO]{\footnotesize\SUF at thepage}
- \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF at rightmark}
- \fancyhead[RE]{\footnotesize\xheadbreakfalse%
+ \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+ \fancyhead[RE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
}%
%
@@ -4722,17 +4719,12 @@
\fi
\def\SUF at leftrightmark{%
\if at mainmatter\leftmark\else\rightmark\fi}
-% \end{macrocode}
-% Setting the default page style:
-% \begin{macrocode}
\pagestyle{sufdefault}
\ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
\ifsuftesi at sufplain\pagestyle{sufplain}\else\fi}
% \end{macrocode}
-% \subsection*{Text elements}
-%
+% \subsection{Text elements}
% \paragraph{Block Quotations}
-%
% New environments for block quotations according to a popular Italian style.
% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
% \begin{macrocode}
@@ -4778,7 +4770,7 @@
\def\thefootnote{\@fnsymbol\c at footnote}%
\else\fi
% \end{macrocode}
-% Prints a footnote with discretionary
+% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
% symbol give in the first argument.
% \begin{macrocode}
\newcommand*\xfootnote[1][*]{%
@@ -4883,8 +4875,6 @@
\fi usando la classe \textsf{suftesi} di
Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
\cleardoublepage}
-% \end{macrocode}
-% \begin{macrocode}
\newcommand{\bookcolophon}[2]{%
\thispagestyle{empty}
\null
@@ -4893,15 +4883,11 @@
\vfill
{\small\noindent #2\par}
\cleardoublepage}
-% \end{macrocode}
-% \begin{macrocode}
\newcommand{\artcolophon}[1]{%
\thispagestyle{empty}
\null
\vfill
{\small\noindent #1\par}}
-% \end{macrocode}
-% \begin{macrocode}
\newcommand{\finalcolophon}[1]{%
\thispagestyle{empty}
\null\vspace*{\stretch{1}}
@@ -4953,19 +4939,16 @@
only for the FSPL styles}}
\fi
% \end{macrocode}
-% \subsection*{Toc, lof, lot}
+% \subsection{ToC, LoF and LoT}
% \begin{macrocode}
\RequirePackage{titletoc}
% \end{macrocode}
% All the lengths depend on |\SUF at label@chap|
-% so we define this first.
+% so we define this first. The |\toclabelwidth| lengtth is provided to
+% adjust the label width in the table of contents.
% \begin{macrocode}
\newlength\SUF at label@chap
\setlength\SUF at label@chap{.5em}
-% \end{macrocode}
-% |\toclabelwidth| is provided to
-% adjust the label width in the table of contents:
-% \begin{macrocode}
\newcommand*{\toclabelwidth}[2]{%
\AtBeginDocument{
\addtolength{\csname SUF at label@#1\endcsname}{#2}%
@@ -4992,7 +4975,7 @@
See package documentation for details}}
% \end{macrocode}
% This macro controls the space between page number and chapter
-% label using the \opt{tocpageleft} option:
+% label using the \opt{toc=pageleft} option:
% \begin{macrocode}
\newlength{\SUF at tochang}
\setlength{\SUF at tochang}{3em}
@@ -5023,23 +5006,26 @@
{\SUF at label@sec}
}
% \end{macrocode}
-% Part in article mode
+% \paragraph{Part etry}
+% The style of the part ToC entry the same in all ToC types,
+% i.e. aligned to the left and without page indication.
+% The font options act only on the title, which is always printed
+% in Roman shape, and not on the label.
+% As is the case for the other sectioning commands.
% \begin{macrocode}
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname\hspace*{.5em}}
- {\makebox[\SUF at label@part][l]{%
- \thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
+%\titlecontents{part}
+% [0em]
+% {\addvspace{3ex}}
+% {\partname\hspace*{.5em}\makebox[\SUF at label@part][l]{%
+% \SUF at PART@thecontentslabel}\hspace*{1em}\SUF at tocPART@font}
+% {\SUF at tocPART@font}
+% {}
+% [\addvspace{1ex}]
% \end{macrocode}
-% \paragraph{`\opt{tocpageleft}' toc}
+% \paragraph{The `left' ToC}
+% With this option, page numbers are placed to the left of the respective entry. Therefore we set the space provided for the page number on the right to zero, using the \cmd{contentsmargin} command. In this way the right margin of the index is correctly aligned.
% \begin{macrocode}
\ifsuftesi at pagelefttoc
-% \end{macrocode}
-% First we reset the right margin to zero:
-% \begin{macrocode}
\contentsmargin{0pt}
\AtBeginDocument{
\newlength\SUF at tochang@chap
@@ -5092,7 +5078,7 @@
{\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}
}
% \end{macrocode}
-% \paragraph{TOC entries}
+% \paragraph{ToC entries}
% \begin{macrocode}
\titlecontents{chapter}
[\SUF at tochang@chap]
@@ -5199,7 +5185,7 @@
{}
\else
% \end{macrocode}
-% \paragraph{Default toc}
+% \paragraph{Default ToC}
% \begin{macrocode}
\AtBeginDocument{
\newlength\SUF at tocindent@chap
@@ -5245,7 +5231,7 @@
\fi
}
% \end{macrocode}
-% \paragraph{TOC entries}
+% \paragraph{ToC entries}
% \begin{macrocode}
\titlecontents{chapter}
[\SUF at tocindent@chap]
@@ -5338,8 +5324,7 @@
{\SUF at titlerule\contentspage}
\fi
% \end{macrocode}
-% With \opt{article} option the toc, lof and lot
-% are printed as sections.
+% \subparagraph{The ToC, LoF and LoT in the \opt{article} structure}
% \begin{macrocode}
\ifsuftesi at article
\renewcommand\tableofcontents{%
@@ -5386,7 +5371,7 @@
}
\else
% \end{macrocode}
-% The default toc, lof and lot are treated as chapters.
+% \subparagraph{The ToC, LoF and LoT in the \opt{book} structure}
% \begin{macrocode}
\renewcommand\tableofcontents{%
\if at twocolumn
@@ -5449,8 +5434,42 @@
}
\fi
% \end{macrocode}
-% \subsection*{New commands}
+% \subsection{Customizing sections font}
% \begin{macrocode}
+\newcommand{\tocpartname}[1]{\def\SUF at tocpartname{#1}}
+ \tocpartname{\partname}
+\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
+\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
+\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}
+ \partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
+\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{\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}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF at tocPARTnum@font{#1}}
+ \tocpartnumfont{}
+\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{New commands}
+% A command to print an unnumbered introduction at the beginning of the chapter. The \cmd{chapterintroname} defaults to ``Introduzione'' because the class was initially designed primarily for Italian-speaking users.
+% \begin{macrocode}
\ifsuftesi at article
\def\chapterintro{%
\ClassError{suftesi}
@@ -5468,27 +5487,32 @@
\chapterintroname{Introduzione}
\fi
% \end{macrocode}
-% \subsubsection*{Manual breaks}
-% Active in the table of contents but not in the text.
+% Two commands for manual breaks active, respectively, only in the table of contents and in the body text. The solution was initially made available by Enrico Gregorio many years ago in one of the first versions of the class (at that time the commands were called \cmd{headbreak} and \cmd{xheadbreak}). Later, while I was working on version 3.0, I noticed an alignment problem in the chapter titles when using the \opt{chapstyle=left} option. So I added the \cmd{breakinbodyleft} command and updated the command names to make them more recognizable. Old names are in any case available for backwards compatibility.
% \begin{macrocode}
-\newif\ifheadbreak\headbreakfalse
- \DeclareRobustCommand{\headbreak}
- {\ifheadbreak\\\else\fi}
-% \end{macrocode}
-% Active in the text but not in the table of contents.
-% \begin{macrocode}
-\newif\ifxheadbreak\xheadbreaktrue
- \def\xheadbreakNL{\ifxheadbreak\newline\else\fi}
- \def\xheadbreakBB{\ifxheadbreak\\\else\fi}
-% \end{macrocode}
-% \begin{macrocode}
+\newif\ifbreakintoc\breakintocfalse
+\newif\ifbreakinbody\breakinbodytrue
+\DeclareRobustCommand{\breakintoc}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\breakinbody}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\breakinbodyleft}
+ {\ifbreakinbody\newline\else\fi}
\let\origtableofcontents\tableofcontents
- \renewcommand{\tableofcontents}{%
- \begingroup\headbreaktrue\xheadbreakfalse%
- \origtableofcontents\endgroup}
+\renewcommand{\tableofcontents}{%
+ \begingroup
+ \breakintoctrue\breakinbodyfalse%
+ \origtableofcontents
+ \endgroup}
+\DeclareRobustCommand{\headbreak}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+ {\ifbreakinbody\newline\else\fi}
% \end{macrocode}
-% \subsubsection*{Backward compatibility}
-% An environment to manually typeset the bibliography. (Use \sty{biblatex} instead!)
+% \subsection{Backward compatibility}
+% Two environments to manually typeset the bibliography and the list of shorthands.
+% As the class was initially designed primarily for Italian-speaking users, these two environments have an Italian name. Particularly the list of shorthands relies on \cmd{losname} which defaults to ``Sigle'' (that means ``shorthands''). They are not documented and are made available only for backward compatibility.
% \begin{macrocode}
\newenvironment{bibliografia}{%
\ifsuftesi at article
@@ -5495,7 +5519,7 @@
\section*{\refname}
\addcontentsline{toc}{section}{\refname}
\else
- \chapter{\bibname}%
+ \chapter{\bibname}%
\fi
\normalfont \list{}{%
\setlength{\itemindent}{-\parindent}
@@ -5504,9 +5528,6 @@
\setlength{\parsep}{\parskip}
\let\makelabel}}
{\endlist}
-% \end{macrocode}
-% An environment to manually typeset the list of shorthands. (Use \sty{biblatex} instead!)
-% \begin{macrocode}
\newcommand{\losname}{Sigle}
\newcommand{\itlabel}[1]{\itshape\hbox to 6em{#1}}
\newenvironment{sigle}{%
@@ -5521,7 +5542,7 @@
\let\makelabel\itlabel}}
{\endlist}
% \end{macrocode}
-% \subsection*{Final settings}
+% \subsection{Final settings}
% \begin{macrocode}
\ifsuftesi at article
\renewcommand\frontmatter{\ClassError{suftesi}
@@ -5562,8 +5583,8 @@
\let\hemph\emph
% \end{macrocode}
% The first line of all sections is indented by default
-% using \hologo{XeLaTeX} with Italian as the main language. Anyway this is
-% incongruous with the \hologo{LaTeX} default.
+% using \hologo{XeLaTeX} with Italian as the main language. I think that this is
+% incongruous with the \hologo{LaTeX} default. For this reason:
% \begin{macrocode}
\unless\ifPDFTeX% if xetex or luatex
\let\@afterindenttrue\@afterindentfalse
@@ -5615,7 +5636,7 @@
Month = {10},
Number = {9},
Title = {Creare stili bibliografici con \textsf{biblatex}:
- l'esperienza del pacchetto {biblatex-philosophy}},
+ l'esperienza del pacchetto {biblatex-philosophy}},
Year = {2010}}
@book{Bringhurst:1992,
@@ -5628,6 +5649,7 @@
Title = {The Elements of Typographic Style},
related = {Bringhurst:1992-ITA}
}
+
@book{Bringhurst:1992-ITA,
Author = {Robert Bringhurst},
title = {Gli elementi dello stile tipografico},
@@ -5635,10 +5657,11 @@
Edition = {5},
Location = {Milano},
Publisher = {Sylvestre Bonnard}}
+
@book{Tschichold:1975,
Author = {Jan Tschichold},
Booktitle = {Ausgewählte Aufsätze über Fragen der Gestalt des
- Buches und der Typographie},
+ Buches und der Typographie},
Location = {Basel},
Origdate = {2003},
Origlocation = {Milano},
@@ -5646,7 +5669,7 @@
Origtitle = {La forma del libro},
Publisher = {Birkhäuser Verlag},
Title = {Ausgewählte Aufsätze über Fragen der Gestalt des Buches
- und der Typographie},
+ und der Typographie},
Year = {1975}}
@online{Lehman:2010,
@@ -5673,8 +5696,8 @@
Title = {L'arte di scrivere con \LaTeX},
Url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf},
Annote = {Questa guida è diventata il punto di riferimento degli utenti
- italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la
- completezza dei contenuti}}
+ italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la
+ completezza dei contenuti}}
@article{Pantieri:2009,
Author = {Lorenzo Pantieri},
@@ -5711,337 +5734,345 @@
Year = {1966}}
@manual{amsthm,
- title = {The \textsf{\MakeLowercase{Amsthm}} package},
- subtitle = {Typesetting theorems (AMS style)},
- author = {{The American Mathematical Society}},
- url = {http://www.ams.org/tex/amslatex.html},
- urldate = {2020-05-24},
- date = {},
- version = {2.20.1}
+ title = {The \textsf{\MakeLowercase{Amsthm}} package},
+ subtitle = {Typesetting theorems (AMS style)},
+ author = {{The American Mathematical Society}},
+ url = {http://www.ams.org/tex/amslatex.html},
+ urldate = {2020-05-24},
+ date = {2020-05-29},
+ version = {2.20.6}
}
@manual{appendix,
- title = {The \textsf{\MakeLowercase{Appendix}} package},
- subtitle = {Extra control of appendices},
- author = {Robertson, Will and Wilson, Peter R.},
- url = {http://www.ctan.org/pkg/appendix},
- urldate = {2020-05-24},
- date = {2020-02-08},
- version = {1.2c}
+ title = {The \textsf{\MakeLowercase{Appendix}} package},
+ subtitle = {Extra control of appendices},
+ author = {Robertson, Will and Wilson, Peter R.},
+ url = {http://www.ctan.org/pkg/appendix},
+ urldate = {2020-05-24},
+ date = {2020-02-08},
+ version = {1.2c}
}
@manual{bera,
- title = {The \textsf{\MakeLowercase{bera}} package},
- subtitle = {Bera fonts},
- author = {Walter Schmidt},
- url = {http://www.ctan.org/pkg/bera},
- urldate = {2020-05-24},
- date = {2004-09-30},
- version = {}
+ title = {The \textsf{\MakeLowercase{bera}} package},
+ subtitle = {Bera fonts},
+ author = {Walter Schmidt},
+ url = {http://www.ctan.org/pkg/bera},
+ urldate = {2020-05-24},
+ date = {2004-09-30},
+ version = {}
}
@manual{biolinum,
- title = {The \textsf{\MakeLowercase{biolinum-type1}} package},
- subtitle = {(pdf)\LaTeX\ support for the Biolinum family of fonts},
- author = {Bob Tennent},
- url = {https://www.ctan.org/pkg/biolinum-type1},
- urldate = {2020-05-24},
- date = {2012-10-30},
- version = {5.3.0}
+ title = {The \textsf{\MakeLowercase{biolinum-type1}} package},
+ subtitle = {(pdf)\LaTeX\ support for the Biolinum family of fonts},
+ author = {Bob Tennent},
+ url = {https://www.ctan.org/pkg/biolinum-type1},
+ urldate = {2020-05-24},
+ date = {2012-10-30},
+ version = {5.3.0}
}
@manual{caption,
- title = {The \textsf{\MakeLowercase{Caption}} package},
- subtitle = {Customising captions in floating environments},
- author = {Sommerfeldt, Axel},
- url = {http://www.ctan.org/pkg/caption},
- urldate = {2020-05-24},
- date = {2020-05-10},
- version = {}
+ title = {The \textsf{\MakeLowercase{Caption}} package},
+ subtitle = {Customising captions in floating environments},
+ author = {Sommerfeldt, Axel},
+ url = {http://www.ctan.org/pkg/caption},
+ urldate = {2020-05-24},
+ date = {2020-05-30},
+ version = {}
}
@manual{cclicenses,
- title = {The \textsf{\MakeLowercase{CClicenses}} package},
- subtitle = {Typeset Creative Commons licence logos},
- author = {Pignalberi, Gianluca},
- url = {http://www.ctan.org/pkg/cclicenses},
- urldate = {2020-05-24},
- date = {},
- version = {}
+ title = {The \textsf{\MakeLowercase{CClicenses}} package},
+ subtitle = {Typeset Creative Commons licence logos},
+ author = {Pignalberi, Gianluca},
+ url = {http://www.ctan.org/pkg/cclicenses},
+ urldate = {2020-05-24},
+ date = {2005/05/20},
+ version = {v0.4}
}
@manual{cochineal,
- title = {The \textsf{\MakeLowercase{Cochineal}} package},
- subtitle = {Cochineal fonts with \LaTeX\ support},
- author = {Sharpe, Michael},
- url = {http://www.ctan.org/pkg/cochineal},
- urldate = {2020-05-24},
- date = {},
- version = {1.061}
+ title = {The \textsf{\MakeLowercase{Cochineal}} package},
+ subtitle = {Cochineal fonts with \LaTeX\ support},
+ author = {Sharpe, Michael},
+ url = {http://www.ctan.org/pkg/cochineal},
+ urldate = {2020-05-24},
+ date = {2016-2020},
+ version = {1.061}
}
@manual{color,
- title = {The \textsf{\MakeLowercase{Color}} package},
- subtitle = {Colour control for \LaTeX\ documents},
- author = {Carlisle, David and {The \LaTeX\ Team}},
- url = {http://www.ctan.org/pkg/color},
- urldate = {2020-05-24},
- date = {2019-11-23},
- version = {1.2a}
+ title = {The \textsf{\MakeLowercase{Color}} package},
+ subtitle = {Colour control for \LaTeX\ documents},
+ author = {Carlisle, David and {The \LaTeX\ Team}},
+ url = {http://www.ctan.org/pkg/color},
+ urldate = {2020-05-24},
+ date = {2019-11-23},
+ version = {1.2a}
}
@manual{crop,
- title = {The \textsf{\MakeLowercase{Crop}} package},
- subtitle = {Support for cropmarks},
- author = {Franz, Melchior},
- url = {http://www.ctan.org/pkg/crop},
- urldate = {2020-05-24},
- date = {},
- version = {1.5}
+ title = {The \textsf{\MakeLowercase{Crop}} package},
+ subtitle = {Support for cropmarks},
+ author = {Franz, Melchior},
+ url = {http://www.ctan.org/pkg/crop},
+ urldate = {2020-05-24},
+ date = {2020-06-05},
+ version = {1.10.2}
}
@manual{emptypage,
- title = {The \textsf{\MakeLowercase{Emptypage}} package},
- subtitle = {Make empty pages really empty},
- author = {Wette, Karl},
- url = {http://www.ctan.org/pkg/emptypage},
- urldate = {2020-05-24},
- date = {},
- version = {1.2}
+ title = {The \textsf{\MakeLowercase{Emptypage}} package},
+ subtitle = {Make empty pages really empty},
+ author = {Wette, Karl},
+ url = {http://www.ctan.org/pkg/emptypage},
+ urldate = {2020-05-24},
+ date = {2009-2010},
+ version = {1.2}
}
@manual{enumitem,
- title = {The \textsf{\MakeLowercase{Enumitem}} package},
- subtitle = {Control layout of itemize, enumerate, description},
- author = {Bezos López, Javier},
- url = {http://www.texnia.com/enumitem.html},
- urldate = {2020-05-24},
- date = {2019-06-20},
- version = {3.9}
+ title = {The \textsf{\MakeLowercase{Enumitem}} package},
+ subtitle = {Control layout of itemize, enumerate, description},
+ author = {Bezos López, Javier},
+ url = {http://www.texnia.com/enumitem.html},
+ urldate = {2020-05-24},
+ date = {2019-06-20},
+ version = {3.9}
}
@manual{fancyhdr,
- title = {The \textsf{\MakeLowercase{Fancyhdr}} package},
- subtitle = {Extensive control of page headers and footers in \hologo{LaTeX2e}},
- author = {van Oostrum, Piet},
- url = {http://www.ctan.org/pkg/fancyhdr},
- urldate = {2020-05-24},
- date = {2019-01-31},
- version = {3.10}
+ title = {The \textsf{\MakeLowercase{Fancyhdr}} package},
+ subtitle = {Extensive control of page headers and footers in \hologo{LaTeX2e}},
+ author = {van Oostrum, Piet},
+ url = {http://www.ctan.org/pkg/fancyhdr},
+ urldate = {2020-05-24},
+ date = {2019-01-31},
+ version = {3.10}
}
@manual{fixltxhyph,
- title = {The \textsf{\MakeLowercase{Fixltxhyph}} package},
- subtitle = {Allow hyphenation of partially-emphasised substrings},
- author = {Beccari, Claudio},
- url = {http://www.ctan.org/pkg/fixltxhyph},
- urldate = {2020-05-24},
- date = {},
- version = {0.4}
+ title = {The \textsf{\MakeLowercase{Fixltxhyph}} package},
+ subtitle = {Allow hyphenation of partially-emphasised substrings},
+ author = {Beccari, Claudio},
+ url = {http://www.ctan.org/pkg/fixltxhyph},
+ urldate = {2020-05-24},
+ date = {2011},
+ version = {0.4}
}
- at manual{fontenc,
- title = {The \textsf{\MakeLowercase{Fontenc}} package},
- subtitle = {Standard package for selecting font encodings},
- author = {{The \LaTeX\ Team}},
- url = {http://www.ctan.org/pkg/fontenc},
- urldate = {2020-05-24},
- date = {},
- version = {}
-}
-
@manual{fontsize,
- title = {The \textsf{\MakeLowercase{Fontsize}} package},
- subtitle = {A small package to set arbitrary sizes for the main font of the document},
- author = {Valbusa, Ivan},
- url = {http://www.ctan.org/pkg/fontsize},
- urldate = {2020-05-24},
- date = {},
- version = {0.1}
+ title = {The \textsf{\MakeLowercase{Fontsize}} package},
+ subtitle = {A small package to set arbitrary sizes for the main font of the document},
+ author = {Valbusa, Ivan},
+ url = {http://www.ctan.org/pkg/fontsize},
+ urldate = {2020-05-24},
+ date = {2020-05-24},
+ version = {0.1}
}
@manual{geometry,
- title = {The \textsf{\MakeLowercase{Geometry}} package},
- subtitle = {Flexible and complete interface to document dimensions},
- author = {Carlisle, David and Umeki, Hideo},
- url = {http://www.ctan.org/pkg/geometry},
- urldate = {2020-05-24},
- date = {2020-01-02},
- version = {5.9}
+ title = {The \textsf{\MakeLowercase{Geometry}} package},
+ subtitle = {Flexible and complete interface to document dimensions},
+ author = {Carlisle, David and Umeki, Hideo},
+ url = {http://www.ctan.org/pkg/geometry},
+ urldate = {2020-05-24},
+ date = {2020-01-02},
+ version = {5.9}
}
@manual{iftex,
- title = {The \textsf{\MakeLowercase{Iftex}} package},
- subtitle = {Am I running under pdf\TeX, Xe\TeX\ or Lua\TeX?},
- author = {Khalighi, Vafa and {The \LaTeX\ Team}},
- url = {http://www.ctan.org/pkg/iftex},
- urldate = {2020-05-24},
- date = {},
- version = {1.0d}
+ title = {The \textsf{\MakeLowercase{Iftex}} package},
+ subtitle = {Am I running under pdf\TeX, Xe\TeX\ or Lua\TeX?},
+ author = {Khalighi, Vafa and {The \LaTeX\ Team}},
+ url = {http://www.ctan.org/pkg/iftex},
+ urldate = {2020-05-24},
+ date = {2020-03-06},
+ version = {1.0d}
}
@manual{inconsolata,
- title = {The \textsf{\MakeLowercase{Inconsolata}} package},
- subtitle = {A monospaced font, with support files for use with \TeX},
- author = {Levien, Raph and Berry, Karl and Sharpe, Michael},
- url = {http://levien.com/type/myfonts/inconsolata.html},
- urldate = {2020-05-24},
- date = {2019-06-20},
- version = {1.121}
+ title = {The \textsf{\MakeLowercase{Inconsolata}} package},
+ subtitle = {A monospaced font, with support files for use with \TeX},
+ author = {Levien, Raph and Berry, Karl and Sharpe, Michael},
+ url = {http://levien.com/type/myfonts/inconsolata.html},
+ urldate = {2020-05-24},
+ date = {2019-06-20},
+ version = {1.121}
}
@manual{libertine,
- title = {The \textsf{\MakeLowercase{Libertine}} package},
- subtitle = {Use of Linux Libertine and Biolinum fonts with \LaTeX},
- author = {Tennent, Bob},
- url = {http://www.ctan.org/pkg/libertine},
- urldate = {2020-05-24},
- date = {2020-03-26},
- version = {5.3.0}
+ title = {The \textsf{\MakeLowercase{Libertine}} package},
+ subtitle = {Use of Linux Libertine and Biolinum fonts with \LaTeX},
+ author = {Tennent, Bob},
+ url = {http://www.ctan.org/pkg/libertine},
+ urldate = {2020-05-24},
+ date = {2020-03-26},
+ version = {5.3.0}
}
@manual{libertinust1math,
- title = {The \textsf{\MakeLowercase{LibertinusT1Math}} package},
- subtitle = {A Type 1 font and \LaTeX\ support for Libertinus Math},
- author = {Sharpe, Michael},
- url = {http://www.ctan.org/pkg/libertinust1math},
- urldate = {2020-05-24},
- date = {2018-10-07},
- version = {1.1.9}
+ title = {The \textsf{\MakeLowercase{LibertinusT1Math}} package},
+ subtitle = {A Type 1 font and \LaTeX\ support for Libertinus Math},
+ author = {Sharpe, Michael},
+ url = {http://www.ctan.org/pkg/libertinust1math},
+ urldate = {2020-05-24},
+ date = {2018-10-07},
+ version = {1.1.9}
}
@manual{lm,
- title = {The \textsf{\MakeLowercase{lm}} package},
- subtitle = {Latin modern fonts in outline formats},
- author = {B. Jackowski and J.M. Nowacki},
- url = {http://www.ctan.org/pkg/lmodern},
- urldate = {2020-05-24},
- date = {},
- version = {2.004}
+ title = {The \textsf{\MakeLowercase{lm}} package},
+ subtitle = {Latin modern fonts in outline formats},
+ author = {B. Jackowski and J.M. Nowacki},
+ url = {http://www.ctan.org/pkg/lmodern},
+ urldate = {2020-05-24},
+ date = {2003-2009},
+ version = {2.004}
}
@manual{luatex85,
- title = {The \textsf{\MakeLowercase{Luatex85}} package},
- subtitle = {pdfTeX aliases for Lua\TeX},
- author = {{The \LaTeX\ Team} and Carlisle, David and Wright, Joseph},
- url = {http://www.ctan.org/pkg/luatex85},
- urldate = {2020-05-24},
- date = {2016-06-15},
- version = {1.4}
+ title = {The \textsf{\MakeLowercase{Luatex85}} package},
+ subtitle = {pdfTeX aliases for Lua\TeX},
+ author = {{The \LaTeX\ Team} and Carlisle, David and Wright, Joseph},
+ url = {http://www.ctan.org/pkg/luatex85},
+ urldate = {2020-05-24},
+ date = {2016-06-15},
+ version = {1.4}
}
@manual{mathalpha,
- title = {The \textsf{\MakeLowercase{Mathalpha}} package},
- subtitle = {General package for loading maths alphabets in \LaTeX},
- author = {Sharpe, Michael},
- url = {http://www.ctan.org/pkg/mathalpha},
- urldate = {2020-05-24},
- date = {2019-10-05},
- version = {1.13}
+ title = {The \textsf{\MakeLowercase{Mathalpha}} package},
+ subtitle = {General package for loading maths alphabets in \LaTeX},
+ author = {Sharpe, Michael},
+ url = {http://www.ctan.org/pkg/mathalpha},
+ urldate = {2020-05-24},
+ date = {2019-10-05},
+ version = {1.13}
}
@manual{mathpazo,
- title = {The \textsf{\MakeLowercase{Mathpazo}} package},
- subtitle = {Fonts to typeset mathematics to match Palatino},
- author = {Puga, Diego},
- url = {http://www.ctan.org/pkg/mathpazo},
- urldate = {2020-05-24},
- date = {},
- version = {1.003}
+ title = {The \textsf{\MakeLowercase{Mathpazo}} package},
+ subtitle = {Fonts to typeset mathematics to match Palatino},
+ author = {Puga, Diego},
+ url = {http://www.ctan.org/pkg/mathpazo},
+ urldate = {2020-05-24},
+ date = {2002},
+ version = {1.003}
}
@manual{microtype,
- title = {The \textsf{\MakeLowercase{Microtype}} package},
- subtitle = {Subliminal refinements towards typographical perfection},
- author = {Schlicht, Robert},
- url = {http://www.ctan.org/pkg/microtype},
- urldate = {2020-05-24},
- date = {2019-11-18},
- version = {2.7d}
+ title = {The \textsf{\MakeLowercase{Microtype}} package},
+ subtitle = {Subliminal refinements towards typographical perfection},
+ author = {Schlicht, Robert},
+ url = {http://www.ctan.org/pkg/microtype},
+ urldate = {2020-05-24},
+ date = {2019-11-18},
+ version = {2.7d}
}
@manual{multicol,
- title = {The \textsf{\MakeLowercase{Multicol}} package},
- subtitle = {Intermix single and multiple columns},
- author = {Mittelbach, Frank and {The \LaTeX\ Team}},
- url = {http://www.ctan.org/pkg/multicol},
- urldate = {2020-05-24},
- date = {2019-12-09},
- version = {1.8y}
+ title = {The \textsf{\MakeLowercase{Multicol}} package},
+ subtitle = {Intermix single and multiple columns},
+ author = {Mittelbach, Frank and {The \LaTeX\ Team}},
+ url = {http://www.ctan.org/pkg/multicol},
+ urldate = {2020-05-24},
+ date = {2019-12-09},
+ version = {1.8y}
}
@manual{newpx,
- title = {The \textsf{\MakeLowercase{newpx}} package},
- subtitle = {Alternative uses of the PX fonts, with improved metrics},
- author = {Michael Sharpe},
- url = {http://www.ctan.org/pkg/newpxmath},
- urldate = {2020-05-24},
- date = {2020-05-17},
- version = {1.411}
+ title = {The \textsf{\MakeLowercase{newpx}} package},
+ subtitle = {Alternative uses of the PX fonts, with improved metrics},
+ author = {Michael Sharpe},
+ url = {http://www.ctan.org/pkg/newpxmath},
+ urldate = {2020-05-24},
+ date = {2020-05-17},
+ version = {1.411}
}
@manual{newtx,
- title = {The \textsf{\MakeLowercase{newtx}} package},
- subtitle = {Alternative uses of the TX fonts, with improved metrics},
- author = {Michael Sharpe},
- url = {http://www.ctan.org/pkg/newtxmath},
- urldate = {2020-05-24},
- date = {2020-05-17},
- version = {1.627}
+ title = {The \textsf{\MakeLowercase{newtx}} package},
+ subtitle = {Alternative uses of the TX fonts, with improved metrics},
+ author = {Michael Sharpe},
+ url = {http://www.ctan.org/pkg/newtxmath},
+ urldate = {2020-05-24},
+ date = {2020-05-17},
+ version = {1.627}
}
@manual{substitutefont,
- title = {The \textsf{\MakeLowercase{Substitutefont}} package},
- subtitle = {Easy font substitution},
- author = {Milde, Günter},
- url = {http://www.ctan.org/pkg/substitutefont},
- urldate = {2020-05-24},
- date = {2013-11-04},
- version = {0.1.4}
+ title = {The \textsf{\MakeLowercase{Substitutefont}} package},
+ subtitle = {Easy font substitution},
+ author = {Milde, Günter},
+ url = {http://www.ctan.org/pkg/substitutefont},
+ urldate = {2020-05-24},
+ date = {2013-11-04},
+ version = {0.1.4}
}
@manual{textcomp,
- title = {The \textsf{\MakeLowercase{Textcomp}} package},
- subtitle = {\LaTeX\ support for the Text Companion fonts},
- author = {Rahtz, Sebastian},
- url = {http://www.ctan.org/pkg/textcomp},
- urldate = {2020-05-24},
- date = {},
- version = {}
+ title = {The \textsf{\MakeLowercase{Textcomp}} package},
+ subtitle = {\LaTeX\ support for the Text Companion fonts},
+ author = {Rahtz, Sebastian},
+ url = {http://www.ctan.org/pkg/textcomp},
+ urldate = {2020-05-24},
+ date = {1995},
+ version = {}
}
@manual{titlesec,
- title = {The \textsf{\MakeLowercase{Titlesec}} package},
- subtitle = {Select alternative section titles},
- author = {Bezos López, Javier},
- url = {http://www.ctan.org/pkg/titlesec},
- urldate = {2020-05-24},
- date = {2019-10-16},
- version = {2.13}
+ title = {The \textsf{\MakeLowercase{Titlesec}} package},
+ subtitle = {Select alternative section titles},
+ author = {Bezos López, Javier},
+ url = {http://www.ctan.org/pkg/titlesec},
+ urldate = {2020-05-24},
+ date = {2019-10-16},
+ version = {2.13}
}
@manual{titletoc,
- title = {The \textsf{\MakeLowercase{Titletoc}} package},
- subtitle = {Alternative headings for toc/lof/lot},
- author = {Bezos López, Javier},
- url = {http://www.ctan.org/pkg/titletoc},
- urldate = {2020-05-24},
- date = {2019-10-16},
- version = {2.13}
+ title = {The \textsf{\MakeLowercase{Titletoc}} package},
+ subtitle = {Alternative headings for toc/lof/lot},
+ author = {Bezos López, Javier},
+ url = {http://www.ctan.org/pkg/titletoc},
+ urldate = {2020-05-24},
+ date = {2019-10-16},
+ version = {2.13}
}
@manual{xkeyval,
- title = {The \textsf{\MakeLowercase{Xkeyval}} package},
- subtitle = {Extension of the keyval package},
- author = {Adriaens, Hendri},
- url = {http://www.ctan.org/pkg/xkeyval},
- urldate = {2020-05-24},
- date = {},
- version = {2.7a}
+ title = {The \textsf{\MakeLowercase{Xkeyval}} package},
+ subtitle = {Extension of the keyval package},
+ author = {Adriaens, Hendri},
+ url = {http://www.ctan.org/pkg/xkeyval},
+ urldate = {2020-05-24},
+ date = {2014-03-12},
+ version = {2.7a}
}
+ at manual{bookcover,
+ title = {The \textsf{bookcover} class},
+ subtitle = {Class for book covers and dust jackets},
+ author = {Tibor Tómács},
+ url = {http://www.ctan.org/pkg/bookcover},
+ urldate = {2020-06-29},
+ date = {2018-01-21},
+ version = {v2.3}
+}
+
+ at manual{afterpage,
+ title = {The \textsf{afterpage} package},
+ subtitle = { Execute command after the next page break},
+ author = {David Carlisle},
+ url = {http://www.ctan.org/pkg/bookcover},
+ urldate = {2020-06-29},
+ date = {2014-10-28},
+ version = {v1.08}
+}
%</bib>
% \fi
-%
% \Finale
Modified: trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-12-21 22:19:11 UTC (rev 57195)
+++ trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2020-12-21 22:19:32 UTC (rev 57196)
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2020/06/26 v2.9.10 A class for typesetting theses, books and articles]
+ [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
\RequirePackage{xkeyval}
\newif\ifsuftesi at compatibility
\newif\ifsuftesi at nofont
@@ -99,15 +99,15 @@
\define at choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
-\def\SUF at chapswitch{\thechapter.}
+ \def\SUF at chapswitch{\thechapter.}
\or
-\suftesi at articletrue
-\@titlepagefalse
-\def\SUF at chapswitch{}
+ \suftesi at articletrue
+ \@titlepagefalse
+ \def\SUF at chapswitch{}
\or
-\suftesi at collectiontrue
- \setkeys{}{headerstyle=authortitleinner}
-\def\SUF at chapswitch{}
+ \suftesi at collectiontrue
+ \setkeys{}{headerstyle=authortitleinner}
+ \def\SUF at chapswitch{}
\fi}
\define at choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -121,10 +121,48 @@
\or
\setkeys{}{structure=collection}
\fi}
+\define at choicekey{}{defaultfont}[\val\nr]{%
+none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\ifcase\nr\relax
+ \suftesi at nofonttrue
+\or
+ \suftesi at cochinealtrue
+\or
+ \suftesi at libertinetrue
+\or
+ \suftesi at palatinotrue
+\or
+ \suftesi at standardtrue
+\or
+ \suftesi at compatibilitytrue
+\fi}
+\define at choicekey{}{mathfont}[\val\nr]{%
+none,minimal,extended}[minimal]{%
+\ifcase\nr\relax
+ \suftesi at mathminimalfalse
+ \suftesi at mathextendedfalse
+\or
+ \suftesi at mathminimaltrue
+\or
+ \suftesi at mathextendedtrue
+\fi}
+\define at choicekey{}{greekfont}[\val\nr]{%
+none,artemisia,porson,bodoni,cbgreek}[none]{%
+\ifcase\nr\relax
+\suftesi at greekfontfalse
+\or
+ \suftesi at greekfonttrue\suftesi at artemisiatrue
+\or
+ \suftesi at greekfonttrue\suftesi at porsontrue
+\or
+ \suftesi at greekfonttrue\suftesi at bodonitrue
+\or
+ \suftesi at greekfonttrue\suftesi at cbgreektrue
+\fi}
\RequirePackage{geometry}
\define at choicekey{}{pagelayout}[\val\nr]
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
- supercompactaureo,periodicalaureo}[standard]{%
+ supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
@@ -257,192 +295,182 @@
marginratio= 2:3,
marginparwidth= 62pt,
marginparsep= 10pt}
-\or
+\or% pocketa
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 153mm,
+ textwidth= 102mm,
+ paperwidth= 135mm,
+ paperheight= 208mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 12mm,
+ marginparsep= 7pt}
+\or% pocketb
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 165mm,
+ textwidth= 99mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 15mm,
+ marginparsep= 7pt}
+\or% pocketc
+\suftesi at supercompactaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 150mm,
+ textwidth= 90mm,
+ paperwidth= 116mm,
+ paperheight= 193mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 8mm,
+ marginparsep= 7pt}
\fi}
\define at choicekey{}{partstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@PARTSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@PARTSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@PARTSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numpar
\def\SUF at lr@PARTSwitch{\filright}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@PARTSwitch{\filcenter}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@PARTSwitch{\filleft}
\suftesi at numparparttrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{chapstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@CHAPSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@CHAPSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@CHAPSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numparchap
\def\SUF at lr@CHAPSwitch{\filright}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@CHAPSwitch{\filcenter}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@CHAPSwitch{\filleft}
\suftesi at numparchaptrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{secstyle}[\val\nr]{%
left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or%numparsec
\def\SUF at lr@SECSwitch{\filright}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SECSwitch{\filcenter}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SECSwitch{\filleft}
\suftesi at numparsectrue
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SUBSECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SUBSECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSUBSECSwitch{\filright}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakNL}
\or
\def\SUF at lr@SUBSUBSECSwitch{\filcenter}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\or
\def\SUF at lr@SUBSUBSECSwitch{\filleft}
- \DeclareRobustCommand{\xheadbreak}{\xheadbreakBB}
\fi}
\define at choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at PART@StyleSwitch{\relax}
+ \def\SUF at PART@StyleSwitch{\relax}
\or
-\def\SUF at PART@StyleSwitch{\itshape}
+ \def\SUF at PART@StyleSwitch{\itshape}
\or
-\def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at CHAP@StyleSwitch{\relax}
+ \def\SUF at CHAP@StyleSwitch{\relax}
\or
-\def\SUF at CHAP@StyleSwitch{\itshape}
+ \def\SUF at CHAP@StyleSwitch{\itshape}
\or
-\def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
-\def\SUF at SEC@StyleSwitch{\relax}
+ \def\SUF at SEC@StyleSwitch{\relax}
\or
-\def\SUF at SEC@StyleSwitch{\itshape}
+ \def\SUF at SEC@StyleSwitch{\itshape}
\or
-\def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at SUBSEC@StyleSwitch{\relax}
+ \def\SUF at SUBSEC@StyleSwitch{\relax}
\or
-\def\SUF at SUBSEC@StyleSwitch{\itshape}
+ \def\SUF at SUBSEC@StyleSwitch{\itshape}
\or
-\def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at SUBSUBSEC@StyleSwitch{\relax}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\relax}
\or
-\def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\itshape}
\or
-\def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{smallcapsstyle}[\val\nr]
+{low,upper}[low]{%
\ifcase\nr\relax
-\def\SUF at tocCHAP@font{\relax}
+ \def\suftesi at MakeTextLowercase{\MakeLowercase}
+ \def\suftesi at MakeTextTOCLowercase{\lowercase}
\or
-\def\SUF at tocCHAP@font{\itshape}
-\or
-\def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
+ \def\suftesi at MakeTextLowercase{\relax}
+ \def\suftesi at MakeTextTOCLowercase{\relax}
\fi}
-\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
-\def\SUF at tocSEC@font{\relax}
-\or
-\def\SUF at tocSEC@font{\itshape}
-\or
-\def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocSUBSEC@font{\relax}
-\or
-\def\SUF at tocSUBSEC@font{\itshape}
-\or
-\def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocSUBSUBSEC@font{\relax}
-\or
-\def\SUF at tocSUBSUBSEC@font{\itshape}
-\or
-\def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
-\ifcase\nr\relax
-\def\SUF at tocAUT@font{\relax}
-\or
-\def\SUF at tocAUT@font{\itshape}
-\or
-\def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
-\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
-\ifcase\nr\relax
-\def\SUF at tocTIT@font{\relax}
-\or
-\def\SUF at tocTIT@font{\itshape}
-\or
-\def\SUF at tocTIT@font{\expandafter\SUF at TOCtitlesmallcaps}
-\fi}
\define at choicekey{}{partnumstyle}[\val\nr]
- {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
@@ -463,8 +491,8 @@
\def\SUF at dotpart{.}
\fi}
\define at choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
- dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
\def\SUF at dotchap{}
@@ -494,10 +522,10 @@
\def\SUF at HEAD@thechapter{\Roman{chapter}}
\def\SUF at dotchap{.}
\def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
\define at choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
\def\SUF at dotsec{}
@@ -527,10 +555,10 @@
\def\SUF at HEAD@thesection{\Roman{section}}
\def\SUF at dotsec{.}
\def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
\define at choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
\def\SUF at SUBSEC@thecontentslabel{\thecontentslabel}
@@ -554,10 +582,10 @@
\def\SUF at thesubsection{\SUF at thesection.\Roman{subsection}}
\def\SUF at dotsubsec{.}
\def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+\fi}
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
+\ifcase\nr\relax
\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
\def\SUF at SUBSUBSEC@thecontentslabel{\thecontentslabel}
@@ -581,42 +609,133 @@
\def\SUF at thesubsubsection{\SUF at thesubsection.\Roman{subsubsection}}
\def\SUF at dotsubsubsec{.}
\def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
-\define at choicekey{}{smallcapsstyle}[\val\nr]
- {low,upper}[low]{%
+\fi}
+\define at choicekey{}{tocstyle}[\val\nr]{%
+standard,dotted,ragged,leftpage}[standard]{%
\ifcase\nr\relax
- \def\suftesi at MakeTextLowercase{\MakeLowercase}
- \def\suftesi at MakeTextTOCLowercase{\lowercase}
+ \def\SUF at titlerule{\titlerule*{}}
+ \def\SUF at chaptitlerule{\titlerule*{}}
\or
- \def\suftesi at MakeTextLowercase{\relax}
- \def\suftesi at MakeTextTOCLowercase{\relax}
+\suftesi at dottedtoctrue
+ \def\SUF at titlerule{\titlerule*{\footnotesize .\ }}
+ \def\SUF at chaptitlerule{\titlerule*{}}
+\or
+\suftesi at raggedtoctrue
+ \def\SUF at titlerule{\hspace{1em}}
+ \def\SUF at chaptitlerule{\hspace{1em}}
+\or
+\suftesi at pagelefttoctrue
\fi}
-\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
-\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{\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}}
+\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
+ \suftesi at twocolumntoctrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnloftrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumnloftrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\or
+ \suftesi at twocolumntoctrue
+ \suftesi at twocolumnloftrue
+ \suftesi at twocolumnlottrue
+ \setkeys{}{tocstyle=ragged}
+\fi
+}
+\define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocPART@font{\relax}
+\or
+ \def\SUF at tocPART@font{\itshape}
+\or
+ \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocCHAP@font{\relax}
+\or
+ \def\SUF at tocCHAP@font{\itshape}
+\or
+ \def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+ \def\SUF at tocSEC@font{\relax}
+\or
+ \def\SUF at tocSEC@font{\itshape}
+\or
+ \def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocSUBSEC@font{\relax}
+\or
+ \def\SUF at tocSUBSEC@font{\itshape}
+\or
+ \def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocSUBSUBSEC@font{\relax}
+\or
+ \def\SUF at tocSUBSUBSEC@font{\itshape}
+\or
+ \def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\ifcase\nr\relax
+ \def\SUF at tocAUT@font{\relax}
+\or
+ \def\SUF at tocAUT@font{\itshape}
+\or
+ \def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
+\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\ifcase\nr\relax
+ \def\SUF at tocTIT@font{\relax}
+\or
+ \def\SUF at tocTIT@font{\itshape}
+\or
+ \def\SUF at tocTIT@font{\expandafter\SUF at TOCtitlesmallcaps}
+\fi}
\define at choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
authortitlecenter}[inner]{%
@@ -661,40 +780,39 @@
\define at choicekey{}{liststyle}[\val\nr]
{bulged,aligned,indented}[bulged]{%
\ifcase\nr\relax
- \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=0pt}
- \setlist[itemize,2]{leftmargin=1.3\parindent}
- \setlist[itemize,3]{leftmargin=1.3\parindent}
+ \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=0pt} \setlist[itemize,2]{leftmargin=1.3\parindent}
+ \setlist[itemize,3]{leftmargin=1.3\parindent}
\or
- \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=1\parindent}
- \setlist[itemize,2]{leftmargin=1.5\parindent}
- \setlist[itemize,3]{leftmargin=1.5\parindent}
+ \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=1\parindent}
+ \setlist[itemize,2]{leftmargin=1.5\parindent}
+ \setlist[itemize,3]{leftmargin=1.5\parindent}
\or
- \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
- \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
- \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=2\parindent}
- \setlist[itemize,2]{leftmargin=2.5\parindent}
- \setlist[itemize,3]{leftmargin=2.5\parindent}
+ \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.}
+ \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.}
+ \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.}
+ \setlist[itemize,1]{leftmargin=2\parindent}
+ \setlist[itemize,2]{leftmargin=2.5\parindent}
+ \setlist[itemize,3]{leftmargin=2.5\parindent}
\fi}
\define at choicekey{}{quotestyle}[\val\nr]
{center,right}[center]{%
\ifcase\nr\relax
-\def\SUF at quote@style{\rightmargin=\parindent}
+ \def\SUF at quote@style{\rightmargin=\parindent}
\or
-\def\SUF at quote@style{}
+ \def\SUF at quote@style{}
\fi}
\define at choicekey{}{quotesize}[\val\nr]
{footnotesize,small}[footnotesize]{%
\ifcase\nr\relax
-\def\SUF at quotation@size{\footnotesize}
+ \def\SUF at quotation@size{\footnotesize}
\or
-\def\SUF at quotation@size{\small}
+ \def\SUF at quotation@size{\small}
\fi}
\define at choicekey{}{footnotestyle}[\val\nr]
{bulged,hung,dotted,superscript}[bulged]{%
@@ -738,114 +856,6 @@
\or
\renewcommand\marginpar[2][]{}
\fi}
-\define at choicekey{}{tocstyle}[\val\nr]{%
- standard,dotted,ragged,leftpage}[standard]{%
-\ifcase\nr\relax
- \def\SUF at titlerule{\titlerule*{}}
- \def\SUF at chaptitlerule{\titlerule*{}}
-\or
-\suftesi at dottedtoctrue
- \def\SUF at titlerule{\titlerule*{\footnotesize .\ }}
- \def\SUF at chaptitlerule{\titlerule*{}}
-\or
-\suftesi at raggedtoctrue
- \def\SUF at titlerule{\hspace{1em}}
- \def\SUF at chaptitlerule{\hspace{1em}}
-\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
- \suftesi at twocolumntoctrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnloftrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnloftrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumnloftrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\or
- \suftesi at twocolumntoctrue
- \suftesi at twocolumnloftrue
- \suftesi at twocolumnlottrue
- \setkeys{}{tocstyle=ragged}
-\fi
-}
-\define at choicekey{}{defaultfont}[\val\nr]{%
- none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
-\ifcase\nr\relax
- \suftesi at nofonttrue
-\or
- \suftesi at cochinealtrue
-\or
- \suftesi at libertinetrue
-\or
- \suftesi at palatinotrue
-\or
- \suftesi at standardtrue
-\or
- \suftesi at compatibilitytrue
-\fi}
-\define at choicekey{}{mathfont}[\val\nr]{%
- none,minimal,extended}[minimal]{%
-\ifcase\nr\relax
- \suftesi at mathminimalfalse
- \suftesi at mathextendedfalse
-\or
- \suftesi at mathminimaltrue
-\or
- \suftesi at mathextendedtrue
-\fi}
-\define at choicekey{}{greekfont}[\val\nr]{%
- none,artemisia,porson,bodoni,cbgreek}[none]{%
-\ifcase\nr\relax
-\suftesi at greekfontfalse
-\or
-\suftesi at greekfonttrue\suftesi at artemisiatrue
-\or
-\suftesi at greekfonttrue\suftesi at porsontrue
-\or
-\suftesi at greekfonttrue\suftesi at bodonitrue
-\or
-\suftesi at greekfonttrue\suftesi at cbgreektrue
-\fi}
\define at choicekey{}{partpage}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\suftesi at partpagetrue
@@ -857,6 +867,7 @@
\ifcase\nr\relax
\suftesi at draftdatetrue
\or
+ \relax
\fi}
\define at choicekey{}{version}[\val\nr]
{screen,cscreen,draft,final}[draft]{%
@@ -866,6 +877,7 @@
\suftesi at screentrue
\suftesi at screencenteredtrue
\or
+ \relax
\or
\AtBeginDocument{\crop[off]}
\fi}
@@ -1129,24 +1141,25 @@
\define at choicekey{}{revauthortitle}[\val\nr]
{true,false}[false]{%
\ifcase\nr\relax
-\suftesi at reverseauthortitletrue
-\or\relax
+ \suftesi at reverseauthortitletrue
+\or
+ \relax
\fi}
\define at choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at titlefont@Switch{\relax}
+ \def\SUF at titlefont@Switch{\relax}
\or
-\def\SUF at titlefont@Switch{\itshape}
+ \def\SUF at titlefont@Switch{\itshape}
\or
-\def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
-\def\SUF at authorfont@Switch{\relax}
+ \def\SUF at authorfont@Switch{\relax}
\or
-\def\SUF at authorfont@Switch{\itshape}
+ \def\SUF at authorfont@Switch{\itshape}
\or
-\def\SUF at authorfont@Switch{\expandafter\SUF at titlesmallcaps}
+ \def\SUF at authorfont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
\ExecuteOptionsX<>{
structure=book,
@@ -1185,6 +1198,7 @@
tocauthorfont=roman,
revauthortitle=false,
papertitlestyle=left,
+ tocpartfont=roman,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
@@ -1214,8 +1228,8 @@
\RequirePackage{emptypage}
\RequirePackage{microtype}
\RequirePackage{color}
-\definecolor{sufred}{rgb}{0.5,0,0}
-\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
+ \definecolor{sufred}{rgb}{0.5,0,0}
+ \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
\ifLuaTeX
\RequirePackage{luatex85}
@@ -1229,12 +1243,11 @@
\newcommand*\crop[1][]{}
\ifsuftesi at screencentered
\geometry{hmarginratio=1:1}
- \else
- \fi
+ \fi
\else
\RequirePackage[a4,cam,center]{crop}
\fi
-\unless\ifPDFTeX%if xelatex or lualatex
+\unless\ifPDFTeX
\AtBeginDocument{%
\@ifpackageloaded{fontspec}
{\relax}
@@ -1266,83 +1279,83 @@
\ifsuftesi at standard
\RequirePackage{lmodern}
\ifsuftesi at greekfont
- \ClassWarningNoLine{suftesi}{%
- Unused 'greekfont' option}%
- \suftesi at greekfontfalse
- \else\suftesi at greekfontfalse\fi
+ \ClassWarningNoLine{suftesi}{%
+ Unused 'greekfont' option}%
+ \suftesi at greekfontfalse
+ \else\suftesi at greekfontfalse\fi
\else
\ifsuftesi at compatibility
- \RequirePackage[osf,sc]{mathpazo}
- \RequirePackage[scaled=0.8]{beramono}
- \renewcommand{\sfdefault}{iwona}
- \ifsuftesi at greekfont
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.96}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.97}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.18}
- \else
- \ifsuftesi at cbgreek
- \def\lmfntscale{1.06}
- \else
- \fi
- \fi
- \fi
- \fi
- \else
- \ClassWarningNoLine{suftesi}{\MessageBreak
- If you need the Greek font remember\MessageBreak
- to set one of the following options:\MessageBreak
- greekfont=artemisia,\MessageBreak
- greekfont=porson,\MessageBreak
- greekfont=cbgreek}
- \fi
+ \RequirePackage[osf,sc]{mathpazo}
+ \RequirePackage[scaled=0.8]{beramono}
+ \renewcommand{\sfdefault}{iwona}
+ \ifsuftesi at greekfont
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.96}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.97}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.17}
+ \else
+ \ifsuftesi at cbgreek
+ \def\lmfntscale{1.06}
+ \else
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ClassWarningNoLine{suftesi}{\MessageBreak
+ If you need the Greek font remember\MessageBreak
+ to set one of the following options:\MessageBreak
+ greekfont=artemisia,\MessageBreak
+ greekfont=porson,\MessageBreak
+ greekfont=cbgreek}
+ \fi
\else
\ifsuftesi at palatino
\RequirePackage[full]{textcomp}
- \RequirePackage{newpxtext}
- \RequirePackage[scaled=1.06]{biolinum}
- \RequirePackage[varqu,varl]{inconsolata}
- \ifsuftesi at mathextended
- \RequirePackage{amsthm}
- \RequirePackage[bigdelims,vvarbb]{newpxmath}
- \RequirePackage[cal=boondoxo]{mathalpha}
- \else
- \ifsuftesi at mathminimal
- \RequirePackage[bigdelims,vvarbb]{newpxmath}
- \else
- \fi
- \fi
- \useosf
- \useproportional
- \ifsuftesi at greekfont
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.96}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.97}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.18}
- \else
- \ifsuftesi at cbgreek
- \def\lmfntscale{1.06}
- \else
- \fi
- \fi
- \fi
- \fi
- \else
- \ClassWarningNoLine{suftesi}{\MessageBreak
- If you need the Greek font remember\MessageBreak
- to set one of the following options:\MessageBreak
- greekfont=artemisia,\MessageBreak
- greekfont=porson,\MessageBreak
- greekfont=cbgreek}
- \fi
+ \RequirePackage{newpxtext}
+ \RequirePackage[scaled=1.06]{biolinum}
+ \RequirePackage[varqu,varl]{inconsolata}
+ \ifsuftesi at mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage[bigdelims,vvarbb]{newpxmath}
+ \RequirePackage[cal=boondoxo]{mathalpha}
+ \else
+ \ifsuftesi at mathminimal
+ \RequirePackage[bigdelims,vvarbb]{newpxmath}
+ \else
+ \fi
+ \fi
+ \useosf
+ \useproportional
+ \ifsuftesi at greekfont
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.96}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.97}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.17}
+ \else
+ \ifsuftesi at cbgreek
+ \def\lmfntscale{1.06}
+ \else
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ClassWarningNoLine{suftesi}{\MessageBreak
+ If you need the Greek font remember\MessageBreak
+ to set one of the following options:\MessageBreak
+ greekfont=artemisia,\MessageBreak
+ greekfont=porson,\MessageBreak
+ greekfont=cbgreek}
+ \fi
\else
\ifsuftesi at libertine
\RequirePackage{textcomp}
@@ -1358,56 +1371,56 @@
\else
\fi
\fi
- \useosf
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.9}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.91}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.1}
- \else
- \fi
- \fi
- \fi
+ \useosf
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.9}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.91}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.1}
+ \else
+ \fi
+ \fi
+ \fi
\else
\ifsuftesi at cochineal
\RequirePackage{textcomp}
- \RequirePackage{cochineal}
- \RequirePackage[varqu,varl,var0]{inconsolata}
- \RequirePackage{biolinum}
- \ifsuftesi at mathextended
- \RequirePackage{amsthm}
- \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \RequirePackage[cal=boondoxo]{mathalpha}
- \else
- \ifsuftesi at mathminimal
- \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \else
- \fi
- \fi
- \useosf
- \useproportional
- \ifsuftesi at bodoni
- \gdef\SUFfntscale{0.9}
- \else
- \ifsuftesi at artemisia
- \gdef\SUFfntscale{0.905}
- \else
- \ifsuftesi at porson
- \gdef\SUFfntscale{1.1}
- \else
- \fi
- \fi
- \fi
+ \RequirePackage{cochineal}
+ \RequirePackage[varqu,varl,var0]{inconsolata}
+ \RequirePackage{biolinum}
+ \ifsuftesi at mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
+ \ifsuftesi at mathminimal
+ \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+ \else
\fi
\fi
+ \useosf
+ \useproportional
+ \ifsuftesi at bodoni
+ \gdef\SUFfntscale{0.9}
+ \else
+ \ifsuftesi at artemisia
+ \gdef\SUFfntscale{0.905}
+ \else
+ \ifsuftesi at porson
+ \gdef\SUFfntscale{1.1}
+ \else
\fi
\fi
\fi
+ \else
\fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
\fi
\unless\ifPDFTeX\else
\ifsuftesi at greekfont
@@ -1427,12 +1440,13 @@
\fi
\fi
\fi
-\AtEndPreamble{
+\AtEndPreamble{
\substitutefont{LGR}{\rmdefault}{\SUF at greekfamily}
\DeclareRobustCommand{\greektext}{%
- \usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
- \def\encodingdefault{LGR}}
- \DeclareTextFontCommand{\textgreek}{\greektext}}
+ \usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
+ \def\encodingdefault{LGR}}
+ \DeclareTextFontCommand{\textgreek}{\greektext}
+}
\ifsuftesi at cbgreek
\else
\DeclareFontFamily{LGR}{bodoni}{}
@@ -1479,7 +1493,7 @@
\else
\fi
\fi
-\RequirePackage{titlesec}
+\RequirePackage[newparttoc]{titlesec}
\newlength{\sectionsep}
\setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
\unless\ifPDFTeX% if xetex or luatex
@@ -1562,8 +1576,7 @@
{1em}
{\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
- \fi
-}
+ \fi}
\SUF at default@CHAPTER
\SUF at default@SECTIONS
\ifsuftesi at periodical
@@ -1601,57 +1614,101 @@
\fi
\ifsuftesi at article
\def\chapter#1{\ClassError{suftesi}
- {\noexpand\chapter level is undefined
- using 'structure=article'}
- {\noexpand\chapter level is undefined
- using 'structure=article'}}
- \setcounter{tocdepth}{3}
- \setcounter{secnumdepth}{3}
- \renewcommand\thesection{%
- \@arabic\c at section}
- \renewcommand\thesubsection{%
- \thesection.\@arabic\c at subsection}
- \renewcommand\thesubsubsection{%
- \thesubsection.\@arabic\c at subsubsection}
- \renewcommand\theparagraph{%
- \thesubsubsection.\@arabic\c at paragraph}
- \renewcommand\thesubparagraph{%
- \theparagraph.\@arabic\c at subparagraph}
+{\noexpand\chapter level is undefined
+using 'structure=article'}
+{\noexpand\chapter level is undefined
+using 'structure=article'}}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\renewcommand\thesection{%
+\@arabic\c at section}
+\renewcommand\thesubsection{%
+\thesection.\@arabic\c at subsection}
+\renewcommand\thesubsubsection{%
+\thesubsection.\@arabic\c at subsubsection}
+\renewcommand\theparagraph{%
+\thesubsubsection.\@arabic\c at paragraph}
+\renewcommand\thesubparagraph{%
+\theparagraph.\@arabic\c at subparagraph}
+\renewcommand\part{%
\ifsuftesi at partpage
- \relax
- \else
- \titleclass{\part}{straight}
- \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
+\if at openright
+\cleardoublepage
+\else
+\clearpage
\fi
-\ifsuftesi at numparpart
-\titleformat{\part}[display]
- {\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}
+\thispagestyle{plain}%
+\fi
+\if at twocolumn
+\onecolumn
+\@tempswatrue
\else
-\titleformat{\part}[hang]
- {\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}
+\@tempswafalse
\fi
+\ifsuftesi at partpage
+\null\vfil
+\fi
+\secdef\@part\@spart}
+\fi
+
+\def\@part[#1]#2{%
+\ifnum \c at secnumdepth >-2\relax
+\refstepcounter{part}%
+\addcontentsline{toc}{part}{\normalfont\normalsize
+\SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
+\SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
\else
+\addcontentsline{toc}{part}{\normalfont\normalsize
+\SUF at tocPART@font#1}%
+\fi
+\markboth{}{}%
+{\SUF at lr@PARTSwitch\SUF at partsize
+\interlinepenalty \@M
+\ifnum \c at secnumdepth >-2\relax
+\noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
\ifsuftesi at numparpart
-\titleformat{\part}[display]
- {\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}
+\par
+\vskip2ex
\else
-\titleformat{\part}[hang]
- {\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}
+\hspace{1em}
\fi
+\noindent\SUF at PART@StyleSwitch#2\par}%
+\@endpart}
+
+\def\@spart#1{%
+{\SUF at lr@PARTSwitch\SUF at partsize
+\interlinepenalty \@M
+\noindent\SUF at PART@StyleSwitch#1\par}%
+\@endpart}
+
+\ifsuftesi at article
+\def\@endpart{%
+\ifsuftesi at partpage
+\vfil\newpage
+\if at twoside
+\if at openright
+\null
+\thispagestyle{empty}%
+\newpage
\fi
-
+\fi
+\fi
+\if at tempswa
+\twocolumn
+\fi}
+\else
+\def\@endpart{\vfil\newpage
+\if at twoside
+\if at openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if at tempswa
+\twocolumn
+\fi}
+\fi
\titleformat{\paragraph}[runin]
{}
{\theparagraph}
@@ -1670,68 +1727,64 @@
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
- \section*{#1}%
- \markboth{#1}{#1}}
- \defbibheading{shorthands}[\losname]{%
- \section*{#1}%
- \markboth{#1}{#1}}
+\section*{#1}%
+\@mkboth{#1}{#1}}
+ \defbibheading{biblist}[\biblistname]{%
+\section*{#1}%
+\@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \markboth{#1}{#1}}
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\@mkboth{#1}{#1}}
+ \defbibheading{biblistintoc}[\biblistname]{%
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
- \section{#1}%
- \if at twoside\markright{#1}\fi}
- \defbibheading{losnumbered}[\losname]{%
- \section{#1}%
- \if at twoside\markright{#1}\fi}
+\section{#1}}
+ \defbibheading{biblistnumbered}[\biblistname]{%
+\section{#1}}
\defbibheading{subbibliography}[\refname]{%
- \subsection*{#1}}
+\subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
- \subsection*{#1}%
- \addcontentsline{toc}{subsection}{#1}}
+\subsection*{#1}%
+\addcontentsline{toc}{subsection}{#1}}
\defbibheading{subbibnumbered}[\refname]{%
- \subsection{#1}}}%
- {\relax}%
+\subsection{#1}}
}%
+{\relax}}
\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
- \chapter*{#1}%
- \markboth{#1}{#1}}
- \defbibheading{shorthands}[\losname]{%
- \chapter*{#1}%
- \markboth{#1}{#1}}
+\chapter*{#1}%
+\@mkboth{#1}{#1}}
+ \defbibheading{biblist}[\biblistname]{%
+\chapter*{#1}%
+\@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\bibname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \markboth{#1}{#1}}
+\chapter*{#1}%
+\addcontentsline{toc}{chapter}{#1}%
+\@mkboth{#1}{#1}}
+ \defbibheading{biblistintoc}[\biblistname]{%
+\chapter*{#1}%
+\addcontentsline{toc}{chapter}{#1}%
+\@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
- \chapter{#1}%
- \if at twoside\markright{#1}\fi}
- \defbibheading{losnumbered}[\losname]{%
- \chapter{#1}%
- \if at twoside\markright{#1}\fi}
+\chapter{#1}}
+ \defbibheading{biblistnumbered}[\biblistname]{%
+\chapter{#1}}
\defbibheading{subbibliography}[\refname]{%
- \section*{#1}%
- \if at twoside\markright{#1}\fi}
+\section*{#1}%
+\if at twoside\markright{#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \if at twoside\markright{#1}\fi}
+\section*{#1}%
+\addcontentsline{toc}{section}{#1}%
+\if at twoside\markright{#1}\fi}
\defbibheading{subbibnumbered}[\refname]{%
- \section{#1}}}
- {\relax}%
+\section{#1}}
}%
+{\relax}}
\fi
\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
@@ -2243,9 +2296,6 @@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\RequirePackage{appendix}
-\renewcommand{\appendixpagename}{Appendici}
-\renewcommand{\appendixtocname}{Appendici}
-\renewcommand{\appendixname}{Appendice}
\noappendicestocpagenum
\def\appendicesname{%
\ClassError{suftesi}%
@@ -2405,8 +2455,8 @@
\fancyhf{}%
\fancyfoot[RE,LO]{%
\ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
- \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF at rightmark}
- \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+ \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+ \fancyhead[CE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
\fancyfoot[C]{\footnotesize\SUF at thepage}%
}%
@@ -2415,8 +2465,8 @@
\fancyfoot[RE,LO]{%
\ifsuftesi at draftdate\footnotesize\SUF at versionstring\else\fi}
\fancyhead[LE,RO]{\footnotesize\SUF at thepage}
- \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF at rightmark}
- \fancyhead[RE]{\footnotesize\xheadbreakfalse%
+ \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
+ \fancyhead[RE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
}%
\ifsuftesi at article
@@ -2662,14 +2712,6 @@
\setlength\SUF at label@tab
{\SUF at label@sec}
}
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname\hspace*{.5em}}
- {\makebox[\SUF at label@part][l]{%
- \thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
\ifsuftesi at pagelefttoc
\contentsmargin{0pt}
\AtBeginDocument{
@@ -3057,6 +3099,36 @@
\if at restonecol\twocolumn\fi
}
\fi
+\newcommand{\tocpartname}[1]{\def\SUF at tocpartname{#1}}
+ \tocpartname{\partname}
+\newcommand{\partfont}[1]{\def\SUF at PART@StyleSwitch{#1}}
+\newcommand{\chapfont}[1]{\def\SUF at CHAP@StyleSwitch{#1}}
+\newcommand{\secfont}[1]{\def\SUF at SEC@StyleSwitch{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF at SUBSEC@StyleSwitch{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF at SUBSUBSEC@StyleSwitch{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF at PART@font{#1}}
+ \partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF at thechapter{#1}}
+\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{\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}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF at tocPARTnum@font{#1}}
+ \tocpartnumfont{}
+\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}}
\ifsuftesi at article
\def\chapterintro{%
\ClassError{suftesi}
@@ -3073,22 +3145,32 @@
\newcommand{\chapterintroname}[1]{\def\SUF at fchapterintroname{#1}}
\chapterintroname{Introduzione}
\fi
-\newif\ifheadbreak\headbreakfalse
- \DeclareRobustCommand{\headbreak}
- {\ifheadbreak\\\else\fi}
-\newif\ifxheadbreak\xheadbreaktrue
- \def\xheadbreakNL{\ifxheadbreak\newline\else\fi}
- \def\xheadbreakBB{\ifxheadbreak\\\else\fi}
+\newif\ifbreakintoc\breakintocfalse
+\newif\ifbreakinbody\breakinbodytrue
+\DeclareRobustCommand{\breakintoc}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\breakinbody}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\breakinbodyleft}
+ {\ifbreakinbody\newline\else\fi}
\let\origtableofcontents\tableofcontents
- \renewcommand{\tableofcontents}{%
- \begingroup\headbreaktrue\xheadbreakfalse%
- \origtableofcontents\endgroup}
+\renewcommand{\tableofcontents}{%
+ \begingroup
+ \breakintoctrue\breakinbodyfalse%
+ \origtableofcontents
+ \endgroup}
+\DeclareRobustCommand{\headbreak}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+ {\ifbreakinbody\newline\else\fi}
\newenvironment{bibliografia}{%
\ifsuftesi at article
\section*{\refname}
\addcontentsline{toc}{section}{\refname}
\else
- \chapter{\bibname}%
+ \chapter{\bibname}%
\fi
\normalfont \list{}{%
\setlength{\itemindent}{-\parindent}
More information about the tex-live-commits
mailing list.