summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-02 22:45:43 +0000
committerKarl Berry <karl@freefriends.org>2012-09-02 22:45:43 +0000
commit5842ef917f7cbd5553126d78cfab16ebb0ca4e8f (patch)
tree9f1c9b817708fe6f63ef5de02adeeb7e976f61bb /Master/texmf-dist/source/latex/suftesi
parent2878c13fb8496ecd8f401ed4102176941c485292 (diff)
suftesi (31aug12)
git-svn-id: svn://tug.org/texlive/trunk@27575 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/suftesi')
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.dtx2913
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.ins32
2 files changed, 2273 insertions, 672 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index c299e599486..c8afabc9651 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,42 +23,36 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2012/04/22 v0.9 A class for typesetting theses, books and articles]
+ [2012/08/31 v0.9a A class for typesetting theses, books and articles]
%</class>
%<*driver>
-\PassOptionsToClass{a4paper}{article} % we need a4paper
+\PassOptionsToClass{a4paper}{article}
\documentclass{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[polutonikogreek,english]{babel}
\let\cs\relax
\let\cmd\relax
+%\usepackage[paperwidth=17cm,paperheight=24cm,right=1cm,left=3cm]{geometry}
\usepackage{ltxdockit}
-\usepackage{fourier}
-\usepackage{xcolor}
-\usepackage{graphicx}
\usepackage{array,booktabs,multirow}
\usepackage{microtype}
\usepackage{siunitx}
+\usepackage{pdfpages}
\usepackage{metalogo}
-\usepackage[suftesi]{frontespizio}
\usepackage[style=philosophy-classic]{biblatex}
-\addbibresource{suftesi.bib}
-
+ \addbibresource{suftesi.bib}
+\usepackage[suftesi]{frontespizio}
\usepackage{hyperref}
\hypersetup{%
- pdftitle={User's Guide to \sty{suftesi}},
- pdfsubject={A document class for typesetting theses, books and articles},
+ pdftitle={User's Guide to \textsf{suftesi}},
+ pdfsubject={A document class for typesetting theses,
+ books and articles},
pdfauthor={Ivan Valbusa},
pdfkeywords={thesis, humanities, books},
citecolor=spot}
-\newcommand{\ttchar}[1]{{\normalfont\ttfamily\char`#1}}
-\newcommand{\frontoption}[1]{\subsection*{\texttt{#1}}}
-\newcommand{\includeex}[1]{\par\vfill\begin{center}
- \setlength{\fboxsep}{0pt}\fbox{\includegraphics[scale=.3]{#1}}
- \end{center}}
-
+\newcommand{\new}{}%
\DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{#1\char`\}}}
\DeclareRobustCommand*{\oar}[1]{\texttt{[#1]}}
\DeclareRobustCommand*{\meta}[1]{%
@@ -84,13 +78,15 @@
\EnableCrossrefs
\CodelineIndex
\RecordChanges
+
\begin{document}
\DocInput{suftesi.dtx}
\end{document}
+%
%</driver>
% \fi
%
-% \CheckSum{1747}
+% \CheckSum{2826}
%
% \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
@@ -108,7 +104,45 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \changes{v0.9a}{2012/05/05}{Changed code for toc, lot and lof elements}
+% \changes{v0.9a}{2012/08/31}{Added \option{inline} option to
+% \sty{enumitem} package. Deleted \opt{centertitle} to \opt{centerchap}.
+% New command \cmd{toclabelspace}. Renamed \opt{sctitles} to
+% \opt{scstyle(1-12)}. Changed code for toc, lot and lof elements.
+% Added options:
+% \opt{tocpageleft},
+% \opt{defaultparindent},
+% \opt{standardfootnote},
+% \opt{dottedfootnote},
+% \opt{alignlist},
+% \opt{indentlist},
+% \opt{ralignquotation},
+% \opt{smallquotation},
+% \opt{romanchap},
+% \opt{centerpart},
+% \opt{centerchap},
+% \opt{centersec},
+% \opt{rightpart},
+% \opt{rightchap},
+% \opt{rightsec},
+% \opt{numparpart},
+% \opt{numparchap},
+% \opt{numparsec},
+% \opt{smallcapspart},
+% \opt{smallcapschap},
+% \opt{smallcapssec},
+% \opt{italicpart},
+% \opt{italicchap},
+% \opt{italicsec},
+% \opt{italicsubsec},
+% \opt{romanchap},
+% \opt{dottedpart},
+% \opt{dottedchap},
+% \opt{italicheader},
+% \opt{smallcapsheader},
+% \opt{rmstyle(1-6)},
+% \opt{itstyle(1-12)},
+% \opt{scstyle(1-12)}.
+% }
% \changes{v0.9}{2012/04/22}{Added \opt{dottedtoc} and \opt{raggedtoc} options. Improved compatibility with \sty{mathspec}}
% \changes{v0.8}{2012/03/19}{Added macro for using \sty{frontespizio} package with \opt{compact} and \opt{supercompact} options. Added option \opt{periodical}. Renewed \cmd{title} command}
% \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template}
@@ -121,7 +155,7 @@
% included in the package \sty{frontespizio}. New command \cmd{chapnumfont}.
% Added options \opt{article}, \opt{fullplain}, \opt{elements}, \opt{sufelements},
% \opt{supercompact}, \opt{compact}, \opt{nocrop}, \opt{nomarginpar}.
-% Changed option \opt{sctitles}.}
+% Changed option \opt{Roma}.}
% \GetFileInfo{suftesi.dtx}
%
% \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ }
@@ -158,13 +192,12 @@
% \begin{abstract}
% The \sty{suftesi}
% class
-% provides a set of page layouts, title styles and heading styles for
-% typesetting theses, books and articles. It is based on the standard
+% provides a set of page layouts, title styles and heading styles to
+% typeset theses, books and articles. It is based on the standard
% \sty{book} class and inspired by the works of
% \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
% \textcite{Morison:1111}. See the template file \file{tesi.tex} in the \file{example} folder.
% \end{abstract}
-%
% \tableofcontents
%
% \section*{Note on copyright}
@@ -212,10 +245,10 @@
%
% The standard document classes allow you to typeset beautiful
% documents but their layout is quite far from the stylistic requests
-% of some humanists (especially italian). The styles provided by
-% \sty{suftesi} are very simple and sober, and also have the aim of
-% finding in the formal simplicity an aesthetic harmony. They are
-% largely inspired by some beautiful readings, particularly
+% of some humanists (mainly Italian). The styles provided by
+% \sty{suftesi} are very simple and sober and also have the aim of
+% finding an aesthetic harmony in its formal simplicity. They are
+% largely inspired by some interesting readings, particularly
% \textcite{Bringhurst:1996}, \textcite{Tschichold:1975} and
% \textcite{Morison:1111}. Table~\ref{tab:gabbia} summarizes the main
% features of the styles provided by \sty{suftesi}.
@@ -243,24 +276,25 @@
% \subsection{Font}
%
% The default font for body text is
-% Palatino designed by Hermann Zapf\index{Zapf, Hermann}.\footnote{Using \XeLaTeX{}
-% the \LaTeX{} default font is loaded and the font options are turned off.}
+% Palatino designed by Hermann Zapf\index{Zapf, Hermann}.Using
+% \XeLaTeX{},
+% the \LaTeX{} default font is loaded and the font options are turned off.
% The sans serif font is Iwona designed by Janusz M.~Nowacki\index{Nowacki, Janusz M.}.
-% This choice is inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}.
+% This choice has been inspired by \emph{L'arte di scrivere con \LaTeX{}} \parencite{Pantieri:2011}.
%
% \subsubsection{Using different fonts}
%
% If you prefer to use other fonts (such as those provided by \sty{fourier},
-% \sty{lmodern} or \sty{libertine} packages), remember to load the class option \opt{defaultfont},
+% \sty{lmodern} or \sty{libertine} packages), remember to load the \opt{defaultfont} class option
% which turns off the \sty{suftesi}{} font settings. Moreover pay particular attention
-% in choosing the greek font.
+% in choosing the Greek font.
%
% \subsubsection{Greek alphabet}
%
-% The default font for the greek text is Artemisia by the Greek Font Society,
-% which is very suitable for Palatino:
+% The default font for the Greek text is Artemisia by the Greek Font Society
+% which is particularly suitable for Palatino:
% \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
% \begin{otherlanguage*}{polutonikogreek}%
% \fontfamily{artemisia}\selectfont
% Pr`epei na skeftoume mia
@@ -271,7 +305,7 @@
% \end{quotation}
% With the \opt{porson} option you can use the Porson font by the Greek Font Society:
% \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
% \begin{otherlanguage*}{greek}%
% \fontfamily{porson}\selectfont
% Prepei na skeftoume mia
@@ -284,7 +318,7 @@
% font:\footnote{This option is also activated by the \opt{defaultfont} option
% (see section \ref{sec:options}).}
% \begin{quotation}
-% Alla Natura che ogni cosa dona e ogni cosa riprende \dots{}
+% Alla Natura che ogni cosa dona e ogni cosa riprende\dots%
% \begin{otherlanguage*}{greek}%
% \fontfamily{lmr}\selectfont
% Prepei na skeftoume mia
@@ -296,75 +330,166 @@
%
% \subsection{Frontispiece}
%
-% The class has a original frontispiece now directly available loading the
+% The class has an original frontispiece now directly available loading the
% \sty{frontespizio} package \parencite{Gregorio:frontespizio}\footnote{Version 1.4 or later.}
-% with the \opt{suftesi} option (see the template file \file{tesi.tex} in the \file{example} folder):
+% with the \opt{suftesi} option (see the \file{tesi.tex} template file in the \file{example} folder):
% \begin{ttquote}
% \cmd{usepackage}[suftesi]\ar{frontespizio}
% \end{ttquote}
%
-%\section{Options}\label{sec:options}
+% \section{Options}\label{sec:options}
%
%In addition to the options defined by the \sty{book} document class, \sty{suftesi} accepts the following new options.
%
-%\subsection{Page layout}
-%
+% \subsection{Page layouts}
% \begin{ltxsyntax}
-% \optitem{dottedtoc} Prints a standard table of contents with dotted lines.
-% \optitem{raggedtoc} Aligns the table of contents on the left as \textcite{Bringhurst:1996} suggests.
-% \optitem{compact}
-% Prints a typeblock of $16 \si{cm} \times 24 \si{cm}$ on a A4 paper,
+% \optitem{periodical}
+% Prints a typeblock of $17 \si{cm} \times 24 \si{cm}$ on an A4 paper,
% showing the crop marks (see table \ref{tab:gabbia} for details).
-% The \cmd{crop[off]} command turns off the crop marks.
+% This style is expecially meant for theses.
+% The \opt{nocrop} option disables the crop marks.
+% \optitem{compact}
+% The same as \opt{periodical} but with a typeblock of $16 \si{cm} \times 24 \si{cm}$ (see table \ref{tab:gabbia} for details).
% \optitem{supercompact} The same as \opt{compact} but with a typeblock
% of $14 \si{cm} \times 21 \si{cm}$ (see table \ref{tab:gabbia} for details).
-% \optitem{periodical}
-% The same as \opt{compact} but with a typeblock of $17 \si{cm} \times 24 \si{cm}$ (see table \ref{tab:gabbia} for details). This style is expecially thought for theses.
% \optitem{elements}
% Reproduces the layout of \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996}
% (see table \ref{tab:gabbia} for details).
-% \optitem{nocrop}
-% Prints a \textsc{pdf} with page dimensions according to the \opt{compact},
-% \opt{supercompact} and \opt{elements} options.
-% \optitem{nomarginpar} Disables the \cmd{marginpar} command.
-% This option is useful for the three ``compact'' layouts.
-% \optitem{11pt}
-% Sets the font size at $11\si{pt}$ and resizes the text block dimensions.
+% \end{ltxsyntax}
+% \subsection{Table of contents}
+% \begin{ltxsyntax}
+% \optitem{dottedtoc}
+% Prints a table of contents with dotted lines.
+% \optitem{raggedtoc}
+% Aligns the table of contents on the left as suggested by
+% \textcite{Bringhurst:1996}.\new{}
+% \optitem{tocpageleft} Prints the page numbers on the left margin.\new{}
+% \end{ltxsyntax}
+%\clearpage
+% \vbox{
+% \begin{frontespizio}
+%\Logo{fakelogo}
+%\Istituzione{University of St.\ Anford}
+%\Divisione{Department of Typography}
+%\Scuola{Ph.D. degree in \TeX{} and \LaTeX{}}
+%\Titolo{How to prepare a\\
+% formal frontispiece}
+%\Sottotitolo{Theory and practice}
+%\NCandidato{Candidate}
+%\Candidato{Enrico Gregorio}
+%\NRelatore{Thesis advisor}{}
+%\Relatore{Prof. R. J. Drofnats}
+%\NCorrelatore{Research supervisor}{Research supervisors}
+%\Correlatore{J. H. Quick}
+%\Correlatore{B. L. User}
+%\Piede{Thesis submitted in 2010}
+% \end{frontespizio}
+% }
+% \begin{picture}(0,0)
+% \setlength{\unitlength}{1cm}
+% \put (-3,-23) {The frontispiece of \sty{suftesi} is available loading the \sty{frontespizio} package with \opt{suftesi} option}
+% \put (-3.5,3) {\line(0,-24){25}}
+% \put (-3.5,3) {\line(10,0){16}}
+% \put (12.5,3) {\line(0,-24){25}}
+% \put (-3.5,-22) {\line(10,0){16}}
+% \end{picture}
+% \clearpage
+% \subsection{Footnotes, lists, quotations}
+% \begin{ltxsyntax}
+% \optitem{standardfootnote}
+% Prints a standard superscript footnote \new
+% \optitem{dottedfootnote}
+% Prints a footnote number followed by a dot\new
+% \optitem{indentlist}
+% Prints standard indented lists\new
+% \optitem{alignlist}
+% Aligns the lists to the left margin\new
+% \optitem{ralignquotation}
+% Prints the block quotations indented
+% only on the left margin\new
+% \optitem{smallquotation}
+% Prints the block quotations
+% in \cmd{small} size
+% \optitem{defaultparindent}
+% Set |\parinden| to the standard value of 1.5\,em.\new
% \end{ltxsyntax}
%
-%\subsection{Titles and headings}
-%
+% \subsection{Titles}
+% In the following options \texttt{<level>} stands for \opt{part},
+% \opt{chap}, \opt{sec}, \opt{subsec},\opt{subsubsec}
% \begin{ltxsyntax}
-% \optitem{sctitles}
-% Prints the headings and the chapter (section) titles in small caps.
-% \optitem{centertitle}
-% Centers the chapter title and number, with the chapter title below the number.
-% \optitem{sufelements}
-% Loads the \opt{sctitles} class option and prints the chapter numbers according to
-% the \opt{elements} option.
-% \optitem{centerheadings}
-% Prints the page number in the center of the footer, the string ``Chapter $n$''
-% in the header of even pages and the chapter title in the header of odd pages.
-% \optitem{sufplain}
-% Prints no headers and puts the page number in the center of the footer.
+% \optitem{centerpart}
+% Centers the title of the part\new{}
+% \optitem{centerchap}
+% Centers the title of the chapter\new{}
+% \optitem{centersec}
+% Centers the title of the section\new{}
+% \optitem{rightpart}
+% Prints the title of the part on the right\new{}
+% \optitem{rightchap}
+% Prints the title of the chapter on the right\new{}
+% \optitem{rightsec}
+% Prints the title of the section on the right\new{}
+% \optitem{numparpart}
+% Prints the part number below the part title\new
+% \optitem{numparchap}
+% Prints the chapter number below the chapter title\new
+% \optitem{numparsec}
+% Prints the section number below the section title\new
+% \optitem{smallcapspart}
+% Prints the part title in small caps \new{}
+% \optitem{smallcapschap}
+% Prints the chapter title in small caps \new{}
+% \optitem{smallcapssec}
+% Prints the section title in small caps \new{}
+% \optitem{italicpart}
+% Prints the part title in italic \new{}
+% \optitem{italicchap}
+% Prints the chapter title in italic \new{}
+% \optitem{italicsec}
+% Prints the section title in italic \new{}
+% \optitem{italicsubsec}
+% Prints the subsection title in italic \new{}
+% \optitem{romanchap}
+% Prints the number of the chapter in roman numbers\new{}
+% \optitem{dottedpart}
+% Prints a dot after the number of the part\new{}
+% \optitem{dottedchap}
+% Prints a dot after the number of the chapter\new{}
+% \end{ltxsyntax}
+% \subsection{Headings}
+% \begin{ltxsyntax}
+% \optitem{italicheader}
+% Prints the header of both even and odd pages in italic \new
+% \optitem{smallcapsheader}
+% Prints the header of both even and odd pages
+% in small caps \new
+% \optitem{centerheader}
+% Centers the header and footer
+% \optitem{sufplain / plain}
+% Prints no header and puts the page number in the center of
+% the footer
% \optitem{authortitle}
-% Changes the content of the headings. It prints the author's name on the even
-% numbered pages and the title on the odd ones. This option can be combined
-% with the other options seen above. In order to use this option the \cmd{title} and
-% \cmd{author} commands are required.
+% Changes the content of the headers. It prints the author's name
+% on the even pages and the title on the odd ones.
+% This option can be combined with the other options seen above.
+% In order to use this option the \cmd{title} and
+% \cmd{author} commands are required
% \optitem{article}
-% This option is aimed to typeset articles or short theses (that is to say without chapter divisions)
-% in a two side document.
+% Similar to defaull page style but with section tile on both
+% even and odd pages. It is particularly suitable to typeset articles
+% or short theses (that is without chapter division)
+% in a two side documen
% \optitem{bozza}
% Prints the following note in the footer:
% \begin{quote}
% Version of \meta{date}
% \end{quote}
-% \optitem{plain}
-% An older name of the \opt{centerheadings} option. Disabled since version 0.6.
-% \optitem{fullplain} An older name of the \opt{sufplain} option. Disabled since version 0.6.
+% \optitem{sufelements}
+% Loads the \opt{smallcapsheader}, \opt{smallcapschap},
+% \opt{smallcapssec} options and prints the chapter
+% number in the style of the \opt{elements} option.
% \end{ltxsyntax}
-%
%\subsection{Fonts}
%
% \begin{ltxsyntax}
@@ -372,17 +497,48 @@
% \optitem{porson} Loads the Porson font.
% \optitem{defaultgreek} Loads the standard CB~Greek font.
% \optitem{defaultfont} Loads the \LaTeX{} standard font and set the \cmd{baselineskip} to the standard default.
-% \optitem{disablefront}
-% Disabled since version 0.5.
% \end{ltxsyntax}
%
-% \section{Commands}\label{sec:commands}
+% \paragraph{Other options}
+% \begin{ltxsyntax}
+% \optitem{nocrop}
+% Prints a \textsc{pdf} with page dimensions according to the
+% \opt{periodical}, \opt{compact}, \opt{supercompact} and
+% \opt{elements} options.
+% \optitem{nomarginpar} Disables the \cmd{marginpar} command.
+% This option is useful for the three ``compact'' layouts.
+% \optitem{11pt}
+% Sets the font size at $11\si{pt}$ and resizes the
+% text block dimensions.
+% \optitem{12pt}
+% Sets the font size at $12\si{pt}$ and resizes the
+% text block dimensions.
+% \end{ltxsyntax}
+%
+% \subsection{Pre-defined styles}
+% \begin{ltxsyntax}
+% \optitem{rmstyle(1-6)}
+% The titles of chapters and headers are printed in roman.
+% The number of the chapter is on the same line in styles 1-3 and above
+% the title in styles 4-6.
+% The title can be printed on the left (styles 1 and 4), in the center (styles 2 and 5) or on the right (styles 3 and 6) (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% \optitem{itstyle(1-12)}
+% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic} in styles 1-6 and in \textsc{small caps} in styles 7-12.
+% There are three position for the title and two positions for the number as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% \optitem{scstyle(1-12)}
+% The titles of chapters and headers are in \textsc{small caps}. The title of the section is in \emph{italic} in styles 1-6 and in \textsc{small caps} in styles 7-12.
+% There are three position for the title and two positions for the chapter as above (see pages \begingroup\addtocounter{page}{1}\pageref{predefined-styles}-\endgroup).
+% \end{ltxsyntax}
+% You can get up to 120 variants combining these styles
+% with \opt{dottedchap} and \opt{romanchap} options.
+%
+% \section{New commands}\label{sec:commands}
%
% The class defines the following new commands.
%
% \begin{ltxsyntax}
%
-% \cmditem{title}[short title for headings]{complete title for titlepage}
+% \cmditem{title}[short title for headers]{complete title for titlepage}
%
% This command is for use with option \opt{authortitle} if the title is too long
% or has some breaks.
@@ -390,11 +546,11 @@
%
% \cmditem{colophon}[OS]{name and surname}{additional info}
%
-% This command is provided only for italian documents. It prints a page with
+% This command is provided only for Italian documents. It prints a page with
% a copyright notice and the colophon in the bottom. For different languages
% use the \cmd{bookcolophon} instead (see below).
%
-% If you don't like the copyright notice leave the second argument of
+% If you don't like the copyright notice, leave the second argument of
% the command empty:
% \begin{ttquote}
% \cmd{colophon\oarm{OS}\{\}\arm{additional info}}
@@ -404,7 +560,8 @@
% (see below)
% or the \cmd{thanks} command:
% \begin{ttquote}
-% \cmd{author}\{\meta{Name Surname}\cmd{thanks}\{This work has been typeset with \LaTeX{},\\
+% \cmd{author}\{\meta{Name Surname}\\
+% \cmd{thanks}\{This work has been typeset with \LaTeX{},\\
% using the \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\}
% \end{ttquote}
%
@@ -424,7 +581,7 @@
%
% \cmditem{artcolophon}{copyright notice, attribution and other informations}
%
-% This command has only one argument. It simply prints its content at the
+% This command only has one argument. It simply prints its content at the
% bottom of the page. Here is an example:
%
% \begin{verbatim}
@@ -443,12 +600,12 @@
% \cmditem{finalcolophon}{colophon content}
%
% The same as \cmd{artcolophon}, but centering its content at the
-% top of the page. It is aimed to typeset a classical \emph{colophon}
+% top of the page. It is aimed at typesetting a classical \emph{colophon}
% at the end of the work.
%
% \cmditem{chapterintro}
%
-% Prints an unnumbered introduction at the beginning of the chapters,
+% Prints an unnumbered introduction at the beginning of the chapter,
% with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
%
% \cmditem{chapterintroname}{name}\hfill(default=\texttt{Introduzione})
@@ -461,40 +618,51 @@
%
% \cmditem{headbreak}
%
-% A manual break which is active for the table of contents but not in the text or in the headings
+% A manual break which is active for the table of contents but not in the text or in the headers.
%
% \cmditem{xheadbreak}
%
-% A manual break which is active in the text and in the headings but not in the table of contents.
+% A manual break which is active in the text and in the headers but not in the table of contents.
%
% \cmditem{chapnumfont}{name}
%
-% Sets the font for the chapter number with the \opt{sufelements} option.
+% Sets the font for the number of the chapter (only with the \opt{sufelements} option).
% The default is ``\texttt{pplj}'' (\LaTeX) or ``Palatino'' (\XeLaTeX).
-% \end{ltxsyntax}
+%
+% \cmditem{toclabelspace}{level}{label-width}\new
%
+% Sets the width of \cmd{thecontentslabel}. The default values are:
+% \begin{verbatim}
+% \toclabelwidth{part}{1em}
+% \toclabelwidth{chapter}{1em}
+% \toclabelwidth{section}{1.5em}
+% \toclabelwidth{subsection}{2em}
+% \toclabelwidth{subsubsection}{2.5em}
+% \toclabelwidth{paragraph}{3em}
+% \toclabelwidth{subparagraph}{3.5em}
+% \end{verbatim}
+% \end{ltxsyntax}
+% \appendix
+% \label{predefined-styles}
+% \includepdf[pages=1-]{collect-examples}
% \defbibnote{note}{\sffamily This bibliography has been typeset with
% the \sty{biblatex-philosophy} styles, created by the same author of this class.}
% \addcontentsline{toc}{section}{\refname}
% \printbibliography[prenote=note]
%
% \StopEventually{\PrintChanges\PrintIndex}
-%
% \section{The Code}
%<*class>
% \begin{macrocode}
-\newif\ifsuftesi@centertitle
-\newif\ifsuftesi@sctitles
\newif\ifsuftesi@artemisia
\newif\ifsuftesi@porson
-\newif\ifsuftesi@defaultfont
\newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@centerheadings
+\newif\ifsuftesi@defaultfont
+\newif\ifsuftesi@centerheader
\newif\ifsuftesi@sufplain
\newif\ifsuftesi@bozza
\newif\ifsuftesi@article
\newif\ifsuftesi@authortitle
-\newif\ifsuftesi@nofront
\newif\ifsuftesi@periodical
\newif\ifsuftesi@compact
\newif\ifsuftesi@supercompact
@@ -504,53 +672,370 @@
\newif\ifsuftesi@nomarginpar
\newif\ifsuftesi@dottedtoc
\newif\ifsuftesi@raggedtoc
-\DeclareOption{centertitle}{\suftesi@centertitletrue}
-\DeclareOption{sctitles}{\suftesi@sctitlestrue}
-\DeclareOption{disablefront}{\suftesi@nofronttrue}
-\DeclareOption{defaultfont}{\suftesi@defaultfonttrue\suftesi@defaultgreektrue}
-\DeclareOption{artemisia}{\suftesi@artemisiatrue\suftesi@porsonfalse
- \suftesi@defaultgreekfalse}
-\DeclareOption{porson}{\suftesi@porsontrue\suftesi@artemisiafalse
- \suftesi@defaultgreekfalse}
-\DeclareOption{defaultgreek}{\suftesi@defaultgreektrue
- \suftesi@artemisiafalse\suftesi@porsonfalse}
-\DeclareOption{centerheadings}{\suftesi@centerheadingstrue}
-\DeclareOption{sufplain}{\suftesi@sufplaintrue}
-\DeclareOption{bozza}{\suftesi@bozzatrue}
-\DeclareOption{periodical}{\suftesi@periodicaltrue\suftesi@compacttrue}
-\DeclareOption{compact}{\suftesi@compacttrue}
-\DeclareOption{supercompact}{\suftesi@supercompacttrue}
-\DeclareOption{elements}{\suftesi@elementstrue\suftesi@sufelementstrue
-\suftesi@supercompactfalse\suftesi@compactfalse}
-\DeclareOption{sufelements}{\suftesi@sufelementstrue\suftesi@sctitlestrue}
-\DeclareOption{nocrop}{\suftesi@nocroptrue}
-\DeclareOption{nomarginpar}{\suftesi@nomarginpartrue}
-\DeclareOption{article}{\suftesi@articletrue}
-\DeclareOption{authortitle}{\suftesi@authortitletrue}
-\DeclareOption{dottedtoc}{\suftesi@dottedtoctrue}
-\DeclareOption{raggedtoc}{\suftesi@raggedtoctrue}
+\newif\ifsuftesi@tocpageleft
+\newif\ifsuftesi@defaultparindent
+\newif\ifsuftesi@standardfootnote
+\newif\ifsuftesi@dottedfootnote
+\newif\ifsuftesi@alignlist
+\newif\ifsuftesi@indentlist
+\newif\ifsuftesi@ralignquotation
+\newif\ifsuftesi@smallquotation
+\newif\ifsuftesi@romanchap
+\newif\ifsuftesi@centerpart
+\newif\ifsuftesi@centerchap
+\newif\ifsuftesi@centersec
+\newif\ifsuftesi@centersubsec
+\newif\ifsuftesi@rightpart
+\newif\ifsuftesi@rightchap
+\newif\ifsuftesi@rightsec
+\newif\ifsuftesi@rightsubsec
+\newif\ifsuftesi@centersubsubsec
+\newif\ifsuftesi@rightsubsubsec
+\newif\ifsuftesi@numparpart
+\newif\ifsuftesi@numparchap
+\newif\ifsuftesi@numparsec
+\newif\ifsuftesi@numparsubsec
+\newif\ifsuftesi@numparsubsubsec
+\newif\ifsuftesi@dottedpart
+\newif\ifsuftesi@dottedchap
+\newif\ifsuftesi@italicpart
+\newif\ifsuftesi@italicchap
+\newif\ifsuftesi@italicsec
+\newif\ifsuftesi@italicsubsec
+\newif\ifsuftesi@italicsubsubsec
+\newif\ifsuftesi@smallcapspart
+\newif\ifsuftesi@smallcapschap
+\newif\ifsuftesi@smallcapssec
+\newif\ifsuftesi@smallcapssubsec
+\newif\ifsuftesi@smallcapssubsubsec
+\newif\ifsuftesi@italicLhead
+\newif\ifsuftesi@italicRhead
+\newif\ifsuftesi@italicheader
+\newif\ifsuftesi@smallcapsRhead
+\newif\ifsuftesi@smallcapsLhead
+\newif\ifsuftesi@smallcapsheader
+\DeclareOption{defaultfont}{
+ \suftesi@defaultfonttrue
+ \suftesi@defaultgreektrue}
+\DeclareOption{artemisia}{
+ \suftesi@artemisiatrue
+ \suftesi@porsonfalse
+ \suftesi@defaultgreekfalse}
+\DeclareOption{porson}{
+ \suftesi@porsontrue
+ \suftesi@artemisiafalse
+ \suftesi@defaultgreekfalse}
+\DeclareOption{defaultgreek}{
+ \suftesi@defaultgreektrue
+ \suftesi@artemisiafalse
+ \suftesi@porsonfalse}
+\DeclareOption{centerheader}{
+ \suftesi@centerheadertrue}
+\DeclareOption{sufplain}{
+ \suftesi@sufplaintrue}
+\DeclareOption{bozza}{
+ \suftesi@bozzatrue}
+\DeclareOption{periodical}{
+ \suftesi@periodicaltrue
+ \suftesi@compacttrue}
+\DeclareOption{compact}{
+ \suftesi@compacttrue}
+\DeclareOption{supercompact}{
+ \suftesi@supercompacttrue}
+\DeclareOption{elements}{
+ \suftesi@elementstrue
+ \suftesi@sufelementstrue
+ \suftesi@articlefalse
+ \suftesi@smallcapschaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@raggedtoctrue
+ }
+\DeclareOption{sufelements}{
+ \suftesi@sufelementstrue
+ \suftesi@smallcapschaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@compactfalse
+ \suftesi@supercompactfalse}
+\DeclareOption{nocrop}{
+ \suftesi@nocroptrue}
+\DeclareOption{nomarginpar}{
+ \suftesi@nomarginpartrue}
+\DeclareOption{article}{
+ \suftesi@articletrue}
+\DeclareOption{authortitle}{
+ \suftesi@authortitletrue}
+\DeclareOption{dottedtoc}{
+ \suftesi@dottedtoctrue}
+\DeclareOption{raggedtoc}{
+ \suftesi@raggedtoctrue}
+\DeclareOption{tocpageleft}{
+ \suftesi@tocpagelefttrue}
+\DeclareOption{defaultparindent}{
+ \suftesi@defaultparindenttrue}
+\DeclareOption{standardfootnote}{
+ \suftesi@standardfootnotetrue}
+\DeclareOption{dottedfootnote}{
+ \suftesi@dottedfootnotetrue}
+\DeclareOption{alignlist}{
+ \suftesi@alignlisttrue}
+\DeclareOption{indentlist}{
+ \suftesi@indentlisttrue}
+\DeclareOption{ralignquotation}{
+ \suftesi@ralignquotationtrue}
+\DeclareOption{smallquotation}{
+ \suftesi@smallquotationtrue}
+\DeclareOption{centerpart}{
+ \suftesi@centerparttrue}
+\DeclareOption{centerchap}{
+ \suftesi@centerchaptrue}
+\DeclareOption{centersec}{
+ \suftesi@centersectrue}
+\DeclareOption{rightpart}{
+ \suftesi@rightparttrue}
+\DeclareOption{rightchap}{
+ \suftesi@rightchaptrue}
+\DeclareOption{rightsec}{
+ \suftesi@rightsectrue}
+\DeclareOption{numparpart}{
+ \suftesi@numparparttrue}
+\DeclareOption{numparchap}{
+ \suftesi@numparchaptrue}
+\DeclareOption{numparsec}{
+ \suftesi@numparsectrue}
+\DeclareOption{smallcapspart}{
+ \suftesi@smallcapsparttrue}
+\DeclareOption{smallcapschap}{
+ \suftesi@smallcapschaptrue}
+\DeclareOption{smallcapssec}{
+ \suftesi@smallcapssectrue}
+\DeclareOption{italicpart}{
+ \suftesi@italicparttrue}
+\DeclareOption{italicchap}{
+ \suftesi@italicchaptrue}
+\DeclareOption{italicsec}{
+ \suftesi@italicsectrue}
+\DeclareOption{italicsubsec}{
+ \suftesi@italicsubsectrue}
+\DeclareOption{romanchap}{
+ \suftesi@romanchaptrue}
+\DeclareOption{dottedpart}{
+ \suftesi@dottedparttrue}
+\DeclareOption{dottedchap}{
+ \suftesi@dottedchaptrue}
+\DeclareOption{italicheader}{
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{smallcapsheader}{
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{rmstyle1}{
+ \suftesi@italicsectrue}
+\DeclareOption{rmstyle2}{
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue}
+\DeclareOption{rmstyle3}{
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue}
+\DeclareOption{rmstyle4}{
+ \suftesi@italicsectrue
+ \suftesi@numparchaptrue}
+\DeclareOption{rmstyle5}{
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue
+ \suftesi@numparchaptrue}
+\DeclareOption{rmstyle6}{
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue
+ \suftesi@numparchaptrue}
+\DeclareOption{itstyle1}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle2}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle3}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle4}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@numparchaptrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle5}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue
+ \suftesi@numparchaptrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle6}{
+ \suftesi@italicchaptrue
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue
+ \suftesi@numparchaptrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle7}{
+ \suftesi@italicchaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicsubsectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle8}{
+ \suftesi@italicchaptrue
+ \suftesi@centerchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle9}{
+ \suftesi@italicchaptrue
+ \suftesi@rightchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle10}{
+ \suftesi@italicchaptrue
+ \suftesi@numparchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle11}{
+ \suftesi@italicchaptrue
+ \suftesi@centerchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{itstyle12}{
+ \suftesi@italicchaptrue
+ \suftesi@rightchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicLheadtrue
+ \suftesi@italicRheadtrue}
+\DeclareOption{scstyle1}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle2}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle3}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle4}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle5}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@centerchaptrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle6}{
+ \suftesi@smallcapschaptrue
+ \suftesi@italicsectrue
+ \suftesi@rightchaptrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle7}{
+ \suftesi@smallcapschaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle8}{
+ \suftesi@smallcapschaptrue
+ \suftesi@centerchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle9}{
+ \suftesi@smallcapschaptrue
+ \suftesi@rightchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle10}{
+ \suftesi@smallcapschaptrue
+ \suftesi@numparchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@smallcapssectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle11}{
+ \suftesi@smallcapschaptrue
+ \suftesi@centerchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+\DeclareOption{scstyle12}{
+ \suftesi@smallcapschaptrue
+ \suftesi@rightchaptrue
+ \suftesi@italicsubsectrue
+ \suftesi@numparchaptrue
+ \suftesi@smallcapssectrue
+ \suftesi@smallcapsLheadtrue
+ \suftesi@smallcapsRheadtrue}
+% \end{macrocode}
+% Execute options:
+% \begin{macrocode}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ExecuteOptions{artemisia}
+\ExecuteOptions{artemisia,rmstyle1}
\ProcessOptions
\relax
-\LoadClass[a4paper]{book}
% \end{macrocode}
-% \subsubsection{Basic packages}
+% \sty{suftesi} is based on the standard \sty{book} class!
+% \begin{macrocode}
+\LoadClass{book}
+% \end{macrocode}
+% \subsection{Basic packages}
% \begin{macrocode}
\RequirePackage{color}
\definecolor{sufred}{rgb}{0.5,0,0}
\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{ifxetex,ifluatex}
-\ifxetex\relax
- \else
- \RequirePackage{microtype}
- \fi
+\ifxetex
+ \relax
+ \else
+ \RequirePackage{microtype}
+\fi
\RequirePackage{textcase}
\RequirePackage{multicol}
\RequirePackage{emptypage}
\RequirePackage{mparhack}
% \end{macrocode}
-% \subsection{The greek font}
+% \subsection{Greek fonts}
% Thanks to Enrico Gregorio for these macros:
% \begin{macrocode}
\ifxetex
@@ -567,10 +1052,10 @@
\renewcommand{\sfdefault}{iwona}
\fi
\ifsuftesi@artemisia
- \def\suftesi@greekfamily{artemisiaeuler}
+ \def\SUF@greekfamily{artemisiaeuler}
\fi
\ifsuftesi@defaultgreek
- \def\suftesi@greekfamily{cmr}
+ \def\SUF@greekfamily{cmr}
\fi
\ifsuftesi@porson
\sbox\z@{\fontsize{10}{10}\normalfont A}
@@ -579,123 +1064,104 @@
\dimexpr(0.001\dimexpr\numexpr(\dimexpr(1000\ht\z@)/\ht\tw@)\p@)
\edef\art@scale{\strip@pt\dimen@}
\DeclareFontFamily{LGR}{porson}{}
- \DeclareFontShape{LGR}{porson}{m}{n}{<-> s * [\art@scale] gporsonrg6a}{}
- \DeclareFontShape{LGR}{porson}{m}{it}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{b}{n}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{b}{it}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{m}{sl}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{b}{sl}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{m}{sc}{<-> ssub * porson/m/n}{}
- \DeclareFontShape{LGR}{porson}{bx}{n}{<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{m}{n} {<-> s * [\art@scale] gporsonrg6a}{}
+ \DeclareFontShape{LGR}{porson}{m}{it} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{b}{n} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{b}{it} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{m}{sl} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{b}{sl} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{m}{sc} {<-> ssub * porson/m/n}{}
+ \DeclareFontShape{LGR}{porson}{bx}{n} {<-> ssub * porson/m/n}{}
\DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
\DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
- \def\suftesi@greekfamily{porson}
+ \def\SUF@greekfamily{porson}
\fi
\AtBeginDocument{
\DeclareRobustCommand{\greektext}{%
- \fontencoding{LGR}\fontfamily{\suftesi@greekfamily}\selectfont
+ \fontencoding{LGR}\fontfamily{\SUF@greekfamily}\selectfont
\def\encodingdefault{LGR}}}
\fi
% \end{macrocode}
% \subsection{Page layout}
% \begin{macrocode}
\RequirePackage{geometry}
+\ifsuftesi@defaultparindent
+ \relax
+ \else
\parindent1em
-\ifcase\@ptsize\relax
- \geometry{%
- textwidth=312pt,
- textheight=624pt}\or
- \geometry{%
- textwidth=324pt,
- textheight=648pt}\or
- \geometry{%
- textwidth=324pt,
- textheight=648pt}
- \fi
- \geometry{%
- marginparsep=12pt,
- includehead,
- hmarginratio=1:2,
- vmarginratio=1:2,
- heightrounded,
- marginparwidth=82pt}
+\fi
+ \geometry{heightrounded}
\ifsuftesi@nocrop
- \relax
- \else
- \RequirePackage[a4,cam,center]{crop}
+ \relax
+ \else
+ \RequirePackage[a4,cam,center]{crop}
\fi
-% \end{macrocode}
-%\subsubsection{\opt{periodical}}
-% \begin{macrocode}
\ifsuftesi@periodical
- \geometry{
- textheight=16.5cm,
- textwidth=11cm,
- paperwidth=17cm,
- paperheight=24cm,
- hmarginratio=2:3,
- vmarginratio=2:3,
- includefoot,
- includehead,
- heightrounded,
- marginparwidth=70pt,
- marginparsep=10pt}
+ \geometry{
+ textheight= 165mm,
+ textwidth= 110mm,
+ paperwidth= 170mm,
+ paperheight= 240mm,
+ marginratio= 2:3,
+ marginparwidth= 75pt,
+ marginparsep= 10pt}
\else
-% \end{macrocode}
-%\subsubsection{\opt{compact}}
-% \begin{macrocode}
\ifsuftesi@compact
- \geometry{
- textheight=16.5cm,
- textwidth=11cm,
- paperwidth=16cm,
- paperheight=24cm,
- hmarginratio=2:3,
- vmarginratio=2:3,
- includefoot,
- includehead,
- heightrounded,
- marginparwidth=65pt,
- marginparsep=10pt}
+ \geometry{
+ textheight= 165mm,
+ textwidth= 110mm,
+ paperwidth= 160mm,
+ paperheight= 240mm,
+ marginratio= 2:3,
+ marginparwidth= 65pt,
+ marginparsep= 10pt}
\else
-% \end{macrocode}
-%\subsubsection{\opt{supercompact}}
-% \begin{macrocode}
\ifsuftesi@supercompact
- \geometry{
- textheight=15cm,
- textwidth=10cm,
- paperwidth=14cm,
- paperheight=21cm,
- hmarginratio=2:3,
- vmarginratio=2:3,
- includefoot,
- includehead,
- heightrounded,
- marginparwidth=50pt,
- marginparsep=9pt}
+ \geometry{
+ textheight= 150mm,
+ textwidth= 100mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ marginratio= 2:3,
+ marginparwidth= 50pt,
+ marginparsep= 9pt}
\else
-% \end{macrocode}
-%\subsubsection{\opt{elements}}
-% \begin{macrocode}
\ifsuftesi@elements
- \geometry{%
- textwidth=251pt,
- textheight=502pt,
- marginparwidth=60pt,
- marginparsep=18pt,
- paperwidth=378pt,
- paperheight=654pt,
- heightrounded,
- outer=91.2pt,
- top=64pt}
+ \geometry{%
+ textwidth= 251pt,
+ textheight= 502pt,
+ paperwidth= 374pt,
+ paperheight= 648pt,
+ marginparwidth= 60pt,
+ marginparsep= 18pt,
+ outer= 90pt,
+ top= 64pt}
\else
+\ifcase\@ptsize\relax
+ \geometry{%
+ textwidth= 312pt,
+ textheight= 624pt}\or
+ \geometry{%
+ textwidth= 324pt,
+ textheight= 648pt}\or
+ \geometry{%
+ textwidth= 324pt,
+ textheight= 648pt}
+ \fi
+ \geometry{%
+ a4paper,
+ includehead,
+ heightrounded,
+ marginparwidth= 82pt,
+ marginparsep= 12pt,
+ hmarginratio= 1:2,
+ vmarginratio= 1:2}
+ \fi
+ \fi
\fi
- \fi
-\fi
\fi
% \end{macrocode}
-% And now a macro to produce oneside documents:
+% A trick to produce one-side documents:
% \begin{macrocode}
\if@twoside
\relax
@@ -708,162 +1174,367 @@
\RequirePackage{titlesec}
\newlength{\sectionsep}
\setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifsuftesi@supercompact
- \DeclareRobustCommand{\sufchaptersize}{\large}
+\ifsuftesi@periodical
+ \DeclareRobustCommand{\SUF@chaptersize}{\large}
\else
\ifsuftesi@compact
- \DeclareRobustCommand{\sufchaptersize}{\Large}
+ \DeclareRobustCommand{\SUF@chaptersize}{\large}
\else
- \DeclareRobustCommand{\sufchaptersize}{\Large}
- \fi
+ \ifsuftesi@supercompact
+ \DeclareRobustCommand{\SUF@chaptersize}{\large}
+ \else
+ \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+ \fi
+ \fi
\fi
+% \end{macrocode}
+% \DescribeMacro{\SUF@titlesmallcaps}
+% \begin{macrocode}
\ifxetex
- \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+ \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
\addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
- \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+ \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
\addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
\newcommand{\chapnumfont}[1]{%
- \def\@chapnumfont{\fontspec{#1}}}
+ \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}}
\chapnumfont{Palatino}
\else
- \DeclareRobustCommand{\suftesi@titlesmallcaps}[1]{%
+ \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
\scshape\MakeTextLowercase{\textls[110]{#1}}}%
- \DeclareRobustCommand{\suftesi@headingsmallcaps}[1]{%
+ \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
\scshape\MakeTextLowercase{\textls[110]{#1}}}%
\newcommand{\chapnumfont}[1]{%
- \def\@chapnumfont{\fontfamily{#1}}}
+ \def\SUF@chapnumfont{\fontfamily{#1}}}
\chapnumfont{pplj}
\fi
% \end{macrocode}
-% \subsubsection{Part}
+% \DescribeMacro{\SUF@thechapter}
% \begin{macrocode}
-\ifsuftesi@article
-\titleclass{\part}{straight}
-\titleformat{\part}[hang]
- {\large}
- {\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
- {.5em}
- {\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
- \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
-\else
-\titleformat{\part}[display]
- {\LARGE\filcenter}
- {\sufchaptersize\ifsuftesi@sctitles\scshape\else\fi\partname~\thepart}
- {3ex}
- {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
+\ifsuftesi@romanchap
+ \def\SUF@thechapter{\Roman{chapter}}
+ \else
+ \def\SUF@thechapter{\arabic{chapter}}
\fi
% \end{macrocode}
-% \subsubsection{Chapter}
-% \paragraph{The \opt{elements} styles}
+% \DescribeMacro{\SUF@lr@PARTSwitch}
+% \DescribeMacro{\SUF@lr@CHAPSwitch}
+% \DescribeMacro{\SUF@lr@SECswitch}
+% \DescribeMacro{\SUF@lr@SUBSECswitch}
+% \DescribeMacro{\SUF@lr@SUBSUBSECswitch}
+% These macros control the position of the titles and numbers of parts, chapters,
+% sections, subsections and subsubsection. There are three positions:
+% left, center and right.
% \begin{macrocode}
+\ifsuftesi@centerpart
+ \def\SUF@lr@PARTSwitch{\filcenter}
+ \else
+ \ifsuftesi@rightpart
+ \def\SUF@lr@PARTSwitch{\filleft}
+ \else
+ \def\SUF@lr@PARTSwitch{\filright}
+ \fi
+\fi
+\ifsuftesi@centerchap
+ \def\SUF@lr@CHAPSwitch{\filcenter}
+ \else
+ \ifsuftesi@rightchap
+ \def\SUF@lr@CHAPSwitch{\filleft}
+ \else
+ \def\SUF@lr@CHAPSwitch{\filright}
+ \fi
+\fi
+\ifsuftesi@centersec
+ \def\SUF@lr@SECswitch{\filcenter}
+ \else
+ \ifsuftesi@rightsec
+ \def\SUF@lr@SECswitch{\filleft}
+ \else
+ \def\SUF@lr@SECswitch{\filright}
+ \fi
+\fi
+\ifsuftesi@centersubsec
+ \def\SUF@lr@SUBSECswitch{\filcenter}
+ \else
+ \ifsuftesi@rightsubsec
+ \def\SUF@lr@SUBSECswitch{\filleft}
+ \else
+ \def\SUF@lr@SUBSECswitch{\filright}
+ \fi
+\fi
+\ifsuftesi@centersubsubsec
+ \def\SUF@lr@SUBSUBSECswitch{\filcenter}
+ \else
+ \ifsuftesi@rightsubsubsec
+ \def\SUF@lr@SUBSUBSECswitch{\filleft}
+ \else
+ \def\SUF@lr@SUBSUBSECswitch{\filright}
+ \fi
+\fi
+% \end{macrocode}
+% \DescribeMacro{\SUF@dotchap}
+% \begin{macrocode}
+\ifsuftesi@dottedchap
+ \def\SUF@dotchap{.}
+ \else
+ \def\SUF@dotchap{}
+\fi
+\ifsuftesi@dottedpart
+ \def\SUF@dotpart{.}
+ \else
+ \def\SUF@dotpart{}
+\fi
+% \end{macrocode}
+% \paragraph{The \opt{elements} style}
+% \begin{macrocode}
+\def\SUF@chapnumpos{-73}
\ifsuftesi@sufelements
\titleformat{\chapter}[block]
{}%
{\begin{picture}(0,0)
\setlength{\unitlength}{1pt}
- \@chapnumfont%
+ \SUF@chapnumfont%
\ifsuftesi@elements
- \fontsize{64}{64}\selectfont%
- \put(0,-73){%
- \hskip\dimexpr(\textwidth+\marginparsep)\textcolor{sufgray}{\thechapter}}%
+ \ifsuftesi@periodical
+ \fontsize{80}{80}\selectfont%
+ \def\SUF@chapnumpos{-83}
+ \else
+ \ifsuftesi@compact
+ \fontsize{80}{80}\selectfont%
+ \def\SUF@chapnumpos{-83}
+ \else
+ \ifsuftesi@supercompact
+ \fontsize{64}{64}\selectfont%
+ \def\SUF@chapnumpos{-73}
+ \else
+ \fontsize{64}{64}\selectfont%
+ \def\SUF@chapnumpos{-73}
+ \fi\fi\fi
\else
\fontsize{95}{95}\selectfont%
- \put(0,-83){\hskip\dimexpr(\textwidth+\marginparsep)%
- \textcolor{sufgray}{\thechapter}}%
+ \def\SUF@chapnumpos{-83}
\fi
+ \put(0,\SUF@chapnumpos){%
+ \hskip\dimexpr(\textwidth+\marginparsep)%
+ \textcolor{sufgray}{\SUF@thechapter}}%
\end{picture}}%
{0pt}
- {\suftesi@titlesmallcaps}
+ {\Large\SUF@titlesmallcaps}
[\rule{\textwidth}{.1pt}]
-\else
-% \end{macrocode}
-% \paragraph{The default styles}
-% \begin{macrocode}
-\ifsuftesi@centertitle
- \titleformat{\chapter}[display]
- {\filcenter}
- {\sufchaptersize\thechapter}
- {3ex}
- {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
-\else
- \titleformat{\chapter}[hang]
- {\filright}
- {\sufchaptersize\thechapter.}
- {3ex}
- {\sufchaptersize\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\fi}
- \fi
-\fi
-\ifsuftesi@compact
- \titlespacing*{\chapter}{0em}{0ex}{18ex}
- \else
- \ifsuftesi@supercompact
- \titlespacing*{\chapter}{0em}{0ex}{18ex}
- \else
- \ifsuftesi@elements
- \titlespacing*{\chapter}{0em}{-45pt}{10pt}[0em]
- \else
- \ifsuftesi@sufelements
- \titlespacing*{\chapter}{0em}{6ex}{10pt}[0em]
- \else
- \titlespacing*{\chapter}{0em}{6ex}{18ex}
- \fi
- \fi
- \fi
-\fi
-% \end{macrocode}
-% \subsubsection{Section, subsection, subsubsection, \dots}
-% \paragraph{\opt{elements}}
-% \begin{macrocode}
-\ifsuftesi@elements
-\titleformat{\section}[hang]
- {\raggedright}
+ \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]
+\titleformat{\section}[block]
+ {\filright}
{\textnormal\thesection}
{1em}
- {\small\suftesi@titlesmallcaps}
- \titlespacing*{\section}{0em}{\baselineskip}{\baselineskip}[0em]
+ {\SUF@titlesmallcaps}
+ \titlespacing*{\section}{0em}{1em}{1em}[0em]
\titleformat{\subsection}[block]
{\filright\normalsize\itshape}
{\textnormal\thesubsection}
{1em}
{}
- \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em]
+ \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em]
\titleformat{\subsubsection}[block]
- {\filright\normalsize\itshape}
+ {\filright\normalsize}
{\textnormal\thesubsubsection}
{1em}
{}
- \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
-\else
+ \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em]
+ \else
+% \end{macrocode}
+% \paragraph{The default styles}
+% \DescribeMacro{\SUF@PART@StyleSwitch}
+% \DescribeMacro{\SUF@CHAP@StyleSwitch}
+% \DescribeMacro{\SUF@SEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSEC@StyleSwitch}
+% \DescribeMacro{\SUF@SUBSUBSEC@StyleSwitch}
+% \begin{macrocode}
+\def\SUF@PART@StyleSwitch{%
+ \ifsuftesi@smallcapspart
+ \expandafter\SUF@titlesmallcaps
+ \else
+ \ifsuftesi@italicpart
+ \itshape
+ \else
+ \fi
+\fi}
+\def\SUF@CHAP@StyleSwitch{%
+ \ifsuftesi@smallcapschap
+ \expandafter\SUF@titlesmallcaps
+ \else
+ \ifsuftesi@italicchap
+ \itshape
+ \else
+ \fi
+\fi}
+\def\SUF@SEC@StyleSwitch{%
+ \ifsuftesi@smallcapssec
+ \expandafter\SUF@titlesmallcaps
+ \else
+ \ifsuftesi@italicsec
+ \itshape
+ \else
+ \fi
+\fi}
+\def\SUF@SUBSEC@StyleSwitch{%
+ \ifsuftesi@smallcapssubsec
+ \expandafter
+ \SUF@titlesmallcaps
+ \else
+ \ifsuftesi@italicsubsec
+ \itshape
+ \else
+ \fi
+\fi
+}
+\def\SUF@SUBSUBSEC@StyleSwitch{%
+ \ifsuftesi@smallcapssubsubsec
+ \expandafter
+ \SUF@titlesmallcaps
+ \else
+ \ifsuftesi@italicsubsubsec
+ \itshape
+ \else
+ \fi
+\fi}
% \end{macrocode}
-% \paragraph{\opt{default}}
+% \subparagraph{Redefinitions for \opt{`article'} mode}
% \begin{macrocode}
\ifsuftesi@article
- \renewcommand\thesection {\@arabic\c@section}
- \renewcommand\thesubsection {\thesection.\@arabic\c@subsection}
- \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}
- \renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph}
- \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}
+\def\chapter#1{\ClassError{suftesi}
+ {\noexpand\chapter level is not defined using 'article' option}
+ {\noexpand\chapter level is not defined using 'article' option}}
+ \setcounter{tocdepth}{3}
+ \setcounter{secnumdepth}{3}
+ \renewcommand\thesection{%
+ \@arabic\c@section}
+ \renewcommand\thesubsection{%
+ \thesection.\@arabic\c@subsection}
+ \renewcommand\thesubsubsection{%
+ \thesubsection.\@arabic\c@subsubsection}
+ \renewcommand\theparagraph{%
+ \thesubsubsection.\@arabic\c@paragraph}
+ \renewcommand\thesubparagraph{%
+ \theparagraph.\@arabic\c@subparagraph}
+\titleclass{\part}{straight}
+\titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex]
\else
\fi
+% \end{macrocode}
+% \subparagraph{The default \opt{`book'} mode}
+% \begin{macrocode}
+% \end{macrocode}
+% \DescribeMacro{\part}
+% \begin{macrocode}
+\ifsuftesi@numparpart
+\titleformat{\part}[display]
+ {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+ {2ex}
+ {\SUF@PART@StyleSwitch}
+\else
+\titleformat{\part}[hang]
+ {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@PART@StyleSwitch\partname\hskip1em\thepart\SUF@dotpart}
+ {3em}
+ {\SUF@PART@StyleSwitch}
+\fi
+% \end{macrocode}
+% \DescribeMacro{\chapter}
+% \begin{macrocode}
+\ifsuftesi@numparchap
+ \titleformat{\chapter}[display]
+ {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\SUF@thechapter\SUF@dotchap}
+ {2ex}
+ {\SUF@CHAP@StyleSwitch}
+ \else
+ \titleformat{\chapter}[hang]
+ {\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\SUF@thechapter\SUF@dotchap}
+ {3em}
+ {\SUF@CHAP@StyleSwitch}
+ \fi
+\ifsuftesi@numparchap
+ \def\SUF@ADJnumparchap{-2.5\baselineskip}
+ \else
+ \def\SUF@ADJnumparchap{0pt}
+\fi
+\ifsuftesi@periodical
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+ \else
+ \ifsuftesi@compact
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+ \else
+ \ifsuftesi@supercompact
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
+ \else
+ \titlespacing*{\chapter}{0em}{%
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
+ \fi
+ \fi
+\fi
+% \end{macrocode}
+% \DescribeMacro{\section}
+% \begin{macrocode}
+\ifsuftesi@numparsec
+\titleformat{\section}[display]
+ {\SUF@lr@SECswitch}
+ {\thesection}
+ {0ex}
+ {\SUF@SEC@StyleSwitch}
+ \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
\titleformat{\section}[hang]
- {\filright}
+ {\SUF@lr@SECswitch}
{\thesection}
- {.5em}
- {\unskip\ifsuftesi@sctitles\expandafter\suftesi@titlesmallcaps\else\itshape\fi}
+ {1em}
+ {\SUF@SEC@StyleSwitch}
\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+\fi
+% \end{macrocode}
+% \DescribeMacro{\subsection}
+% \begin{macrocode}
+\ifsuftesi@numparsubsec
+\titleformat{\subsection}[display]
+ {\SUF@lr@SUBSECswitch}
+ {\textnormal\thesubsection}
+ {0ex}
+ {\SUF@SUBSEC@StyleSwitch}
+ \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
\titleformat{\subsection}[hang]
- {}
+ {\SUF@lr@SUBSECswitch}
{\textnormal\thesubsection}
- {.5em}
- {\itshape}
+ {1em}
+ {\SUF@SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+\fi
+% \end{macrocode}
+% \DescribeMacro{\subsubsection}
+% \begin{macrocode}
+\ifsuftesi@numparsubsubsec
+\titleformat{\subsubsection}[display]
+ {\SUF@lr@SUBSUBSECswitch}
+ {\textnormal\thesubsubsection}
+ {0ex}
+ {\SUF@SUBSUBSEC@StyleSwitch}
+ \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
+\else
\titleformat{\subsubsection}[hang]
- {}
+ {\SUF@lr@SUBSUBSECswitch}
{\textnormal\thesubsubsection}
- {.5em}
- {\itshape}
- \titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex]
+ {1em}
+ {\SUF@SUBSUBSEC@StyleSwitch}
+ \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+ \fi
\fi
+% \end{macrocode}
+% \DescribeMacro{\paragraph}
+% \begin{macrocode}
\titleformat{\paragraph}[runin]
{}
{\theparagraph}
@@ -871,6 +1542,9 @@
{\itshape}
[{.}\hspace*{1em}]
\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
+% \end{macrocode}
+% \DescribeMacro{\subparagraph}
+% \begin{macrocode}
\titleformat{\subparagraph}[runin]
{}
{\thesubparagraph}
@@ -879,9 +1553,13 @@
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
% \end{macrocode}
-% \paragraph{\sty{biblatex} settings}
+% \subsubsection{\sty{biblatex} settings}
+% The \sty{biblatex} package uses the \sty{book} class
+% definitions of bibliography and list of shorthands,
+% so we must redefine them according to the styles of \sty{suftesi},
+% which does not use uppercase letters in the headings.
% \begin{macrocode}
-\ifsuftesi@article %ARTICLE
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -913,7 +1591,7 @@
\subsection{#1}}}%
{\relax}%
}%
-\else %BOOK
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -949,134 +1627,12 @@
}%
\fi
% \end{macrocode}
-% \subsubsection{TOC, LOF, LOT}
-% \begin{macrocode}
-\RequirePackage{titletoc}
-% \end{macrocode}
-% Settings for \opt{dottedtoc} and \opt{raggedtoc} options:
-% \begin{macrocode}
-\ifsuftesi@dottedtoc
- \newcommand{\suftesi@titlerule}{\titlerule*{\footnotesize .\ }}
- \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
- \else
-\ifsuftesi@raggedtoc
- \newcommand{\suftesi@titlerule}{\hspace{1.5em}}
- \newcommand{\suftesi@chaptitlerule}{\hspace{1.5em}}
- \else
- \newcommand{\suftesi@titlerule}{\titlerule*{}}
- \newcommand{\suftesi@chaptitlerule}{\titlerule*{}}
- \fi
-\fi
-% \end{macrocode}
-% \opt{article} mode:
-% \begin{macrocode}
-\ifsuftesi@article
-\renewcommand\tableofcontents{%
- \thispagestyle{empty}
- \section*{\contentsname
- \@mkboth{\contentsname}{\contentsname}}%
- \@starttoc{toc}%
- \vspace{2ex}%
- }
-\renewcommand\listoffigures{%
- \section*{\listfigurename}%
- \@mkboth{\listfigurename}%
- {\listfigurename}%
- \@starttoc{lof}%
- \vspace{2ex}%
- }
-\renewcommand\listoftables{%
- \section*{\listtablename}%
- \@mkboth{%
- \listtablename}%
- {\listtablename}%
- \@starttoc{lot}%
- \vspace{2ex}%
- }
-\else
-% \end{macrocode}
-% \opt{book} mode:
-% \begin{macrocode}
-\renewcommand\tableofcontents{%
- \if@twocolumn
- \@restonecoltrue\onecolumn
- \else
- \@restonecolfalse
- \fi
- \chapter*{\contentsname
- \@mkboth{\contentsname}{\contentsname}}%
- \@starttoc{toc}%
- \if@restonecol\twocolumn\fi
- }
- \fi
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname~}
- {\thecontentslabel\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
-\titlecontents{chapter}
- [0em]
- {\addvspace{2ex}}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@chaptitlerule\contentspage}
- [\addvspace{1ex}]
-\titlecontents{section}
- [1.5em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\ifsuftesi@article\suftesi@chaptitlerule%
- \else\suftesi@titlerule\fi\contentspage}
-\titlecontents{subsection}
- [3em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\titlecontents{subsubsection}
- [4.5em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\titlecontents{paragraph}
- [6em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\titlecontents{subparagraph}
- [7.5em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\titlecontents{figure}
- [0em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\titlecontents{table}
- [0em]
- {}
- {\thecontentslabel\hspace*{1em}}
- {}
- {\suftesi@titlerule\contentspage}
-\ifsuftesi@article
-\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{3}
-\else
-\fi
-% \end{macrocode}
-% \subsubsection{Title page}
+% \subsection{Title page}
% \DescribeMacro{\title}
-% New \cmd{title} command with an optional argument for headings.
+% The new \cmd{title} command has an optional argument
+% which can be used in the headers.
% \begin{macrocode}
- \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
\edef\title{\noexpand\@dblarg
\expandafter\noexpand\csname\string\title\endcsname}
\def\@headtitle{--missing title--%
@@ -1108,8 +1664,20 @@
\null\vfil
\vskip 60\p@
\begin{center}%
- {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
- \suftesi@titlesmallcaps{\@title}\else\@title\fi \par}%
+ {\SUF@chaptersize\color{sufred}\sffamily%
+ \ifsuftesi@smallcapschap%
+ \SUF@titlesmallcaps{\@title}
+ \else
+ \ifsuftesi@article
+ \ifsuftesi@smallcapssec
+ \SUF@titlesmallcaps{\@title}
+ \else
+ \@title
+ \fi
+ \else
+ \@title
+ \fi
+ \fi\par}%
\vskip 3em%
{\small\lineskip .75em%
\begin{tabular}[t]{c}%
@@ -1130,6 +1698,10 @@
\global\let\and\relax
}
\else
+% \end{macrocode}
+% \DescribeMacro{\maketitle}
+% For |notitlepage| option:
+% \begin{macrocode}
\renewcommand\maketitle{\par
\begingroup
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
@@ -1164,8 +1736,20 @@
\vskip 2em%
\begin{center}%
\let \footnote \thanks
- {\sufchaptersize\color{sufred}\sffamily\ifsuftesi@sctitles%
- \suftesi@titlesmallcaps{\@title}\else\@title\fi\par}%
+ {\SUF@chaptersize\color{sufred}\sffamily%
+ \ifsuftesi@smallcapschap%
+ \SUF@titlesmallcaps{\@title}
+ \else
+ \ifsuftesi@article
+ \ifsuftesi@smallcapssec
+ \SUF@titlesmallcaps{\@title}
+ \else
+ \@title
+ \fi
+ \else
+ \@title
+ \fi
+ \fi\par}%
\vskip 1.5em%
{\small\lineskip .5em%
\begin{tabular}[t]{c}%
@@ -1178,13 +1762,12 @@
\vskip 1.5em}
\fi
% \end{macrocode}
-% \subsubsection{The frontispiece}
+% \subsection{The frontispiece}
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{frontespizio}{%
\ifsuftesi@periodical
- \Margini{1cm}{7cm}{5cm}{1cm}%
- \Rientro{1cm}%
+ \Margini {5.5cm}{7cm}{4.5cm}{1cm}
\else
\ifsuftesi@compact
\Margini{1cm}{7cm}{6cm}{1cm}%
@@ -1203,32 +1786,31 @@
% \begin{environment}{theindex}
% \begin{macrocode}
\renewenvironment{theindex}
- {\setlength\columnseprule{0pt}
- \setlength\columnsep{35pt}%
- \cleardoublepage
- \@makeschapterhead{\indexname}%
- \begin{multicols}{2}
- \markboth{\indexname}{\indexname}%
- \raggedright\small
- \setlength\parindent{0pt}%
- \setlength\parskip{0pt plus 0.3pt}%
- \thispagestyle{plain}\let\item\@idxitem}
- {\end{multicols}}
-\renewcommand\@idxitem{\par\hangindent 15\p@}
+ {\if@twocolumn
+ \@restonecolfalse
+ \else
+ \@restonecoltrue
+ \fi
+ \twocolumn[\@makeschapterhead{\indexname}]%
+ \@mkboth{\indexname}{\indexname}%
+ \thispagestyle{plain}%
+ \raggedright\small%
+ \parindent\z@
+ \parskip\z@ \@plus .3\p@\relax
+ \columnseprule \z@
+ \columnsep 35\p@
+ \let\item\@idxitem}
+ {\if@restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
% \end{environment}
-% \subsubsection{Appendix}
-% \begin{macro}{\appendicesname}
-% \begin{macro}{\appendixpage}
+% \subsection{Appendix}
+% \DescribeMacro{\appendicesname}
+% \DescribeMacro{\appendixpage}
% \begin{macrocode}
-\newcommand{\appendicesname}[1]{\def\suff@appendices{#1}}
+\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
\appendicesname{Appendici}
- \newcommand{\appendixpage}{\@appendixpage}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macrocode}
-\def\@appendixpage{%
+ \newcommand{\appendixpage}{\SUF@appendixpage}
+\def\SUF@appendixpage{%
\@mainmattertrue
\titlecontents{part}
[0em]
@@ -1240,18 +1822,18 @@
\let\contentspage\relax
\cleardoublepage
\thispagestyle{empty}
- \addcontentsline{toc}{part}{\suff@appendices}
+ \addcontentsline{toc}{part}{\SUF@appendices}
\begingroup
\centering
\null\vfil
- {\LARGE\suff@appendices\par}
+ {\LARGE\SUF@appendices\par}
\vfil
\endgroup
\cleardoublepage
\titlecontents{part}
[0em]
{\addvspace{3ex}\partname~}
- {\thecontentslabel\hspace*{1em}}
+ {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -1267,16 +1849,11 @@
\gdef\thechapter{\@Alph\c@chapter}
\titleformat{\chapter}[block]
{\vskip-22pt}%
- {\small\suftesi@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
+ {\small\SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em}
{0pt}
- {\small\suftesi@titlesmallcaps}
+ {\small\SUF@titlesmallcaps}
[\rule{\textwidth}{.4pt}]
- \titlespacing*{\chapter}{0em}{10pt}{10pt}[0em]
- \titlecontents{chapter}[1em]
- {\filright\hskip.5em}
- {\suftesi@titlesmallcaps{\appendixname~\thecontentslabel:}\hskip1em}
- {}
- {\contentspage\vspace{5pt}}}
+ \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]}
\else
\ifsuftesi@article
\renewcommand\appendix{\par
@@ -1298,135 +1875,125 @@
\pagestyle{fancy}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footnoterule}{}
+\def\SUF@versionstring{\texttt{Version of \today}}
% \end{macrocode}
-% \paragraph{The \opt{elements} headings}
+% \paragraph{The \opt{elements} headers}
% \begin{macrocode}
\ifsuftesi@elements%
- \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
- \renewcommand{\sectionmark}[1]{\markright{#1}}
- \fancypagestyle{elements}{%
- \fancyhf{}
- \fancyfoot[LE,RO]{\thepage}
- \fancyhead[RO]{%
- \begin{picture}(0,0)
- \setlength{\unitlength}{1pt}
- \put(0,-104){%
- \hskip\marginparsep
- \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
- \end{picture}}
- \fancyhead[LE]{%
- \begin{picture}(0,0)
- \setlength{\unitlength}{1pt}
- \put(0,-104){%
- \hskip-\dimexpr(\marginparwidth+\marginparsep)
- \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
- \end{picture}}%
- }%
+ \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
+ \renewcommand{\sectionmark}[1]{\markright{#1}}
+ \fancypagestyle{elements}{%
+ \setlength{\unitlength}{1pt}
+ \fancyhf{}
+ \fancyfoot[LE,RO]{\thepage}
+ \fancyhead[RO]{%
+ \begin{picture}(0,0)
+ \put(0,-104){%
+ \hskip\marginparsep
+ \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
+ \end{picture}}
+ \fancyhead[LE]{%
+ \begin{picture}(0,0)
+ \put(0,-104){%
+ \hskip-\dimexpr(\marginparwidth+\marginparsep)
+ \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
+ \end{picture}}%
+ }%
\else
% \end{macrocode}
-% \paragraph{The \opt{default} headings}
+% \paragraph{The \opt{default} headers}
% \begin{macrocode}
- \renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename\ \thechapter}{#1}}
- \renewcommand{\sectionmark}[1]{}
+ \renewcommand{\chaptermark}[1]{%
+ \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+ \ifsuftesi@article
+ \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
+ \else
+ \renewcommand{\sectionmark}[1]{}
+ \fi
\fi
% \end{macrocode}
% \subparagraph{The \opt{plain} style}
% \begin{macrocode}
-\fancypagestyle{plain}{%
- \fancyhf{}
- \fancyfoot[C]{}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}}
+\fancypagestyle{plain}{\pagestyle{sufplain}}
% \end{macrocode}
% \subparagraph{The \opt{sufplain} style}
% \begin{macrocode}
\fancypagestyle{sufplain}{%
\fancyhf{}%
- \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
- \fancyfoot[C]{\footnotesize\sufthepage}}
+ \fancyfoot[RE,LO]{%
+ \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}}
% \end{macrocode}
-% \subparagraph{The \opt{centerheadings} style}
+% \subparagraph{The \opt{centerheader} style}
% \begin{macrocode}
-\fancypagestyle{centerheadings}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
- \fancyhead[CO]{\footnotesize\xheadbreakfalse\suf@rightmark}
- \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+\def\SUF@LR@MarkSwitch{%
\ifsuftesi@article
\ifsuftesi@authortitle
- \suf@leftmark
+ \SUF@leftmark
\else
- \suf@rightmark
+ \SUF@rightmark
\fi
- \else
- \suf@leftmark
- \fi}
- \fancyfoot[C]{\footnotesize\sufthepage}%
+ \else
+ \SUF@leftmark
+ \fi}
+\fancypagestyle{centerheader}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{%
+ \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+ \fancyhead[CO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
+ \fancyhead[CE]{\footnotesize\xheadbreakfalse%
+ \SUF@LR@MarkSwitch}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}%
}%
% \end{macrocode}
% \subparagraph{The \opt{sufdefault} style}
% \begin{macrocode}
\fancypagestyle{sufdefault}{%
\fancyhf{}%
- \fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Version of \today\else\fi}
- \fancyhead[LE,RO]{\footnotesize\sufthepage}
- \fancyhead[LO]{\footnotesize\xheadbreakfalse\suf@rightmark}
+ \fancyfoot[RE,LO]{%
+ \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi}
+ \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
+ \fancyhead[LO]{\footnotesize\xheadbreakfalse\SUF@rightmark}
\fancyhead[RE]{\footnotesize\xheadbreakfalse%
- \ifsuftesi@article
- \ifsuftesi@authortitle
- \suf@leftmark
- \else
- \suf@rightmark
- \fi
- \else
- \suf@leftmark
- \fi}
+ \SUF@LR@MarkSwitch}
}%
-% \end{macrocode}
-% \subparagraph{The \opt{article} and \opt{sctitles} styles}
-% \begin{macrocode}
-\ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
- \else
- \fi
-\ifsuftesi@sctitles
- \ifsuftesi@authortitle
- \def\suf@rightmark{\suftesi@headingsmallcaps{\@headtitle}}
+\ifsuftesi@italicRhead
+ \def\SUF@Rheadstyle{\itshape}
+ \else
+ \ifsuftesi@smallcapsRhead
+ \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
\else
- \def\suf@rightmark{\suftesi@headingsmallcaps{\rightmark}}
+ \def\SUF@Rheadstyle{}
\fi
-\else
- \ifsuftesi@authortitle
- \def\suf@rightmark{\nouppercase{\@headtitle}}
- \else
- \def\suf@rightmark{\nouppercase{\rightmark}}
- \fi
\fi
-\ifsuftesi@sctitles
- \ifsuftesi@authortitle
- \def\suf@leftmark{\suftesi@headingsmallcaps{\@author}}
- \else
- \def\suf@leftmark{\suftesi@headingsmallcaps{\suf@leftrightmark}}
- \fi
-\else
-\ifsuftesi@authortitle
- \def\suf@leftmark{\nouppercase{\@author}}
+\ifsuftesi@italicLhead
+ \def\SUF@Lheadstyle{\itshape}
\else
- \def\suf@leftmark{\nouppercase{\suf@leftrightmark}}
+ \ifsuftesi@smallcapsLhead
+ \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
+ \else
+ \def\SUF@Lheadstyle{}
\fi
\fi
-\ifsuftesi@sctitles
- \def\sufthepage{\suftesi@headingsmallcaps{\thepage}}
+ \ifsuftesi@authortitle
+ \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}}
+ \def\SUF@leftmark{\SUF@Lheadstyle{\@author}}
+ \else
+ \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}}
+ \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}}
+ \fi
+\ifsuftesi@smallcapsheader
+ \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
\else
- \def\sufthepage{\thepage}
+ \def\SUF@thepage{\thepage}
\fi
-\def\suf@leftrightmark{%
+\def\SUF@leftrightmark{%
\if@mainmatter\leftmark\else\rightmark\fi}
% \end{macrocode}
% Setting the default page style:
% \begin{macrocode}
\pagestyle{sufdefault}
- \ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
+ \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
\ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
\ifsuftesi@elements\pagestyle{elements}\else\fi
% \end{macrocode}
@@ -1460,102 +2027,126 @@
% \end{macrocode}
% \subsubsection{Lists}
% \begin{macrocode}
-\RequirePackage{enumitem}
- \setlist{labelsep=0.6em,noitemsep,font=\normalfont}
+\RequirePackage[inline]{enumitem}
+ \setlist{labelsep=0.5\parindent,noitemsep,font=\normalfont}
\setdescription{font=\normalfont\itshape,noitemsep}
-\ifsuftesi@compact
- \setenumerate[1]{leftmargin=1em,label=\arabic*}
- \setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
- \setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
- \setitemize[1]{leftmargin=1em}
- \setitemize[2]{leftmargin=1.5em}
- \setitemize[3]{leftmargin=1.5em}
- \else
- \ifsuftesi@supercompact
- \setenumerate[1]{leftmargin=1em,label=\arabic*}
- \setenumerate[2]{leftmargin= 1.5em,label=\arabic*}
- \setenumerate[3]{leftmargin= 1.5em,label=\arabic*}
- \setitemize[1]{leftmargin=1em}
- \setitemize[2]{leftmargin=1.5em}
- \setitemize[3]{leftmargin=1.5em}
+\ifsuftesi@alignlist
+ \setenumerate[1]{leftmargin=1\parindent,label=\arabic*.}
+ \setenumerate[2]{leftmargin= 1.5\parindent,label=\alph*.}
+ \setenumerate[3]{leftmargin= 1.5\parindent,label=\roman*.}
+ \setitemize[1]{leftmargin=1\parindent}
+ \setitemize[2]{leftmargin=1.5\parindent}
+ \setitemize[3]{leftmargin=1.5\parindent}
+\else
+\ifsuftesi@indentlist
+ \setenumerate[1]{leftmargin=2\parindent,label=\arabic*.}
+ \setenumerate[2]{leftmargin= 2.5\parindent,label=\alph*.}
+ \setenumerate[3]{leftmargin= 2.5\parindent,label=\roman*.}
+ \setitemize[1]{leftmargin=2\parindent}
+ \setitemize[2]{leftmargin=2.5\parindent}
+ \setitemize[3]{leftmargin=2.5\parindent}
\else
- \setenumerate[1]{leftmargin=0pt,label=\arabic*}
- \setenumerate[2]{leftmargin= 1.3em,label=\arabic*}
- \setenumerate[3]{leftmargin= 1.3em,label=\arabic*}
+ \setenumerate[1]{leftmargin=0pt,label=\arabic*.}
+ \setenumerate[2]{leftmargin= 1.3\parindent,label=\alph*.}
+ \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.}
\setitemize[1]{leftmargin=0pt}
- \setitemize[2]{leftmargin=1.3em}
- \setitemize[3]{leftmargin=1.3em}
- \fi
+ \setitemize[2]{leftmargin=1.3\parindent}
+ \setitemize[3]{leftmargin=1.3\parindent}
+ \fi
\fi
\renewcommand\labelitemii{\normalfont \textendash}
% \end{macrocode}
% \subsubsection{Block Quotations}
-% \begin{environment}{quotation}
-% \begin{environment}{quote}
-% New \env{quotation} and \env{quote} environments according to a popular italian style. The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
+% \DescribeEnv{quotation}
+% \DescribeEnv{quote}
+% \DescribeEnv{verse}
+% New \env{quotation} and \env{quote} environments 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}
\renewenvironment{quotation}
- {\list{}{\listparindent\parindent%
- \itemindent \listparindent
+ {\list{}{\listparindent\parindent%
+ \itemindent \listparindent
+ \leftmargin \parindent
+ \ifsuftesi@ralignquotation
+ \else
\rightmargin \parindent
- \leftmargin \parindent
+ \fi
\parsep \z@ \@plus\p@}%
- \item\relax\footnotesize\noindent\ignorespaces}
+ \item\relax%
+ \ifsuftesi@smallquotation
+ \small
+ \else
+ \footnotesize
+ \fi\noindent\ignorespaces}
{\endlist}
\renewenvironment{quote}
- {\list{}{\rightmargin \parindent
- \leftmargin \parindent}%
- \item\relax\footnotesize}
+ {\list{}{\leftmargin \parindent
+ \ifsuftesi@ralignquotation\
+ \else
+ \rightmargin \parindent
+ \fi}%
+ \item\relax%
+ \ifsuftesi@smallquotation
+ \small
+ \else
+ \footnotesize
+ \fi}%\ignorespaces?
{\endlist}
-% \end{macrocode}
-% \end{environment}
-% \end{environment}
-% \begin{environment}{verse}
-% \begin{macrocode}
\renewenvironment{verse}
{\let\\\@centercr
- \list{}{\footnotesize%
- \itemsep \z@
+ \list{}{\itemsep \z@
\itemindent -1.5em%
\listparindent\itemindent
\rightmargin \leftmargin
\advance\leftmargin 1.5em}%
- \item\relax}
+ \item\relax
+ \ifsuftesi@smallquotation
+ \small
+ \else
+ \footnotesize
+ \fi}
{\endlist}
% \end{macrocode}
-% \end{environment}
% \subsubsection{Notes}
-% \begin{macro}{\@makefntext}
-% Renew the |\@makefntext| command according to the look \emph{The Elements of Typographic Styles} by R. Bringhurst:
+% \DescribeMacro{\@makefntext}
+% \begin{macrocode}
+\ifsuftesi@standardfootnote
+ \relax
+ \else
+ \ifsuftesi@dottedfootnote
+ \renewcommand\@makefntext{\@thefnmark.\hskip.5em}
+ \else
+% \end{macrocode}
+% By default the footnotes are printed in the style of
+% \emph{The Elements of Typographic Styles} by R. Bringhurst:
% \begin{macrocode}
-\renewcommand\@makefntext{%
- \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+ \renewcommand\@makefntext{%
+ \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+ \fi
+\fi
% \end{macrocode}
-%\end{macro}
-% \begin{macro}{\marginpar}
-% Renew the |\marginpar| command according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
+% \DescribeMacro{\marginpar}
+% The |\marginpar| command is redefined according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}:
% \begin{macrocode}
-\def\sufmpsetup@setup{%thanks to Lorenzo Pantieri and Enrico Gregorio
- \itshape\footnotesize%
+\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio
+ \ifsuftesi@elements\relax
+ \else\itshape\fi
+ \footnotesize%
\parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
\tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
\doublehyphendemerits=100000%
\finalhyphendemerits=\doublehyphendemerits}
-\long\def\@xmpar[#1]#2{%
- \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}%
- \@savemarbox\@currbox{\sufmpsetup@setup\raggedright\hspace{0pt}#2}%
- \@xympar}
-\long\def\@ympar#1{%
- \@savemarbox\@marbox{\sufmpsetup@setup\raggedleft\hspace{0pt}#1}%
- \global\setbox\@currbox\copy\@marbox \@xympar}
+\let\oldmarginpar\marginpar
+\renewcommand{\marginpar}[1]{\oldmarginpar%
+ [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
+ {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
\ifsuftesi@nomarginpar
\renewcommand\marginpar[2][]{}
\else
\fi
% \end{macrocode}
-% \end{macro}
% \subsubsection{Abstract}
-% This is the macro that defines the \env{abstract} environment in \sty{article} class. In \sty{suftesi} it simply prints the abstract name in normal font:
+% This is the macro that defines the \env{abstract} environment in \sty{article} class. In \sty{suftesi} it simply prints the abstract name in roman font:
% \begin{macrocode}
\if@titlepage
\newenvironment{abstract}{%
@@ -1583,9 +2174,9 @@
\newcommand\abstractname{Abstract}
% \end{macrocode}
% \subsubsection{Colophon}
-% Some useful commands to print a colophon or a coyright notice.
+% Some useful commands to print a colophon or a copyright notice.
% \begin{macrocode}
-\edef\sufengine{%
+\edef\SUF@engine{%
\ifxetex
\noexpand\XeLaTeX
\else
@@ -1596,7 +2187,7 @@
\fi
\fi}
% \end{macrocode}
-% \begin{macro}{\colophon}
+% \DescribeMacro{\colophon}
% \begin{macrocode}
\newcommand{\colophon}[3][]{%
\thispagestyle{empty}
@@ -1605,18 +2196,17 @@
\def\next{#2}
\ifx\next\@empty\else
\noindent Copyright \copyright{} \the\year~#2\\[1ex]
- All rights reserved
+ Tutti i diritti riservato
\fi
\vfill
- {\small\noindent This work has been typeset with \sufengine{}%
+ {\small\noindent Questo lavoro è stato composto con \SUF@engine{}%
\def\next{#1}
- \ifx\next\@empty\else on #1
- \fi using the \textsf{suftesi} class by
+ \ifx\next\@empty\else su #1
+ \fi usando la classe \textsf{suftesi} di
Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
\cleardoublepage}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\bookcolophon}
+% \DescribeMacro{\bookcolophon}
% \begin{macrocode}
\newcommand{\bookcolophon}[2]{%
\thispagestyle{empty}
@@ -1627,8 +2217,7 @@
{\small\noindent #2\par}
\cleardoublepage}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\artcolophon}
+% \DescribeMacro{\artcolophon}
% \begin{macrocode}
\newcommand{\artcolophon}[1]{%
\thispagestyle{empty}
@@ -1636,8 +2225,7 @@
\vfill
{\small\noindent #1\par}}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\finalcolophon}
+% \DescribeMacro{\finalcolophon}
% \begin{macrocode}
\newcommand{\finalcolophon}[1]{%
\thispagestyle{empty}
@@ -1650,44 +2238,434 @@
\vspace*{\stretch{6}}
}
% \end{macrocode}
-% \end{macro}
-% \subsection{Commands}
-% \begin{macro}{\chapterintro}
+% \subsection{TOC, LOF, LOT}
+% \begin{macrocode}
+\RequirePackage{titletoc}
+% \end{macrocode}
+% \subsubsection{The \opt{dottedtoc} and \opt{raggedtoc} options}
+% \DescribeMacro{\SUF@titlerule}
+% \DescribeMacro{\SUF@chaptitlerule}
+% \begin{macrocode}
+\ifsuftesi@elements
+ \def\SUF@tochapsize{}
+ \else
+ \def\SUF@tochapsize{\large}
+\fi
+\ifsuftesi@dottedtoc
+ \def\SUF@titlerule{\titlerule*{\footnotesize .\ }}
+ \def\SUF@chaptitlerule{\titlerule*{}}
+ \else
+ \ifsuftesi@raggedtoc
+ \def\SUF@titlerule{\hspace{1.5em}}
+ \def\SUF@chaptitlerule{\hspace{1.5em}}
+ \else
+ \def\SUF@titlerule{\titlerule*{}}
+ \def\SUF@chaptitlerule{\titlerule*{}}
+ \fi
+\fi
+% \end{macrocode}
+% \DescribeMacro{\SUF@label@chapter}
+% All the lengths depend on |\SUF@label@chapter|
+% so we define this first.
+% \begin{macrocode}
+\newlength\SUF@label@chapter
+\setlength\SUF@label@chapter{.5em}
+% \end{macrocode}
+% \DescribeMacro{\toclabelwidth}
+% |\toclabelwidth| is providet to
+% adjust the label width:
+% \begin{macrocode}
+\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}}
+% \end{macrocode}
+% \DescribeMacro{\SUF@tochang}
+% This macro controls the space between page number and chapter
+% label using the \opt{tocpageleft} option:
+% \begin{macrocode}
+\newlength{\SUF@tochang}
+\setlength{\SUF@tochang}{3em}
+\AtBeginDocument{
+\newlength\SUF@label@part
+\newlength\SUF@label@section
+\newlength\SUF@label@subsection
+\newlength\SUF@label@subsubsection
+\newlength\SUF@label@paragraph
+\newlength\SUF@label@subparagraph
+\newlength\SUF@label@figure
+\newlength\SUF@label@table
+\setlength\SUF@label@part
+ {\SUF@label@chapter}
+\setlength\SUF@label@section
+ {\dimexpr(\SUF@label@chapter+.5em)}
+\setlength\SUF@label@subsection
+ {\dimexpr(\SUF@label@section+.5em)}
+\setlength\SUF@label@subsubsection
+ {\dimexpr(\SUF@label@subsection+.5em)}
+\setlength\SUF@label@paragraph
+ {\dimexpr(\SUF@label@subsubsection+.5em)}
+\setlength\SUF@label@subparagraph
+ {\dimexpr(\SUF@label@paragraph+.5em)}
+\setlength\SUF@label@figure
+ {\SUF@label@chapter}
+\setlength\SUF@label@table
+ {\SUF@label@chapter}
+}
+% \end{macrocode}
+% The part entry is the same in both default and
+% \opt{topcpageleft} style.
+% \begin{macrocode}
+\titlecontents{part}
+ [0em]
+ {\addvspace{3ex}\SUF@tocchapsize\partname~}
+ {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+ {}
+ [\addvspace{1ex}]
+% \end{macrocode}
+% \subsubsection{The \opt{tocpageleft} table of contents}
+% \begin{macrocode}
+\ifsuftesi@tocpageleft
+% \end{macrocode}
+% \DescribeMacro{\contentsmargin}
+% First we reset the right margin to zero:
+% \begin{macrocode}
+\contentsmargin{0pt}
+% \end{macrocode}
+% \DescribeMacro{\SUF@tochang@\meta{level}}
+% \DescribeMacro{\SUF@addto@tochang@\meta{level}}
+% \begin{macrocode}
+\AtBeginDocument{
+\newlength\SUF@tochang@chap
+\newlength\SUF@tochang@sec
+\newlength\SUF@tochang@subsec
+\newlength\SUF@tochang@subsubsec
+\newlength\SUF@tochang@par
+\newlength\SUF@tochang@subpar
+\newlength\SUF@tochang@fig
+\newlength\SUF@tochang@tab
+\newlength\SUF@addto@tochang@chap
+\newlength\SUF@addto@tochang@sec
+\newlength\SUF@addto@tochang@subsec
+\newlength\SUF@addto@tochang@subsubsec
+\newlength\SUF@addto@tochang@par
+\newlength\SUF@addto@tochang@subpar
+\newlength\SUF@addto@tochang@fig
+\newlength\SUF@addto@tochang@tab
+\setlength\SUF@tochang@chap
+ {\dimexpr(1em+\SUF@tochang+\SUF@label@chapter+1em)}
+\setlength\SUF@tochang@sec
+ {\dimexpr(\SUF@tochang@chap+\SUF@label@section+1em)}
+\setlength\SUF@tochang@subsec
+ {\dimexpr(\SUF@tochang@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tochang@subsubsec
+ {\dimexpr(\SUF@tochang@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tochang@par
+ {\dimexpr(\SUF@tochang@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tochang@subpar
+ {\dimexpr(\SUF@tochang@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tochang@fig
+ {\SUF@tochang@chap}
+\setlength\SUF@tochang@tab
+ {\SUF@tochang@chap}
+\setlength\SUF@addto@tochang@chap
+ {\SUF@tochang}
+\setlength\SUF@addto@tochang@sec
+ {\dimexpr(\SUF@addto@tochang@chap+\SUF@label@section+.5em)}
+\setlength\SUF@addto@tochang@subsec
+ {\dimexpr(\SUF@addto@tochang@sec+\SUF@label@subsection+.5em)}
+\setlength\SUF@addto@tochang@subsubsec
+ {\dimexpr(\SUF@addto@tochang@subsec+\SUF@label@subsubsection+.5em)}
+\setlength\SUF@addto@tochang@par
+ {\dimexpr(\SUF@addto@tochang@subsubsec+\SUF@label@paragraph+.5em)}
+\setlength\SUF@addto@tochang@subpar
+ {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)}
+\setlength\SUF@addto@tochang@fig
+ {\SUF@addto@tochang@chap}
+\setlength\SUF@addto@tochang@tab
+ {\SUF@addto@tochang@chap}
+}
+% \end{macrocode}
+% \paragraph{TOC entries}
+% \begin{macrocode}
+\titlecontents{chapter}
+ [\SUF@tochang@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap%
+ \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@chap}
+ {}
+ [\addvspace{1ex}]
+\titlecontents{section}
+ [\SUF@tochang@sec]
+ {}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+ \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+ \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+\titlecontents{subsection}
+ [\SUF@tochang@subsec]
+ {}
+ {\hskip-\SUF@tochang@subsec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+ \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@subsec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
+ \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+\titlecontents{subsubsection}
+ [\SUF@tochang@subsubsec]
+ {}
+ {\hskip-\SUF@tochang@subsubsec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+ \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@subsubsec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
+ \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+\titlecontents{paragraph}
+ [\SUF@tochang@par]
+ {}
+ {\hskip-\SUF@tochang@par%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+ \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@par%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@par%
+ \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+\titlecontents{subparagraph}
+ [\SUF@tochang@subpar]
+ {}
+ {\hskip-\SUF@tochang@subpar%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+ \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\SUF@tochang@subpar%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subpar%
+ \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+\titlecontents{figure}
+ [\SUF@tochang@fig]
+ {}
+ {\hskip-\SUF@tochang@fig%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig%
+ \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+ {}
+\titlecontents{table}
+ [\SUF@tochang@tab]
+ {}
+ {\hskip-\SUF@tochang@tab%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@tab%
+ \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}}
+ {}
+ {}
+\else
+% \end{macrocode}
+% \subsubsection{The default table of contents}
+% \begin{macrocode}
+\AtBeginDocument{
+\newlength\SUF@tocindent@chap
+\newlength\SUF@tocindent@sec
+\newlength\SUF@tocindent@subsec
+\newlength\SUF@tocindent@subsubsec
+\newlength\SUF@tocindent@par
+\newlength\SUF@tocindent@subpar
+\newlength\SUF@tocindent@fig
+\newlength\SUF@tocindent@tab
+\setlength\SUF@tocindent@chap
+ {\dimexpr(\SUF@label@chapter+1em)}
+\setlength\SUF@tocindent@sec
+ {\dimexpr(\SUF@tocindent@chap+\SUF@label@section+1em)}
+\setlength\SUF@tocindent@subsec
+ {\dimexpr(\SUF@tocindent@sec+\SUF@label@subsection+1em)}
+\setlength\SUF@tocindent@subsubsec
+ {\dimexpr(\SUF@tocindent@subsec+\SUF@label@subsubsection+1em)}
+\setlength\SUF@tocindent@par
+ {\dimexpr(\SUF@tocindent@subsubsec+\SUF@label@paragraph+1em)}
+\setlength\SUF@tocindent@subpar
+ {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)}
+\setlength\SUF@tocindent@fig
+ {\SUF@tocindent@chap}
+\setlength\SUF@tocindent@tab
+ {\SUF@tocindent@chap}
+}
+% \end{macrocode}
+% \paragraph{TOC entries}
+% \begin{macrocode}
+\titlecontents{chapter}
+ [\SUF@tocindent@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tocindent@chap%
+ \makebox[\SUF@label@chapter][l]{\thecontentslabel}\hspace*{1em}\SUF@tochapsize}
+ {\hskip-\SUF@tocindent@chap\SUF@tochapsize}
+ {\SUF@chaptitlerule\contentspage}
+ [\addvspace{1ex}]
+\titlecontents{section}
+ [\SUF@tocindent@sec]
+ {}
+ {\hskip-\dimexpr(\SUF@label@section+1em)%
+ \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@section+1em)%
+ \makebox[\SUF@label@section][l]{\thecontentslabel}\hspace*{1em}}
+ {\ifsuftesi@article\SUF@chaptitlerule%
+ \else\SUF@titlerule\fi\contentspage}
+\titlecontents{subsection}
+ [\SUF@tocindent@subsec]
+ {}
+ {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+ \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subsection+1em)%
+ \makebox[\SUF@label@subsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\SUF@titlerule\contentspage}
+\titlecontents{subsubsection}
+ [\SUF@tocindent@subsubsec]
+ {}
+ {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+ \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subsubsection+1em)%
+ \makebox[\SUF@label@subsubsection][l]{\thecontentslabel}\hspace*{1em}}
+ {\SUF@titlerule\contentspage}
+\titlecontents{paragraph}
+ [\SUF@tocindent@par]
+ {}
+ {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+ \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@paragraph+1em)%
+ \makebox[\SUF@label@paragraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\SUF@titlerule\contentspage}
+\titlecontents{subparagraph}
+ [\SUF@tocindent@subpar]
+ {}
+ {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+ \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\hskip-\dimexpr(\SUF@label@subparagraph+1em)%
+ \makebox[\SUF@label@subparagraph][l]{\thecontentslabel}\hspace*{1em}}
+ {\SUF@titlerule\contentspage}
+\titlecontents{figure}
+ [\SUF@tocindent@fig]
+ {}
+ {\hskip-\dimexpr(\SUF@label@figure+1em)%
+ \makebox[\SUF@label@figure][l]{\thecontentslabel}}
+ {}
+ {\SUF@titlerule\contentspage}
+\titlecontents{table}
+ [\SUF@tocindent@tab]
+ {}
+ {\hskip-\dimexpr(\SUF@label@table+1em)%
+ \makebox[\SUF@label@table][l]{\thecontentslabel}}
+ {}
+ {\SUF@titlerule\contentspage}
+\fi
+% \end{macrocode}
+% \DescribeMacro{\tableofcontents}
+% \DescribeMacro{\listoffigures}
+% \DescribeMacro{\listoftables}
+% With \opt{article} option the toc, lof and lot
+% are printed as sections.
+% \begin{macrocode}
+\ifsuftesi@article
+\renewcommand\tableofcontents{%
+ \thispagestyle{empty}
+ \section*{\contentsname
+ \@mkboth{\contentsname}{\contentsname}}%
+ \@starttoc{toc}%
+ \vspace{2ex}%
+ }
+\renewcommand\listoffigures{%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}%
+ {\listfigurename}%
+ \@starttoc{lof}%
+ \vspace{2ex}%
+ }
+\renewcommand\listoftables{%
+ \section*{\listtablename}%
+ \@mkboth{%
+ \listtablename}%
+ {\listtablename}%
+ \@starttoc{lot}%
+ \vspace{2ex}%
+ }
+\else
+% \end{macrocode}
+% The default toc, lof and lot are treated as chapters.
+% \begin{macrocode}
+\renewcommand\tableofcontents{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\contentsname
+ \@mkboth{%
+ \contentsname}
+ {\contentsname}}%
+ \@starttoc{toc}%
+ \if@restonecol\twocolumn\fi
+ }
+\renewcommand\listoffigures{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}%
+ {\listfigurename}%
+ \@starttoc{lof}%
+ \if@restonecol\twocolumn\fi
+ }
+\renewcommand\listoftables{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\listtablename}%
+ \@mkboth{%
+ \listtablename}%
+ {\listtablename}%
+ \@starttoc{lot}%
+ \if@restonecol\twocolumn\fi
+ }
+\fi
+% \end{macrocode}
+% \subsection{New commands}
+% \DescribeMacro{\chapterintro}
% A command to typeset an unnumbered section:
% \begin{macrocode}
\def\chapterintro{
\@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
\def\@chapterintro{\phantomsection
- \if@tempswa\section*{\suffchapterintroname}\fi
- \addcontentsline{toc}{section}{\suffchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\suffchapterintroname{#1}}
+ \if@tempswa\section*{\SUF@fchapterintroname}\fi
+ \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
\chapterintroname{Introduzione}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\headbreak}
-%Active in the table of contents but not in the text or in the headings
+% \DescribeMacro{\headbreak}
+%Active in the table of contents but not in the text.
% \begin{macrocode}
\newif\ifheadbreak\headbreakfalse
\DeclareRobustCommand{\headbreak}
{\ifheadbreak\\\else\fi}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\xheadbreak}
-% Active in the text and in the headings but not in the table of contents.
+% \DescribeMacro{\xheadbreak}
+% Active in the text but not in the table of contents.
% \begin{macrocode}
\newif\ifxheadbreak\xheadbreaktrue
\DeclareRobustCommand{\xheadbreak}
{\ifxheadbreak\\\else\fi}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\tableofcontents}
+% \DescribeMacro{\tableofcontents}
% \begin{macrocode}
\let\origtableofcontents\tableofcontents
\renewcommand{\tableofcontents}{%
\begingroup\headbreaktrue\xheadbreakfalse%
\origtableofcontents\endgroup}
% \end{macrocode}
-% \end{macro}
% Renew |\frontmatter| to have arabic page numbering:
% \begin{macrocode}
\renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse}
@@ -1731,19 +2709,33 @@
{\endlist}
% \end{macrocode}
% \end{environment}
+% \DescribeMacro{\hemph}
+% In a previous version the \cmd{hemph} command was provided
+% to fix a bug in the hyphenation of some italian expressions
+% like ``dell'\emph{encyclopaedia}''. The bug has been fixed by Claudio Beccari
+% so the \cmd{hemph} command is provided only for
+% backward compatibility:
% \begin{macrocode}
\let\hemph\emph
% \end{macrocode}
-% \paragraph{Final settings}
+% \subsection{Final settings}
+% The first line of all sections is indented by default
+% using \XeLaTeX{} with italian as main language. Anyway this is
+% incongruous with the \LaTeX{} default.
+% \begin{macrocode}
+\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
+% \end{macrocode}
% Just one touch of french typography:
% \begin{macrocode}
\frenchspacing
-%</class>
% \end{macrocode}
+%</class>
%
% \subsection{The bibliography file}
%
+% \iffalse
%<*bib>
+% \fi
% \begin{verbatim}
@book{Morison:1111,
Author = {Stanley Morison},
@@ -1850,6 +2842,583 @@
Volume = {6},
Year = {2008}}
% \end{verbatim}
+% \iffalse
%</bib>
-%
+% \fi
+% \iffalse
+%<*fakelogo>
+prologues:=3;
+outputtemplate:="%j.mps";
+input boxes;
+beginfig(1);
+draw fullcircle scaled (2.5cm + 1pt) withcolor white;
+draw fullcircle scaled 2.5cm;
+draw fullcircle scaled 2.3cm;
+draw thelabel(btex \vbox{\sevenrm\halign{\hfil#\hfil\cr University of\cr
+ Verona\cr Seal\cr}} etex, origin);
+endfig;
+end
+%</fakelogo>
+% \fi
+% \iffalse
+%<*rmstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle1>
+% \fi
+% \iffalse
+%<*rmstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle2>
+% \fi
+% \iffalse
+%<*rmstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle3>
+% \fi
+% \iffalse
+%<*rmstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle4>
+% \fi
+% \iffalse
+%<*rmstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle5>
+% \fi
+% \iffalse
+%<*rmstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+rmstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</rmstyle6>
+% \fi
+% \iffalse
+%<*itstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle1>
+% \fi
+% \iffalse
+%<*itstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle2>
+% \fi
+% \iffalse
+%<*itstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle3>
+% \fi
+% \iffalse
+%<*itstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle4>
+% \fi
+% \iffalse
+%<*itstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle5>
+% \fi
+% \iffalse
+%<*itstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle6>
+% \fi
+% \iffalse
+%<*itstyle7>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle7]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle7>
+% \fi
+% \iffalse
+%<*itstyle8>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle8]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle8>
+% \fi
+% \iffalse
+%<*itstyle9>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle9]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle9>
+% \fi
+% \iffalse
+%<*itstyle10>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle10]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle10>
+% \fi
+% \iffalse
+%<*itstyle11>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle11]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle11>
+% \fi
+% \iffalse
+%<*itstyle12>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+itstyle12]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</itstyle12>
+% \fi
+% \iffalse
+%<*scstyle1>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle1]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle1>
+% \fi
+% \iffalse
+%<*scstyle2>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle2]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle2>
+% \fi
+% \iffalse
+%<*scstyle3>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle3]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle3>
+% \fi
+% \iffalse
+%<*scstyle4>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle4]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle4>
+% \fi
+% \iffalse
+%<*scstyle5>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle5]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle5>
+% \fi
+% \iffalse
+%<*scstyle6>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle6]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle6>
+% \fi
+% \iffalse
+%<*scstyle7>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle7]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle7>
+% \fi
+% \iffalse
+%<*scstyle8>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle8]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle8>
+% \fi
+% \iffalse
+%<*scstyle9>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle9]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle9>
+% \fi
+% \iffalse
+%<*scstyle10>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle10]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle10>
+% \fi
+% \iffalse
+%<*scstyle11>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle11]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle11>
+% \fi
+% \iffalse
+%<*scstyle12>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[periodical,nocrop,
+scstyle12]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</scstyle12>
+% \fi
+% \iffalse
+%<*collect-examples>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = pdfLaTeX
+\documentclass[a4paper]{book}
+\usepackage{graphicx,xcolor}
+\usepackage[margin=1cm]{geometry}
+\parindent0pt
+\pagestyle{empty}
+\newcommand{\inputex}[1]{%
+\vbox{\centering
+ \fbox{\includegraphics[width=.95\textwidth]{#1.pdf}}\\
+ \begin{picture}(0,0)
+ \put (-185,90) {%
+ \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#1}}}}
+ \end{picture}}
+}
+\begin{document}
+\inputex{rmstyle1}
+\inputex{rmstyle2}
+\inputex{rmstyle3}
+\inputex{rmstyle4}
+\inputex{rmstyle5}
+\inputex{rmstyle6}
+\inputex{itstyle1}
+\inputex{itstyle2}
+\inputex{itstyle3}
+\inputex{itstyle4}
+\inputex{itstyle5}
+\inputex{itstyle6}
+\inputex{itstyle7}
+\inputex{itstyle8}
+\inputex{itstyle9}
+\inputex{itstyle10}
+\inputex{itstyle11}
+\inputex{itstyle12}
+\inputex{scstyle1}
+\inputex{scstyle2}
+\inputex{scstyle3}
+\inputex{scstyle4}
+\inputex{scstyle5}
+\inputex{scstyle6}
+\inputex{scstyle7}
+\inputex{scstyle8}
+\inputex{scstyle9}
+\inputex{scstyle10}
+\inputex{scstyle11}
+\inputex{scstyle12}
+\end{document}
+%</collect-examples>
+% \fi
% \Finale
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
index 297fb8113e3..1c7fb4f8ff8 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
@@ -45,6 +45,38 @@
\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
\nopreamble\nopostamble
\file{suftesi.bib}{\from{suftesi.dtx}{bib}}
+ \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
+ \file{rmstyle1.tex}{\from{suftesi.dtx}{rmstyle1}}
+ \file{rmstyle2.tex}{\from{suftesi.dtx}{rmstyle2}}
+ \file{rmstyle3.tex}{\from{suftesi.dtx}{rmstyle3}}
+ \file{rmstyle4.tex}{\from{suftesi.dtx}{rmstyle4}}
+ \file{rmstyle5.tex}{\from{suftesi.dtx}{rmstyle5}}
+ \file{rmstyle6.tex}{\from{suftesi.dtx}{rmstyle6}}
+ \file{itstyle1.tex}{\from{suftesi.dtx}{itstyle1}}
+ \file{itstyle2.tex}{\from{suftesi.dtx}{itstyle2}}
+ \file{itstyle3.tex}{\from{suftesi.dtx}{itstyle3}}
+ \file{itstyle4.tex}{\from{suftesi.dtx}{itstyle4}}
+ \file{itstyle5.tex}{\from{suftesi.dtx}{itstyle5}}
+ \file{itstyle6.tex}{\from{suftesi.dtx}{itstyle6}}
+ \file{itstyle7.tex}{\from{suftesi.dtx}{itstyle7}}
+ \file{itstyle8.tex}{\from{suftesi.dtx}{itstyle8}}
+ \file{itstyle9.tex}{\from{suftesi.dtx}{itstyle9}}
+ \file{itstyle10.tex}{\from{suftesi.dtx}{itstyle10}}
+ \file{itstyle11.tex}{\from{suftesi.dtx}{itstyle11}}
+ \file{itstyle12.tex}{\from{suftesi.dtx}{itstyle12}}
+ \file{scstyle1.tex}{\from{suftesi.dtx}{scstyle1}}
+ \file{scstyle2.tex}{\from{suftesi.dtx}{scstyle2}}
+ \file{scstyle3.tex}{\from{suftesi.dtx}{scstyle3}}
+ \file{scstyle4.tex}{\from{suftesi.dtx}{scstyle4}}
+ \file{scstyle5.tex}{\from{suftesi.dtx}{scstyle5}}
+ \file{scstyle6.tex}{\from{suftesi.dtx}{scstyle6}}
+ \file{scstyle7.tex}{\from{suftesi.dtx}{scstyle7}}
+ \file{scstyle8.tex}{\from{suftesi.dtx}{scstyle8}}
+ \file{scstyle9.tex}{\from{suftesi.dtx}{scstyle9}}
+ \file{scstyle10.tex}{\from{suftesi.dtx}{scstyle10}}
+ \file{scstyle11.tex}{\from{suftesi.dtx}{scstyle11}}
+ \file{scstyle12.tex}{\from{suftesi.dtx}{scstyle12}}
+ \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
}
\Msg{***********************************************************}