diff options
| author | Karl Berry <karl@freefriends.org> | 2012-09-24 21:47:03 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-09-24 21:47:03 +0000 |
| commit | 0a7531626c00cb1efc84269f1bb068f4f73a2758 (patch) | |
| tree | 51ac57b38806c0af449f2f9d8e7237ea0f02c31d /Master/texmf-dist/source/latex/suftesi | |
| parent | b4f677ebbdb51897a35bbe4c7ec76e74a650a63f (diff) | |
suftesi (24sep12)
git-svn-id: svn://tug.org/texlive/trunk@27797 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/suftesi')
| -rw-r--r-- | Master/texmf-dist/source/latex/suftesi/suftesi.dtx | 3045 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/suftesi/suftesi.ins | 68 |
2 files changed, 1739 insertions, 1374 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx index c8afabc9651..fd2a6e67958 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx @@ -23,7 +23,7 @@ %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<class>\ProvidesClass{suftesi} %<*class> - [2012/08/31 v0.9a A class for typesetting theses, books and articles] + [2012/09/23 v0.9b A class for typesetting theses, books and articles] %</class> %<*driver> \PassOptionsToClass{a4paper}{article} @@ -35,6 +35,9 @@ \let\cmd\relax %\usepackage[paperwidth=17cm,paperheight=24cm,right=1cm,left=3cm]{geometry} \usepackage{ltxdockit} +\renewcommand*{\optionlistfont}{\spotcolor\sffamily\displayverbfont} +\renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont} + \usepackage{array,booktabs,multirow} \usepackage{microtype} \usepackage{siunitx} @@ -43,6 +46,19 @@ \usepackage[style=philosophy-classic]{biblatex} \addbibresource{suftesi.bib} \usepackage[suftesi]{frontespizio} +\usepackage{xcolor} + +\usepackage{fourier} +\renewcommand{\sfdefault}{lmss} +\usepackage{sectsty} + \sectionfont{\spotcolor\sffamily} + \subsectionfont{\spotcolor} + \subsubsectionfont{\spotcolor} + \paragraphfont{\spotcolor} + \subparagraphfont{\spotcolor} + + + \usepackage{hyperref} \hypersetup{% pdftitle={User's Guide to \textsf{suftesi}}, @@ -72,8 +88,15 @@ #1} {\par\addvspace{\quoteskip}\noindent\ignorespacesafterend} \newenvironment{ttquote} - {\genquote[\ttfamily\microtypesetup{activate=false}]} - {\endgenquote} + {\begin{mdframed}[backgroundcolor=blue!10] + \ttfamily\small\microtypesetup{activate=false} + %\genquote[\ttfamily\microtypesetup{activate=false}] + } + { + %\endgenquote + \end{mdframed}} + +\usepackage{mdframed} \EnableCrossrefs \CodelineIndex @@ -86,7 +109,7 @@ %</driver> % \fi % -% \CheckSum{2826} +% \CheckSum{2973} % % \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 @@ -104,61 +127,29 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v0.9b}{2012/09/23}{Restored \opt{11pt} and \opt{12pt} option +% to default} % \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} +% \sty{enumitem} package. Deleted \opt{centertitle} option. +% Deleted \opt{sctitles} option. +% Changed code for toc, lot and lof elements. } +% \changes{v0.9}{2012/04/22}{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.} % \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template} % \changes{v0.6c}{2011/11/16}{Maintenance release, no changes} % \changes{v0.6b}{2011/11/07}{Improved full compatibility with \XeLaTeX. % \sty{varioref} and \sty{footmisc} packages are no longer loaded} % \changes{v0.6a}{2011/10/24}{Maintenance release, no changes} -% \changes{v0.6}{2011/10/21}{Added commands \cmd{bookcolophon}, \cmd{artcolophon}. Added option \opt{authortitle}. Renamed options \opt{plain} and \opt{fullplain} to \opt{centerheadings} and \opt{sufplain}. New english documentation.} -% \changes{v0.5}{2011/10/21}{First public release. The frontispiece of \sty{suftesi}{} is now -% 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{Roma}.} +% \changes{v0.6}{2011/10/21}{English documentation. Renamed options \opt{plain} and \opt{fullplain} to \opt{centerheadings} and \opt{sufplain}.} +% \changes{v0.5}{2011/10/21}{First public release. +% The frontispiece of \sty{suftesi}{} is now +% included in the package \sty{frontespizio}. +% New option \opt{fullplain} +% Changed option \opt{sctitles}.} % \GetFileInfo{suftesi.dtx} % -% \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ } +% \DoNotIndex{\hskip,\newcommand,\newenvironment,\def,\begin,\vskip,\ } % \DoNotIndex{\DeclareOption,\ExecuteOptions,\RequirePackage} % \DoNotIndex{\@@end,\@empty,\@ifclassloaded,\@nameuse,\@nil} % \DoNotIndex{\@undefined,\\,\`,\addtocounter,\advance,\bfseries} @@ -166,7 +157,7 @@ % \DoNotIndex{\edef,\else,\end,\endinput,\endtitlepage,\expandafter} % \DoNotIndex{\extracolsep,\fi,\fill,\fontsize,\g@addto@macro,\toks} % \DoNotIndex{\hrule,\hspace,\if,\if@twoside,\ifcase,\ifdefined} -% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate,\setcounter} +% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate} % \DoNotIndex{\jobname,\let,\long,\MakeUppercase,\MessageBreak} % \DoNotIndex{\newcount,\newif,\newpage,\newtoks,\newwrite,\next} % \DoNotIndex{\noexpand,\nofiles,\normalfont,\normalsize,\null} @@ -175,16 +166,18 @@ % \DoNotIndex{\parbox,\parindent,\relax,\scshape,\selectfont,\setkeys} % \DoNotIndex{\sffamily,\space,\stretch,\string,\textheight,\textwidth} % \DoNotIndex{\the,\thispagestyle,\unexpanded,\unless,\unskip,\upshape} -% \DoNotIndex{\usepackage,\vbox,\vfill,\vspace,\write,\z@} +% \DoNotIndex{\usepackage,\vbox,\vfill,\vfil,\vspace,\write,\z@} +% \DoNotIndex{\addvspace,\setcounter,\addcontentsline} +% \DoNotIndex{\filleft,\filcenter,\filright,\geometry} % \DoNotIndex{\CurrentOption,\AtEndDocument,\@ne,\c@page,\m@ne} % \DoNotIndex{\@firstofone,\@gobble,\@makeother,\begingroup,\endgroup} % \DoNotIndex{\eTeXversion,\hbox,\hsize,\includegraphics,\newlinechar} % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr} % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand} % -% \title{\bfseries User's Guide to \textsf{suftesi}\thanks{This +% \title{\color{spot}\bfseries User's Guide to \textsf{suftesi}\thanks{This % document corresponds to \textsf{suftesi}~\fileversion{} dated \filedate}\\ -% \large A document class for typesetting theses, books and articles} +% \large\itshape A document class for typesetting theses, books and articles} % \author{Ivan Valbusa \\ % \texttt{ivan dot valbusa at univr dot it}} % \date{\filedate} @@ -198,6 +191,7 @@ % \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} @@ -230,15 +224,15 @@ % % % \subsection*{Loaded packages} -% -% -% The class loads the following packages: \sty{beramono}, \sty{calc}, -% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, -% \sty{epigraph}, \sty{fancyhdr}, \sty{fontenc}, \sty{geometry}, -% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, \sty{microtype}, -% \sty{mparhack}, \sty{multicol}, -% \sty{textcase}, \sty{titlesec}, \sty{titletoc}. -% +% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. +% It is not compatible with \sty{crop}} +% +% The class loads the following packages: \sty{beramono}, +% \sty{caption}, \sty{color}, \sty{enumitem}, \sty{emptypage}, +% \sty{fancyhdr}, \sty{fontenc}, \sty{geometry}, +% \sty{ifluatex}, \sty{ifxetex}, \sty{iwona}, \sty{mathpazo}, +% \sty{microtype}, \sty{multicol}, \sty{titlesec}, \sty{titletoc}. +% \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded} % \section{Class features} % % \subsection{Layout} @@ -252,26 +246,33 @@ % \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}. -% \begin{table}[h] -% \small\centering -% \caption[The layout]{The layouts of \sty{suftesi}} -% \label{tab:gabbia} -% \begin{tabular}{p{2cm}cccccc} +% \begin{table*}[t] +% \footnotesize\centering +% \begin{tabular}{p{3cm}ccccc} % \toprule -% & \multicolumn{5}{c}{Option (pt)}\\\cmidrule{2-7} -% & (default) & \opt{11pt} & \opt{compact} & \opt{supercompact} & \opt{elements} & \opt{periodical} \\\cmidrule(lr){1-1}\cmidrule(lr){2-7} -% Text width & $312$ & $324$ & $312$ & $284$ & $251$ & $312$\\ -% Text height & $624$ & $648$ & $470$ & $430$ & $502$& $470$\\ -% Marginal notes width & $82$ & $82$ & $65$ & $50$ & $60$& $70$\\[4ex] -% Margins &\multicolumn{6}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-7} -% \multirow{2}*{{\parbox{2cm}{top/bottom\\inner/outer}}} -% & $1/2$ & $1/2$ & $2/3$ & $2/3$& $2/5$& $2/3$ \\ -% &$1/2$&$1/2$ & $2/3$ & $2/3$ & $1/2$& $2/3$\\\cmidrule(lr){1-1} -% Text block & $1/2$& $1/2$ & $2/3$ & $2/3$ & $1/2$& $2/3$\\ -% Page & $1/\sqrt{2}$& $1/\sqrt{2}$ & $2/3$ & $2/3$ & $1/\sqrt{3}$& $1/\sqrt{2}$\\ +% & \multicolumn{5}{c}{Options}\\\cmidrule{2-6} +% & (mm) \opt{standard} & \opt{periodical} & \opt{compact} & \opt{supercompact} & (pt) \opt{elements} \\ +% \cmidrule(lr){1-1}\cmidrule(lr){2-6} +% Text width & $110$ & $110$ & $110$ & $100$ & $251$\\ +% Text height & $220$ & $165$ & $165$ & $150$ & $502$\\ +% Page width & $210$ & $170$ & $160$ & $140$ & $374$\\ +% Page height & $297$ & $240$ & $240$ & $210$ & $648$\\[2ex] +% &\multicolumn{5}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-6} +% \multirow{2}*{% +% \parbox{1.2cm}{Margins} +% \parbox{1.9cm}{ +% top/bottom\\ +% inner/outer}} +% & $1/2$ & $2/3$ & $2/3$& $2/3$& $1/2$ \\ +% & $1/2$ & $2/3$ & $2/3$ & $2/3$& $2/5$\\\cmidrule(lr){1-1} +% Text block & $1/2$ & $2/3$ & $2/3$ & $2/3$& $1/2$\\ +% Page & $1/\sqrt{2}$& $2/3$ & $2/3$ & $2/3$& $1/\sqrt{3}$\\ % \bottomrule % \end{tabular} -% \end{table} +% \caption{The layouts of \sty{suftesi}} +% \label{tab:gabbia} + +% \end{table*} % % \subsection{Font} % @@ -284,16 +285,16 @@ % % \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 \opt{defaultfont} class option -% which turns off the \sty{suftesi}{} font settings. Moreover pay particular attention -% in choosing the Greek font. +% If you prefer to use other fonts (such as those provided by \sty{fourier} or \sty{libertine} packages), remember to load the \opt{defaultfont=cmodern} class option +% which turns off the default font settings. +% Moreover pay particular attention in choosing the Greek font. % % \subsubsection{Greek alphabet} % % The default font for the Greek text is Artemisia by the Greek Font Society % which is particularly suitable for Palatino: % \begin{quotation} +% \fontfamily{ppl}\selectfont % Alla Natura che ogni cosa dona e ogni cosa riprende\dots% % \begin{otherlanguage*}{polutonikogreek}% % \fontfamily{artemisia}\selectfont @@ -305,6 +306,7 @@ % \end{quotation} % With the \opt{porson} option you can use the Porson font by the Greek Font Society: % \begin{quotation} +% \fontfamily{ppl}\selectfont % Alla Natura che ogni cosa dona e ogni cosa riprende\dots% % \begin{otherlanguage*}{greek}% % \fontfamily{porson}\selectfont @@ -318,6 +320,7 @@ % font:\footnote{This option is also activated by the \opt{defaultfont} option % (see section \ref{sec:options}).} % \begin{quotation} +% \fontfamily{ppl}\selectfont % Alla Natura che ogni cosa dona e ogni cosa riprende\dots% % \begin{otherlanguage*}{greek}% % \fontfamily{lmr}\selectfont @@ -330,41 +333,15 @@ % % \subsection{Frontispiece} % -% 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 \file{tesi.tex} template file in the \file{example} folder): +% 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 \file{tesi.tex} template +% file in the \file{example} folder): % \begin{ttquote} % \cmd{usepackage}[suftesi]\ar{frontespizio} % \end{ttquote} % -% \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 layouts} -% \begin{ltxsyntax} -% \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). -% 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{elements} -% Reproduces the layout of \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} -% (see table \ref{tab:gabbia} for details). -% \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} @@ -394,143 +371,282 @@ % \put (-3.5,-22) {\line(10,0){16}} % \end{picture} % \clearpage +% +% \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 Styles} +% +%\begin{optionlist} +% \optitem[book]{documentstructure}{\opt{book}, \opt{article}} +% \begin{valuelist} +% \item[book] For typesetting texts with chapters +% \item[article] This option is particularly suitable +% to typeset articles or short theses (that is without +% chapter division). +% \end{valuelist} +%\optitem[default]{pagelayout}{\opt{default}, \opt{periodical}, \opt{compact}, \opt{supercompact}, \opt{elements}} +% \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}} +%\begin{valuelist} +%\item[standard] +% Prints an A4 typeblock (see \ref{tab:gabbia} for details). +%\item[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). +% This style is expecially meant for theses. +% The \opt{crop=false} option disables the crop marks. +%\item[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). +%\item[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). +% \item[elements] Prints a typeblock with the layout of +% \citetitle{Bringhurst:1996} by Robert \citeauthor{Bringhurst:1996} +% (see table \ref{tab:gabbia} for details).. +%\end{valuelist} +%\boolitem[true]{crop} +% \begin{valuelist} +% \item[true] Prints the output on a A4 paper, showing the crop marks. +% \item[false] Prints a \textsc{pdf} with page dimensions +% according to the \opt{pagelayout} option. +% \end{valuelist} +%\end{optionlist} +% +% \subsection{Titles} +% +% \begin{optionlist} +% \optitem[roman]{<level>font}{\opt{roman}, \opt{italic}, +% \opt{smallcaps}} +% \begin{valuelist} +% \item[roman] Prints the <level> title in roman +% \item[italic] Prints the <level> title in \emph{italic} +% \item[smallcaps] Prints the <level> title +% in \textsc{small caps} +% \end{valuelist} +% Where <level> can be \opt{part}, \opt{chap}, \opt{sec}, +% \opt{subsec}, \opt{subsubsec}. +% \optitem[left]{<level>style}{\opt{left}, \opt{center}, +% \opt{right}, \opt{parleft}, \opt{parcenter}, +% \opt{parright}} +% \begin{valuelist} +% \item[left] Aligns the <level> title on the left +% \item[center] Centers the <level> title +% \item[right] Aligns the <level> title on the right +% \end{valuelist} +% Where <level> can be \opt{part}, \opt{chap}, \opt{sec} +% \opt{subsec}, \opt{subsubsec}. +% \begin{valuelist} +% \item[parleft] As \opt{left} but with the title below the number +% \item[parcenter] As \opt{center} but with the title below the number +% \item[parright] As \opt{right} but with the title below the number +% \end{valuelist} +% \begin{valuelist} +% \item[elements] Print a chapter number in the style of the +% \emph{Elements of Typographic Style} by +% Robert Bringhurst. +% \end{valuelist} +% Where <level> can be \opt{part}, \opt{chap}, \opt{sec}. +% \optitem[Roman/arabic/arabic]{<level>numstyle}{\opt{arabic}, +% \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, +% \opt{dotRoman}} +% \begin{valuelist} +% \item[arabic] Arabic <level> number +% \item[roman] Small caps lowercase roman <level> number +% \item[Roman] Uppercase roman <level> number +% \item[dotarabic] As \opt{arabic} but followed by a dot +% \item[dotroman] As \opt{roman} but followed by a dot +% \item[dotRoman] As \opt{Roman} but followed by a dot +% \end{valuelist} +% Where <level> can be \opt{part}, \opt{chap}, \opt{sec}. +% \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, +% \opt{ragged}, \opt{pageleft}} +% \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}} +% \begin{valuelist} +% \item[standard] Prints a standard table of contents with +% page numbers on the right margin +% \item[dotted] As the previous one but with dotted lines. +% \item[ragged] Aligns the table of contents on the left +% as suggested by \textcite{Bringhurst:1996}. +% \item[pageleft] Prints a table of contents with page numbers +% on the left margin. +% \end{valuelist} +% \end{optionlist} +% \subsection{Headings} +% +% \begin{optionlist} +% \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, +% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}} +% \begin{valuelist} +% \item[inner] Prints the chapter title and the string ``Chapter~ +% \emph{n}'' in the inner side +% respectively of even and odd +% headers, and the page number in the outer side. +% \item[center] Centers the header and footer and puts +% the page number in the center of the footer +% \item[plain] Prints no headers and puts the page number +% in the center of the footer. +% \item[authortitleinner] +% Prints the author's +% name on the even pages and the title on the odd ones. +% In order to use this option the \cmd{title} and +% \cmd{author} commands are required +% \item[authortitlecenter] +% As the previous one but with centered headers and footers. +% \item[elements] +% Prints the chapter title and the section title in the margin +% respectively of even pages and odd pages. The page number is +% put in the outer side of the footer. This is the style loaded +% by the option \opt{style=elements}. +% \end{valuelist} +% \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, +% \opt{smallcaps}} +% \begin{valuelist} +% \item[roman] Prints the headers in roman +% \item[italic] Prints the headers in \emph{italic} +% \item[smallcaps] Prints the headers in \textsc{small caps} +% \end{valuelist} +% \end{optionlist} +% % \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} +% +% \begin{optionlist} +% \optitem[center]{quotestyle}{\opt{center}, \opt{right}} +% \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} +% \begin{valuelist} +% \item[center] +% Indents the block quotations +% on both the left and right margins +% \item[right] +% Indents the block quotations +% only on the left margin +% \end{valuelist} +% \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}} +% \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} +% \begin{valuelist} +% \item[footnotesize] +% Prints the block quotations +% in \cmd{footnotesize} size +% \item[small] % Prints the block quotations % in \cmd{small} size -% \optitem{defaultparindent} -% Set |\parinden| to the standard value of 1.5\,em.\new -% \end{ltxsyntax} +% \end{valuelist} +% \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung}, +% \opt{dotted}, \opt{superscript}} +% \changes{v0.9b}{2012/09/23}{Changed \opt{standardfootnote} option +% and renamed to \opt{footnotestyle}} +% \begin{valuelist} +% \item[bulged] The footnote number protrudes beyond the left margin. +% \item[hung] +% Indents the footnote text, so it will ‘hang’ +% under the first line of the text. +% \item[dotted] +% The footnote number is aligned to the left margin +% and followed by a dot. +% \item[superscript] +% Prints a superscript footnote number aligned to the left margin +% \end{valuelist} +% \boolitem[false]{fewfootnotes} +% \changes{v0.9b}{2012/09/23}{New option \opt{fewfootnotes}} +% Uses symbols instead of numbers to mark footnotes +% It is active only if your document has +% three footnotes per page maximum. +% The symbol sequence is: *, **, ***. +% With more footnotes you should not need this option. +% \optitem[bulged]{liststyle}{\opt{bulged}, \opt{aligned}, \opt{indented}} +% \begin{valuelist} +% \item[bulged] +% The item number or symbol protrudes beyond the left margin. +% \item[aligned] +% Aligns the lists to the left margin +% \item[indented] +% Prints standard indented lists +% \end{valuelist} +% \optitem[standard]{captionstyle}{\opt{standard}, \opt{elements}} +% \begin{valuelist} +% \item[standard] Prints a standard caption in small size. +% \item[elements] As the previous one but in sanserif font. +% \end{valuelist} +% \end{optionlist} % -% \subsection{Titles} -% In the following options \texttt{<level>} stands for \opt{part}, -% \opt{chap}, \opt{sec}, \opt{subsec},\opt{subsubsec} -% \begin{ltxsyntax} -% \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 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} -% 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{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} -% \optitem{artemisia} Loads the Artemisia font (default). -% \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. -% \end{ltxsyntax} +%\begin{optionlist} +% \optitem[palatino]{defaultfont}{\opt{palatino}, \opt{lmodern}, +% \opt{cmodern}} +% \begin{valuelist} +% \item[palatino] Loads the Palatino font. +% \item[cmodern] Loads the \LaTeX{} standard Computer Modern. +% \end{valuelist} +% \optitem[artemisia]{greekfont}{\opt{artemisia}, \opt{porson}, +% \opt{cbgreek}, \opt{cbgreeklmr}} +% \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}} +% \begin{valuelist} +% \item[artemisia] Loads the Artemisia font. +% \item[porson] Loads the Porson font. +% \item[cbgreek] Loads the standard CB~Greek font. +% \end{valuelist} +% \end{optionlist} +% +% \subsection{Other options} +% +%\begin{optionlist} +%\boolitem[true]{marginpar} +% \begin{valuelist} +% \item[true] Prints the marginal notes. +% \item[false] Hide the marginal notes. +% \end{valuelist} +%\boolitem[false]{partpage} +% \changes{v0.9b}{2012/09/23}{New option \opt{partpage}} +% This option is active only with \opt{documentstructure=article}. +% \begin{valuelist} +% \item[true] Prints the part title in a separate page as in +% \opt{documentstructure=book} +% \item[false] Prints the part title as in \opt{article} class. +% \end{valuelist} +% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}} +% \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} +% \begin{valuelist} +% \item[compact] +% Sets |\parindent| to 1\,em. +% \item[wide] +% Sets |\parindent| to 1.5\,em. +% \end{valuelist} +%\end{optionlist} % -% \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. +% \optitem{bozza} +% Prints ``Version of \meta{date}'' in the footer. % \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)} +% +% You can get up to 120 variants combining these styles +% with \opt{dottedchap} and \opt{romanchapnum} options. +% +% \begin{optionlist} +% \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, +% \opt{smallcaps(1-6)}, \opt{elements}, \opt{sufelements}} +% \begin{valuelist} +% \item[roman(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). +% \item[italic(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)} +% \item[smallcaps(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. +% \item[elements] Reproduces the style of \textcite{Bringhurst:1996} +% \item[sufelements] Loads \opt{headerstyle=smallcaps}, +% \opt{chapfont=smallcaps}, \opt{secfont=smallcaps} +% \opt{subsecfont=italic} and \opt{chaptstyle=elements} options. +% \end{valuelist}% \end{optionlist} % % \section{New commands}\label{sec:commands} % @@ -539,6 +655,7 @@ % \begin{ltxsyntax} % % \cmditem{title}[short title for headers]{complete title for titlepage} +% \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command} % % This command is for use with option \opt{authortitle} if the title is too long % or has some breaks. @@ -561,41 +678,47 @@ % or the \cmd{thanks} command: % \begin{ttquote} % \cmd{author}\{\meta{Name Surname}\\ -% \cmd{thanks}\{This work has been typeset with \LaTeX{},\\ +% \cmd{thanks}\{This work has been typeset with \cmd{LaTeX},\\ % using the \cmd{textsf}\{suftesi\} cass by Ivan Valbusa\}.\} % \end{ttquote} % % \cmditem{bookcolophon}{copyright notice}{attribution notice and % other informations} +% \changes{v0.6}{2011/10/21}{New command \cmd{bookcolophon}} % % This command is similar to \cmd{colophon} but it is completely customizable. % The first argument prints its content (usually the copyright notice) in the center of the page. % The second argument prints its content at the bottom. For example: % -% \begin{verbatim} -% \bookcolophon{Copyright © 2007 by Ivan Valbusa}{This work has been -% typeset with \LaTeX, using the \sty{suftesi} class by Ivan -% Valbusa\index{Valbusa, Ivan}. The normal font is Palatino by Hermann -% Zapf. The sans serif font is Iwona by Janusz M.~Nowacki.} -% \end{verbatim} +% \begin{ttquote} +% \cmd{bookcolophon}\{Copyright © 2007 by Ivan Valbusa\}\{%\\ +% This work has been typeset with \cmd{LaTeX}, using the +% \cmd{sty}\{suftesi\} class by Ivan Valbusa\cmd{index}\{Valbusa, +% Ivan\}. The normal font is Palatino by \\ +% Hermann Zapf. The sans serif font is Iwona by Janusz M.~Nowacki.\} +% \end{ttquote} % % \cmditem{artcolophon}{copyright notice, attribution and other informations} +% \changes{v0.6}{2011/10/21}{New command \cmd{artcolophon}} % % This command only has one argument. It simply prints its content at the % bottom of the page. Here is an example: % -% \begin{verbatim} -% \artcolophon{This work is licensed under the Creative Commons +% \begin{ttquote} +% \cmd{artcolophon}\{\\ +% This work is licensed under the Creative Commons\\ % Attribution-NonCommercial-NoDerivs 3.0 Unported License. To view -% a copy of this license, visit -% \begin{center} -% \texttt{http://creativecommons.org/licenses/by-nc-nd/3.0/} -% \end{center} -% or send a letter to Creative Commons, 444 Castro Street, Suite 900, -% Mountain View, California, 94041, USA.\\[1ex] +% a copy of this license, visit\\ +% +% \cmd{begin}\{center\}\\ +% \cmd{texttt}{http://creativecommons.org/licenses/by-nc-nd/3.0/}\\ +% \cmd{end}\{center\}\\ % -% Typeset with \LaTeX, using the \sty{suftesi} class by Ivan Valbusa.} -% \end{verbatim} +% or send a letter to Creative Commons, 444 Castro Street, Suite 900,\\ +% Mountain View, California, 94041, USA.\cmd{}\cmd{}[1ex]\\ +% +% Typeset with \cmd{LaTeX}, using the \cmd{sty}{suftesi} class by Ivan Valbusa.\} +% \end{ttquote} % % \cmditem{finalcolophon}{colophon content} % @@ -626,22 +749,180 @@ % % \cmditem{chapnumfont}{name} % -% Sets the font for the number of the chapter (only with the \opt{sufelements} option). -% The default is ``\texttt{pplj}'' (\LaTeX) or ``Palatino'' (\XeLaTeX). -% +% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}} +% Sets the font of the chapter number of \opt{style=elements} +% and \opt{style=sufelements} styles. +% The default is ``\texttt{pplj}'' (\LaTeX) or ``Junicode'' (\XeLaTeX). +% \begin{ttquote} +% \cmd{chapnumfont}\{pplj\}\\ +% \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Junicode\}\} +% \end{ttquote} % \cmditem{toclabelspace}{level}{label-width}\new +% \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}} % % 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} +% \begin{ttquote} +% \cmd{toclabelwidth}\{part\}\{1em\}\\ +% \cmd{toclabelwidth}\{chapter\}\{1em\}\\ +% \cmd{toclabelwidth}\{section\}\{1.5em\}\\ +% \cmd{toclabelwidth}\{subsection\}\{2em\}\\ +% \cmd{toclabelwidth}\{subsubsection\}\{2.5em\}\\ +% \cmd{toclabelwidth}\{paragraph\}\{3em\}\\ +% \cmd{toclabelwidth}\{subparagraph\}\{3.5em\} +% \end{ttquote} +% \cmditem{xfootnote}{symbol}{footnote text} +% \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}} +% +% A command to print a footnote with a discretionary +% symbols instead of numbers to mark footnotes. It does not +% increment the footnote counter. +% \begin{ttquote} +% \cmd{xfootnote}\{\cmd{dagger}\}\{The text of the footnote.\} +% \end{ttquote} % \end{ltxsyntax} +% +% \subsection{Obsolete options} +% +% \begin{multicols}{2} +% \footnotesize +% \begin{ltxsyntax} +% \optitem{defaultparindent} +% \changes{v0.9a}{2012/08/31}{New option \opt{defaultparindent}} +% $\rightarrow$ \opt{parindent=compact}. +% \optitem{ralignquotation} +% \changes{v0.9a}{2012/08/31}{New option \opt{ralignquotation}} +% $\rightarrow$ \opt{quotestyle=right} +% \optitem{smallquotation} +% \changes{v0.9a}{2012/08/31}{New option \opt{smallquotation}} +% $\rightarrow$ \opt{quotesize=small} +% \optitem{standardfootnote} +% \changes{v0.9a}{2012/08/31}{New option \opt{standardfootnote}} +% $\rightarrow$ \opt{footnotes=superscript} +% \optitem{dottedfootnote} +% \changes{v0.9a}{2012/08/31}{New option \opt{dottedfootnote}} +% $\rightarrow$ \opt{footnotes=dot} +% \optitem{indentlist} +% \changes{v0.9a}{2012/08/31}{New option \opt{indentlist}} +% $\rightarrow$ \opt{liststyle=indented} +% \optitem{alignlist} +% \changes{v0.9a}{2012/08/31}{New option \opt{alignlist}} +% $\rightarrow$ \opt{liststyle=aligned} +% \optitem{artemisia} $\rightarrow$ \opt{greekfont=artemisia}. +% \optitem{porson} $\rightarrow$ \opt{greekfont=porson}. +% \optitem{defaultgreek} $\rightarrow$ \opt{greekfont=cbgreek}. +% \optitem{defaultfont} +% $\rightarrow$ \opt{defaultfont=cm}. +% \optitem{centerpart} +% \changes{v0.9a}{2012/08/31}{New option \opt{centerpart}} +% $\rightarrow$ \opt{partstyle=center}. +% \optitem{centerchap} +% \changes{v0.9a}{2012/08/31}{New option \opt{centerchap}} +% $\rightarrow$ \opt{chapstyle=center}. +% \optitem{centersec} +% \changes{v0.9a}{2012/08/31}{New option \opt{centersec}} +% $\rightarrow$ \opt{secstyle=center}. +% \optitem{rightpart} +% \changes{v0.9a}{2012/08/31}{New option \opt{rightpart}} +% $\rightarrow$ \opt{partstyle=right}. +% \optitem{rightchap} +% \changes{v0.9a}{2012/08/31}{New option \opt{rightchap}} +% $\rightarrow$ \opt{chapstyle=right}. +% \optitem{rightsec} +% \changes{v0.9a}{2012/08/31}{New option \opt{rightsec}} +% $\rightarrow$ \opt{secstyle=right}. +% \optitem{numparpart} +% \changes{v0.9a}{2012/08/31}{New option \opt{numparpart}} +% $\rightarrow$ \opt{partnumposition=above}. +% \optitem{numparchap} +% \changes{v0.9a}{2012/08/31}{New option \opt{numparchap}} +% $\rightarrow$ \opt{chapnumposition=above}. +% \optitem{numparsec} +% \changes{v0.9a}{2012/08/31}{New option \opt{numparsec}} +% $\rightarrow$ \opt{secnumposition=above}. +% \optitem{smallcapspart} +% \changes{v0.9a}{2012/08/31}{New option \opt{smallcapspart}} +% $\rightarrow$ \opt{partstyle=smallcaps}. +% \optitem{smallcapschap} +% \changes{v0.9a}{2012/08/31}{New option \opt{smallcapschap}} +% $\rightarrow$ \opt{chapstyle=smallcaps}. +% \optitem{smallcapssec} +% \changes{v0.9a}{2012/08/31}{New option \opt{smallcapssec}} +% $\rightarrow$ \opt{subsecstyle=smallcaps}. +% \optitem{italicpart} +% \changes{v0.9a}{2012/08/31}{New option \opt{italicpart}} +% $\rightarrow$ \opt{partstyle=italic}. +% \optitem{italicchap} +% \changes{v0.9a}{2012/08/31}{New option \opt{italicchap}} +% $\rightarrow$ \opt{chapsecstyle=italic}. +% \optitem{italicsec} +% \changes{v0.9a}{2012/08/31}{New option \opt{italicsec}} +% $\rightarrow$ \opt{secstyle=italic}. +% \optitem{italicsubsec} +% \changes{v0.9a}{2012/08/31}{New option \opt{italicsubsec}} +% $\rightarrow$ \opt{subsecstyle=italic}. +% \optitem{romanchapnum} +% \changes{v0.9a}{2012/08/31}{New option \opt{romanchap}} +% $\rightarrow$ \opt{chapnumstyle=roman}. +% \optitem{dottedchap} +% \changes{v0.9a}{2012/08/31}{New option \opt{dottedchap}} +% $\rightarrow$ \opt{chapnumstyle}. +% \optitem{italicheader} +% \changes{v0.9a}{2012/08/31}{New option \opt{italicheader}} +% $\rightarrow$ \opt{headerfont=italic}. +% \optitem{smallcapsheader} +% \changes{v0.9a}{2012/08/31}{New option \opt{smallcapsheader}} +% $\rightarrow$ \opt{headerfont=smallcaps}. +% \optitem{centerheader} +% $\rightarrow$ \opt{headerstyle=center} +% \optitem{sufplain} +% $\rightarrow$ \opt{headerstyle=plain} +% \optitem{authortitle} +% \changes{v0.6}{2011/10/21}{New option \opt{authortitle}} +% $\rightarrow$ \opt{headerstyle} +% \optitem{periodical} +% \changes{v0.8}{2012/03/19}{New option \opt{periodical}} +% $\rightarrow$ \opt{pagestyle=periodical} +% \optitem{compact} +% \changes{v0.5}{2011/10/21}{New option \opt{compact}} +% $\rightarrow$ \opt{pagestyle=compact} +% \optitem{supercompact} +% \changes{v0.5}{2011/10/21}{New option \opt{supercompact}} +% $\rightarrow$ \opt{pagestyle=supercompact} +% \optitem{dottedtoc} +% \changes{v0.9}{2012/04/22}{New option \opt{dottedtoc}} +% $\rightarrow$ \opt{tocstyle=dotted} +% \optitem{raggedtoc} +% \changes{v0.9}{2012/04/22}{New option \opt{raggedtoc}} +% $\rightarrow$ \opt{tocstyle=ragged} +% \optitem{tocpageleft} +% \changes{v0.9a}{2012/08/31}{New option \opt{tocpageleft}} +% $\rightarrow$ \opt{tocstyle=pageleft} +% \optitem{dottedpart} +% \changes{v0.9a}{2012/08/31}{New option \opt{dottedpart}} +% $\rightarrow$ \opt{partnumstyle=dotarabic} +% \optitem{elements} +% \changes{v0.5}{2011/10/21}{New option \opt{elements}} +% $\rightarrow$ \opt{documentstructure=elements} +% \optitem{nomarginpar} +% \changes{v0.5}{2011/10/21}{New option \opt{nomarginpar}} +% $\rightarrow$ \opt{marginpar=false}. +% \optitem{nocrop} +% \changes{v0.5}{2011/10/21}{New option \opt{nocrop}} +% $\rightarrow$ \opt{crop=false} +% \optitem{rmstyle(1-6)} +% \changes{v0.9a}{2012/08/31}{New option \opt{rmstyle(1-6)}} +% An old name for \opt{style=roman(1-6)} +% \optitem{itstyle(1-12)} +% \changes{v0.9a}{2012/08/31}{New option \opt{itstyle(1-12)}} +% An old name for \opt{style=italic(1-6)} +% \optitem{scstyle(1-12)} +% \changes{v0.9a}{2012/08/31}{New option \opt{scstyle(1-12)}} +% An old name for \opt{style=smallcaps(1-6)} +% \optitem{sufelements} +% \changes{v0.5}{2011/10/21}{New option \opt{sufelements}} +% An old name for \opt{style=sufelements} +% \end{ltxsyntax} +% \end{multicols} % \appendix % \label{predefined-styles} % \includepdf[pages=1-]{collect-examples} @@ -653,11 +934,10 @@ % \StopEventually{\PrintChanges\PrintIndex} % \section{The Code} %<*class> -% \begin{macrocode} -\newif\ifsuftesi@artemisia +% \begin{macrocode} +\RequirePackage{xkeyval} +\newif\ifsuftesi@cmfont \newif\ifsuftesi@porson -\newif\ifsuftesi@defaultgreek -\newif\ifsuftesi@defaultfont \newif\ifsuftesi@centerheader \newif\ifsuftesi@sufplain \newif\ifsuftesi@bozza @@ -666,374 +946,705 @@ \newif\ifsuftesi@periodical \newif\ifsuftesi@compact \newif\ifsuftesi@supercompact -\newif\ifsuftesi@elements \newif\ifsuftesi@sufelements \newif\ifsuftesi@nocrop -\newif\ifsuftesi@nomarginpar \newif\ifsuftesi@dottedtoc \newif\ifsuftesi@raggedtoc -\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@pagelefttoc +\newif\ifsuftesi@fewfootnotes +\newif\ifsuftesi@partpage \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} +\newif\ifsuftesi@elementschap +\newif\ifsuftesi@elementsheader +\newif\ifsuftesi@elementsstructure +\newif\ifsuftesi@elementspagelayout % \end{macrocode} % Execute options: % \begin{macrocode} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} -\ExecuteOptions{artemisia,rmstyle1} \ProcessOptions \relax % \end{macrocode} % \sty{suftesi} is based on the standard \sty{book} class! % \begin{macrocode} -\LoadClass{book} +\LoadClass{book} +% \end{macrocode} +% \subsection{Document srtucture} +% \begin{macrocode} +\define@choicekey{}{documentstructure}[\val\nr] + {book,article}[book]{% +\ifcase\nr\relax +\or +\suftesi@articletrue +\@titlepagefalse +\fi} +% \end{macrocode} +% \subsection{Page layout} +% \begin{macrocode} +\RequirePackage{geometry} + \geometry{heightrounded} +\define@choicekey{}{pagelayout}[\val\nr] + {standard,periodical,compact,supercompact,elements}[standard]{% +\ifcase\nr\relax + \DeclareRobustCommand{\SUF@chaptersize}{\Large} + \geometry{% + a4paper, + includeheadfoot=true, + textwidth= 110mm, + textheight= 220mm, + marginratio= 1:2, + marginparwidth= 30mm, + marginparsep= 12pt} +\or +\suftesi@periodicaltrue + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \geometry{ + includeheadfoot=false, + textheight= 165mm, + textwidth= 110mm, + paperwidth= 170mm, + paperheight= 240mm, + marginratio= 2:3, + marginparwidth= 26mm, + marginparsep= 10pt} +\or +\suftesi@compacttrue + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \geometry{ + includeheadfoot=false, + textheight= 165mm, + textwidth= 110mm, + paperwidth= 160mm, + paperheight= 240mm, + marginratio= 2:3, + marginparwidth= 22mm, + marginparsep= 9pt} +\or +\suftesi@supercompacttrue + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \geometry{ + includeheadfoot=false, + textheight= 150mm, + textwidth= 100mm, + paperwidth= 140mm, + paperheight= 210mm, + marginratio= 2:3, + marginparwidth= 18mm, + marginparsep= 8pt} +\or +\suftesi@elementspagelayouttrue + \geometry{% + includeheadfoot=false, + textwidth= 251pt, + textheight= 502pt, + paperwidth= 374pt, + paperheight= 648pt, + vmarginratio= 1:2, + marginparwidth= 60pt, + marginparsep= 18pt, + outer= 90pt} +\fi} +% \end{macrocode} +% \subsection{Sections style} +% \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 titles and numbers of parts, +% chapters, sections, subsections and subsubsection. +% \begin{macrocode} +\define@choicekey{}{partstyle}[\val\nr]{% + left,center,right,parleft,parcenter,parright}[left]{% +\ifcase\nr\relax + \def\SUF@lr@PARTSwitch{\filright} +\or + \def\SUF@lr@PARTSwitch{\filcenter} +\or + \def\SUF@lr@PARTSwitch{\filleft} +\or%numpar + \def\SUF@lr@PARTSwitch{\filright} + \suftesi@numparparttrue +\or + \def\SUF@lr@PARTSwitch{\filcenter} + \suftesi@numparparttrue +\or + \def\SUF@lr@PARTSwitch{\filleft} + \suftesi@numparparttrue +\fi} +\define@choicekey{}{chapstyle}[\val\nr]{% + left,center,right,parleft,parcenter,parright,elements}[left]{% +\ifcase\nr\relax + \def\SUF@lr@CHAPSwitch{\filright} +\or + \def\SUF@lr@CHAPSwitch{\filcenter} +\or + \def\SUF@lr@CHAPSwitch{\filleft} +\or%numparchap + \def\SUF@lr@CHAPSwitch{\filright} + \suftesi@numparchaptrue +\or + \def\SUF@lr@CHAPSwitch{\filcenter} + \suftesi@numparchaptrue +\or + \def\SUF@lr@CHAPSwitch{\filleft} + \suftesi@numparchaptrue +\or + \suftesi@elementschaptrue +\fi} +\define@choicekey{}{secstyle}[\val\nr]{% + left,center,right,parleft,parcenter,parright}[left]{% +\ifcase\nr\relax + \def\SUF@lr@SECSwitch{\filright} +\or + \def\SUF@lr@SECSwitch{\filcenter} +\or + \def\SUF@lr@SECSwitch{\filleft} +\or%numparsec + \def\SUF@lr@SECSwitch{\filright} + \suftesi@numparsectrue +\or + \def\SUF@lr@SECSwitch{\filcenter} + \suftesi@numparsectrue +\or + \def\SUF@lr@SECSwitch{\filleft} + \suftesi@numparsectrue +\fi} +\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{% +\ifcase\nr\relax + \def\SUF@lr@SUBSECSwitch{\filright} +\or + \def\SUF@lr@SUBSECSwitch{\filcenter} +\or + \def\SUF@lr@SUBSECSwitch{\filleft} +\fi} +\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{% +\ifcase\nr\relax + \def\SUF@lr@SUBSUBSECSwitch{\filright} +\or + \def\SUF@lr@SUBSUBSECSwitch{\filcenter} +\or + \def\SUF@lr@SUBSUBSECSwitch{\filleft} +\fi} +% \end{macrocode} +% \subsection{Sections font} +% These macros control the style of part, chapter, section, +% subsection and subsubsection levels. +% \DescribeMacro{\SUF@PART@StyleSwitch} +% \DescribeMacro{\SUF@CHAP@StyleSwitch} +% \DescribeMacro{\SUF@SEC@StyleSwitch} +% \DescribeMacro{\SUF@SUBSEC@StyleSwitch} +% \DescribeMacro{\SUF@SUBSUBSEC@StyleSwitch} +% \begin{macrocode} +\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\ifcase\nr\relax +\def\SUF@PART@StyleSwitch{\relax} +\or +\def\SUF@PART@StyleSwitch{\itshape} +\or +\def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps} +\fi} +\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\ifcase\nr\relax +\def\SUF@CHAP@StyleSwitch{\relax} +\or +\def\SUF@CHAP@StyleSwitch{\itshape} +\or +\def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps} +\fi} +\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\ifcase\nr\relax +\def\SUF@SEC@StyleSwitch{\relax} +\or +\def\SUF@SEC@StyleSwitch{\itshape} +\or +\def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} +\fi} +\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\ifcase\nr\relax +\def\SUF@SUBSEC@StyleSwitch{\relax} +\or +\def\SUF@SUBSEC@StyleSwitch{\itshape} +\or +\def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} +\fi} +\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\ifcase\nr\relax +\def\SUF@SUBSUBSEC@StyleSwitch{\relax} +\or +\def\SUF@SUBSUBSEC@StyleSwitch{\itshape} +\or +\def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} +\fi} +% \end{macrocode} +% \subsection{The number style for part, chapter and section} +% \subsubsection{Part number style} +% \begin{macrocode} +\define@choicekey{}{partnumstyle}[\val\nr] + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% +\ifcase\nr\relax + \def\SUF@thepart{\arabic{part}} + \def\SUF@dotpart{} +\or + \def\SUF@thepart{\textsc{\roman{part}}} + \def\SUF@dotpart{} +\or + \def\SUF@thepart{\Roman{part}} + \def\SUF@dotpart{} +\or + \def\SUF@thepart{\arabic{part}} + \def\SUF@dotpart{.} +\or + \def\SUF@thepart{\textsc{\roman{part}}} + \def\SUF@dotpart{.} +\or + \def\SUF@thepart{\Roman{part}} + \def\SUF@dotpart{.} +\fi} +% \end{macrocode} +% \subsubsection{Chapter number style} +% \begin{macrocode} +\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% +\ifcase\nr\relax + \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@dotchap{} +\or + \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@dotchap{} +\or + \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@dotchap{} +\or + \def\SUF@thechapter{\arabic{chapter}} + \def\SUF@dotchap{.} +\or + \def\SUF@thechapter{\textsc{\roman{chapter}}} + \def\SUF@dotchap{.} +\or + \def\SUF@thechapter{\Roman{chapter}} + \def\SUF@dotchap{.} +\fi} +% \end{macrocode} +% \subsubsection{Section number style} +% \begin{macrocode} +\define@choicekey{}{secnumstyle}[\val\nr] + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% +\ifsuftesi@article +\ifcase\nr\relax + \def\SUF@thesection{\arabic{section}} + \def\SUF@dotsec{} +\or + \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@dotsec{} +\or + \def\SUF@thesection{\Roman{section}} + \def\SUF@dotsec{} +\or + \def\SUF@thesection{\arabic{section}} + \def\SUF@dotsec{.} +\or + \def\SUF@thesection{\textsc{\roman{section}}} + \def\SUF@dotsec{.} +\or + \def\SUF@thesection{\Roman{section}} + \def\SUF@dotsec{.} +\fi +\else + \def\SUF@thesection{\arabic{section}} + \def\SUF@dotsec{} +\fi} +% \end{macrocode} +% \subsection{Headers} +% \subsubsection{Header style} +% \begin{macrocode} +\define@choicekey{}{headerstyle}[\val\nr] + {inner,center,plain,authortitleinner, + authortitlecenter,elements}[inner]{% +\ifcase\nr\relax + \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} + \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} +\or + \suftesi@centerheadertrue + \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} + \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} +\or + \suftesi@sufplaintrue +\or + \suftesi@authortitletrue + \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} +\or + \suftesi@authortitletrue + \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \suftesi@centerheadertrue +\or + \suftesi@elementsheadertrue +\fi} +% \end{macrocode} +% \subsubsection{Header font} +% \begin{macrocode} +\define@choicekey{}{headerfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% +\ifcase\nr\relax + \def\SUF@Rheadstyle{} + \def\SUF@Lheadstyle{} + \def\SUF@thepage{\thepage} +\or + \def\SUF@Rheadstyle{\itshape} + \def\SUF@Lheadstyle{\itshape} + \def\SUF@thepage{\thepage} +\or + \def\SUF@Rheadstyle{\SUF@headingsmallcaps} + \def\SUF@Lheadstyle{\SUF@headingsmallcaps} + \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}} +\fi} +% \end{macrocode} +% \subsection{Text elements} +% \subsubsection{Lists} +% \begin{macrocode} +\RequirePackage[inline]{enumitem} +\renewcommand\labelitemi{\color{sufgray}\textbullet} +\setlist{itemsep=.5ex,parsep=0pt} +\setlist[description]{font=\normalfont\itshape} +\define@choicekey{}{liststyle}[\val\nr] + {bulged,aligned,indented}[bulged]{% +\ifcase\nr\relax + \setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.} + \setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.} + \setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.} + \setlist[itemize,1]{leftmargin=0pt} + \setlist[itemize,2]{leftmargin=1.3\parindent} + \setlist[itemize,3]{leftmargin=1.3\parindent} +\or + \setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.} + \setlist[enumerate,2]{leftmargin= 1.5\parindent,label=\alph*.} + \setlist[enumerate,3]{leftmargin= 1.5\parindent,label=\roman*.} + \setlist[itemize,1]{leftmargin=1\parindent} + \setlist[itemize,2]{leftmargin=1.5\parindent} + \setlist[itemize,3]{leftmargin=1.5\parindent} +\or + \setlist[enumerate,1]{leftmargin=2\parindent,label=\arabic*.} + \setlist[enumerate,2]{leftmargin= 2.5\parindent,label=\alph*.} + \setlist[enumerate,3]{leftmargin= 2.5\parindent,label=\roman*.} + \setlist[itemize,1]{leftmargin=2\parindent} + \setlist[itemize,2]{leftmargin=2.5\parindent} + \setlist[itemize,3]{leftmargin=2.5\parindent} +\fi} +% \end{macrocode} +% \subsubsection{Block quotations} +% \paragraph{Quotation style} +% \begin{macrocode} +\define@choicekey{}{quotestyle}[\val\nr] + {center,right}[center]{% +\ifcase\nr\relax +\def\SUF@quote@style{\rightmargin=\parindent} +\or +\def\SUF@quote@style{} +\fi} +% \end{macrocode} +% \paragraph{Quotation size} +% \begin{macrocode} +\define@choicekey{}{quotesize}[\val\nr] + {footnotesize,small}[footnotesize]{% +\ifcase\nr\relax +\def\SUF@quotation@size{\footnotesize} +\or +\def\SUF@quotation@size{\small} +\fi} +% \end{macrocode} +% \subsubsection{Footnotes} +% \begin{macrocode} +\define@choicekey{}{footnotestyle}[\val\nr] + {bulged,hung,dotted,superscript}[bulged]{% +\ifcase\nr\relax + \renewcommand\@makefntext{% + \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em} +\or + \renewcommand\@makefntext{% + \leftskip=1em\hskip-1.5em% + \makebox[1em][r]{\@thefnmark}\hskip.5em} +\or + \renewcommand\@makefntext{% + \@thefnmark.\hskip.5em} +\or + \renewcommand\@makefntext{% + \textsuperscript{\@thefnmark}\hskip.3em} +\fi} +\define@choicekey{}{fewfootnotes}[\val\nr] + {true,false}[true]{% +\ifcase\nr\relax + \suftesi@fewfootnotestrue +\or + \relax +\fi} +% \end{macrocode} +% \subsubsection{Captions} +% \begin{macrocode} +\RequirePackage{caption} +\define@choicekey{}{captionstyle}[\val\nr] + {standard,elements}[standard]{% +\ifcase\nr\relax + \captionsetup{labelsep=period,font=small,singlelinecheck=false} +\or + \captionsetup{labelsep=period,font=small,singlelinecheck=false} + \captionsetup{font+=sf} +\fi +} +% \end{macrocode} +% \subsubsection{Marginal notes} +% \begin{macrocode} +\define@choicekey{}{marginpar}[\val\nr] + {true,false}[true]{% +\ifcase\nr\relax + \relax +\or + \renewcommand\marginpar[2][]{} +\fi} +% \end{macrocode} +% \subsubsection{Table of contents} +% \DescribeMacro{\SUF@titlerule} +% \DescribeMacro{\SUF@chaptitlerule} +% \begin{macrocode} +\define@choicekey{}{tocstyle}[\val\nr]{% + standard,dotted,ragged,leftpage}[standard]{% +\ifcase\nr\relax + \def\SUF@titlerule{\titlerule*{}} + \def\SUF@chaptitlerule{\titlerule*{}} +\or +\suftesi@dottedtoctrue + \def\SUF@titlerule{\titlerule*{\footnotesize .\ }} + \def\SUF@chaptitlerule{\titlerule*{}} +\or +\suftesi@raggedtoctrue + \def\SUF@titlerule{\hspace{1em}} + \def\SUF@chaptitlerule{\hspace{1em}} +\or +\suftesi@pagelefttoctrue +\fi} +% \end{macrocode} +% \subsection{Fonts} +% \subsubsection{Roman fonts} +% \begin{macrocode} +\define@choicekey{}{defaultfont}[\val\nr]{% + palatino,standard}[palatino]{% +\ifcase\nr\relax +\or + \suftesi@cmfonttrue + \setkeys{suftesi.cls}{greekfont=cbgreek} +\fi} +% \end{macrocode} +% \subsubsection{Greek fonts} +% \begin{macrocode} +\define@choicekey{}{greekfont}[\val\nr]{% + artemisia,porson,cbgreek}[artemisia]{% +\ifcase\nr\relax + \def\SUF@greekfamily{artemisiaeuler} +\or + \def\SUF@greekfamily{porson} +\or + \def\SUF@greekfamily{lmr} +\fi} +% \end{macrocode} +% \subsection{Other options} +% \subsubsection{\cmd{parindent} selection} +% \begin{macrocode} +\define@choicekey{}{parindent}[\val\nr] + {compact,wide}[compact]{% +\ifcase\nr\relax +\setlength\parindent{1em} +\or +\setlength\parindent{1.5em} +\fi} +% \end{macrocode} +% \subsubsection{Part page} +% \begin{macrocode} +\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{% +\ifcase\nr\relax + \suftesi@partpagetrue +\or + \relax +\fi} +% \end{macrocode} +% \subsubsection{Crop marks} +% \begin{macrocode} +\define@choicekey{}{crop}[\val\nr] + {true,false}[true]{% +\ifcase\nr\relax +\or + \suftesi@nocroptrue +\fi} +% \end{macrocode} +% \subsubsection{Titlepage} +% \begin{macrocode} +\define@choicekey{}{titlepage}[\val\nr] + {true,false}[true]{% +\ifcase\nr\relax + \@titlepagetrue +\or + \@titlepagetrue +\fi} +% \end{macrocode} +% \subsubsection{Bozza} +% \begin{macrocode} +\define@choicekey{}{bozza}[\val\nr] + {true,false}[true]{% +\ifcase\nr\relax + \suftesi@bozzatrue +\or +\fi} +% \end{macrocode} +% \subsubsection{Pre-defined styles} +% \begin{macrocode} +\define@choicekey{}{style}[\val\nr] + {roman1,roman2,roman3,roman4,roman5,roman6, + italic1,italic2,italic3,italic4,italic5,italic6, + italic7,italic8,italic9,italic10,italic11,italic12, + smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6, + smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12, + elements,sufelements} + [roman1]{% +\ifcase\nr\relax +% \end{macrocode} +% The 'roman' styles: +% \begin{macrocode} + \setkeys{}{chapstyle=left} +\or + \setkeys{}{chapstyle=center} +\or + \setkeys{}{chapstyle=right} +\or + \setkeys{}{chapstyle=parleft} +\or + \setkeys{}{chapstyle=parcenter} +\or + \setkeys{}{chapstyle=parright} +\or +% \end{macrocode} +% The 'italic' styles: +% \begin{macrocode} + \setkeys{}{chapstyle=left,chapfont=italic} +\or + \setkeys{}{chapstyle=center,chapfont=italic} +\or + \setkeys{}{chapstyle=right,chapfont=italic} +\or + \setkeys{}{chapstyle=parleft,chapfont=italic} +\or + \setkeys{}{chapstyle=parcenter,chapfont=italic} +\or + \setkeys{}{chapstyle=parright,chapfont=italic} +\or + \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps} +\or + \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps} +\or + \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps} +\or +% \end{macrocode} +% The 'smallcaps' styles: +% \begin{macrocode} + \setkeys{}{chapstyle=left,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=center,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=right,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=parleft,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=parcenter,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=parright,chapfont=smallcaps} +\or + \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps} +\or + \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps} +\or + \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps} +\or + \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps} +\or +% \end{macrocode} +% The 'elements' style: +% \begin{macrocode} + \setkeys{}{ + pagelayout=elements, + headerstyle=elements, + chapstyle=elements, + secfont=smallcaps, + subsecfont=italic, + captionstyle=elements} +\disable@keys{} + {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle} +\or +% \end{macrocode} +% The 'sufelements' style: +% \begin{macrocode} + \setkeys{}{ + chapstyle=elements, + headerfont=smallcaps, + secfont=smallcaps, + subsecfont=italic} +\disable@keys{} + {headerstyle,chapstyle,secfont,subsecfont} +\fi} +% \end{macrocode} +% Execute and process options: +% \begin{macrocode} +\ExecuteOptionsX<>{ + marginpar=true, + captionstyle=standard, + parindent=compact, + tocstyle=standard, + greekfont=artemisia, + pagelayout=standard, + headerstyle=inner, + liststyle=bulged, + footnotestyle=bulged, + quotesize=footnotesize, + quotestyle=center, + partstyle=left, + chapstyle=left, + secstyle=left, + subsecstyle=left, + subsubsecstyle=left, + partfont=roman, + chapfont=roman, + secfont=italic, + subsecfont=roman, + subsubsecfont=roman, + headerfont=roman, + secnumstyle=arabic, + partnumstyle=Roman, + chapnumstyle=arabic} +\ProcessOptionsX<>\relax % \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 -\RequirePackage{textcase} \RequirePackage{multicol} \RequirePackage{emptypage} -\RequirePackage{mparhack} +\RequirePackage{textcase} +\RequirePackage{ifxetex,ifluatex} % \end{macrocode} % \subsection{Greek fonts} % Thanks to Enrico Gregorio for these macros: @@ -1041,22 +1652,19 @@ \ifxetex \relax \else +\RequirePackage{microtype} \RequirePackage[LGR,T1]{fontenc} \AtBeginDocument{\fontencoding{T1}\selectfont} -\ifsuftesi@defaultfont +\ifsuftesi@cmfont \relax - \else -\RequirePackage[osf,sc]{mathpazo} -\RequirePackage[scaled=0.8]{beramono} - \linespread{1.05} - \renewcommand{\sfdefault}{iwona} - \fi -\ifsuftesi@artemisia - \def\SUF@greekfamily{artemisiaeuler} - \fi -\ifsuftesi@defaultgreek - \def\SUF@greekfamily{cmr} - \fi + \else + \RequirePackage[osf,sc]{mathpazo} + \RequirePackage[scaled=0.8]{beramono} + \renewcommand{\sfdefault}{iwona} +\fi +% \end{macrocode} +% Scale the Porson font: +% \begin{macrocode} \ifsuftesi@porson \sbox\z@{\fontsize{10}{10}\normalfont A} \sbox\tw@{\font\temp=gporsonrg6a at 10pt \temp A} @@ -1074,7 +1682,6 @@ \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\SUF@greekfamily{porson} \fi \AtBeginDocument{ \DeclareRobustCommand{\greektext}{% @@ -1084,82 +1691,11 @@ % \end{macrocode} % \subsection{Page layout} % \begin{macrocode} -\RequirePackage{geometry} -\ifsuftesi@defaultparindent - \relax - \else - \parindent1em -\fi - \geometry{heightrounded} \ifsuftesi@nocrop \relax \else \RequirePackage[a4,cam,center]{crop} \fi -\ifsuftesi@periodical - \geometry{ - textheight= 165mm, - textwidth= 110mm, - paperwidth= 170mm, - paperheight= 240mm, - marginratio= 2:3, - marginparwidth= 75pt, - marginparsep= 10pt} -\else -\ifsuftesi@compact - \geometry{ - textheight= 165mm, - textwidth= 110mm, - paperwidth= 160mm, - paperheight= 240mm, - marginratio= 2:3, - marginparwidth= 65pt, - marginparsep= 10pt} -\else -\ifsuftesi@supercompact - \geometry{ - textheight= 150mm, - textwidth= 100mm, - paperwidth= 140mm, - paperheight= 210mm, - marginratio= 2:3, - marginparwidth= 50pt, - marginparsep= 9pt} -\else -\ifsuftesi@elements - \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 % \end{macrocode} % A trick to produce one-side documents: % \begin{macrocode} @@ -1174,21 +1710,10 @@ \RequirePackage{titlesec} \newlength{\sectionsep} \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt} -\ifsuftesi@periodical - \DeclareRobustCommand{\SUF@chaptersize}{\large} - \else - \ifsuftesi@compact - \DeclareRobustCommand{\SUF@chaptersize}{\large} - \else - \ifsuftesi@supercompact - \DeclareRobustCommand{\SUF@chaptersize}{\large} - \else - \DeclareRobustCommand{\SUF@chaptersize}{\Large} - \fi - \fi -\fi % \end{macrocode} % \DescribeMacro{\SUF@titlesmallcaps} +% \DescribeMacro{\SUF@headingsmallcaps} +% \DescribeMacro{\SUF@chapnumfont} % \begin{macrocode} \ifxetex \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% @@ -1196,8 +1721,8 @@ \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}} \newcommand{\chapnumfont}[1]{% - \def\SUF@chapnumfont{\fontspec[Numbers=OldStyle]{#1}}} - \chapnumfont{Palatino} + \def\SUF@chapnumfont{#1}} + \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}} \else \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \scshape\MakeTextLowercase{\textls[110]{#1}}}% @@ -1208,121 +1733,36 @@ \chapnumfont{pplj} \fi % \end{macrocode} -% \DescribeMacro{\SUF@thechapter} +% \paragraph{The \opt{elements} style} % \begin{macrocode} -\ifsuftesi@romanchap - \def\SUF@thechapter{\Roman{chapter}} - \else - \def\SUF@thechapter{\arabic{chapter}} -\fi -% \end{macrocode} -% \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 +\define@key[SUF]{elements}{chapsize}[90]{% + \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}} +\define@key[SUF]{elements}{chapposition}[-83]{% + \def\cmdSUF@elements@chapposition{#1}} % \end{macrocode} -% \DescribeMacro{\SUF@dotchap} +% The chapter for \opt{elements} style: % \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] - {}% +\def\SUF@elements@CHAPTER{% + \titleformat{\chapter}[block] + {\Large}% {\begin{picture}(0,0) \setlength{\unitlength}{1pt} - \SUF@chapnumfont% - \ifsuftesi@elements - \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% - \def\SUF@chapnumpos{-83} - \fi - \put(0,\SUF@chapnumpos){% - \hskip\dimexpr(\textwidth+\marginparsep)% - \textcolor{sufgray}{\SUF@thechapter}}% + \SUF@chapnumfont% + \cmdSUF@elements@chapsize + \put(0,\cmdSUF@elements@chapposition){% + \hskip\dimexpr(\textwidth+0.9\marginparsep)% + \textcolor{sufgray}{\SUF@thechapter}}% \end{picture}}% {0pt} - {\Large\SUF@titlesmallcaps} - [\rule{\textwidth}{.1pt}] - \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em] + {\SUF@titlesmallcaps} + [\vspace*{-6pt}\rule{\textwidth}{.1pt}] + } +% \end{macrocode} +% The sections for elements style: +% \begin{macrocode} +\def\SUF@elements@SECTIONS{ \titleformat{\section}[block] - {\filright} + {\extramarks{}{}\filright} {\textnormal\thesection} {1em} {\SUF@titlesmallcaps} @@ -1339,108 +1779,12 @@ {1em} {} \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} -% \subparagraph{Redefinitions for \opt{`article'} mode} -% \begin{macrocode} -\ifsuftesi@article -\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} +% Default styles: % \begin{macrocode} +\def\SUF@default@CHAPTER{ \ifsuftesi@numparchap \titleformat{\chapter}[display] {\SUF@chaptersize\SUF@lr@CHAPSwitch} @@ -1458,56 +1802,39 @@ \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 +\fi} % \end{macrocode} % \DescribeMacro{\section} % \begin{macrocode} +\def\SUF@default@SECTIONS{ \ifsuftesi@numparsec \titleformat{\section}[display] - {\SUF@lr@SECswitch} - {\thesection} + {\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} {0ex} {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\section}[hang] - {\SUF@lr@SECswitch} - {\thesection} + {\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} {1em} {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] -\fi +\fi % \end{macrocode} % \DescribeMacro{\subsection} % \begin{macrocode} \ifsuftesi@numparsubsec \titleformat{\subsection}[display] - {\SUF@lr@SUBSECswitch} + {\SUF@lr@SUBSECSwitch} {\textnormal\thesubsection} {0ex} {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\subsection}[hang] - {\SUF@lr@SUBSECswitch} + {\SUF@lr@SUBSECSwitch} {\textnormal\thesubsection} {1em} {\SUF@SUBSEC@StyleSwitch} @@ -1518,20 +1845,135 @@ % \begin{macrocode} \ifsuftesi@numparsubsubsec \titleformat{\subsubsection}[display] - {\SUF@lr@SUBSUBSECswitch} + {\SUF@lr@SUBSUBSECSwitch} {\textnormal\thesubsubsection} {0ex} {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\subsubsection}[hang] - {\SUF@lr@SUBSUBSECswitch} + {\SUF@lr@SUBSUBSECSwitch} {\textnormal\thesubsubsection} {1em} {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi +} +\ifsuftesi@elementschap +\RequirePackage{extramarks} + \SUF@elements@CHAPTER + \SUF@elements@SECTIONS +\ifsuftesi@periodical + \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt] + \setkeys[SUF]{elements}{chapsize=80,chapposition=-83} +\else +\ifsuftesi@compact + \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt] + \setkeys[SUF]{elements}{chapsize=75,chapposition=-83} +\else +\ifsuftesi@supercompact + \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt] + \setkeys[SUF]{elements}{chapsize=70,chapposition=-73} +\else +\ifsuftesi@elementspagelayout + \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt] + \setkeys[SUF]{elements}{chapsize=60,chapposition=-73} +\else + \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt] + \setkeys[SUF]{elements}{chapsize=90,chapposition=-83} + \fi + \fi + \fi +\fi +\else + \SUF@default@CHAPTER + \SUF@default@SECTIONS +\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 +\fi +% \end{macrocode} +% \subparagraph{Redefinitions for \opt{`article'} mode} +% \begin{macrocode} +\ifsuftesi@article +\def\chapter#1{\ClassError{suftesi} + {\noexpand\chapter level is not defined + using 'documentstructure=article'} + {\noexpand\chapter level is not defined + using 'documentstructure=article'}} + \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} +% \end{macrocode} +% The \opt{partpage} options allows you to print a standard part page +% in \opt{article} mode. +% \begin{macrocode} +\ifsuftesi@partpage + \relax + \else +% \end{macrocode} +% In \opt{article} mode the \cmd{part} command is similar to a +% \cmd{section} but with more vertical space before and after. +% \begin{macrocode} + \titleclass{\part}{straight} + \titlespacing*{\part}{0ex}{2\sectionsep}{2\sectionsep}[0ex] +\fi +\ifsuftesi@numparpart +\titleformat{\part}[display] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart} + {2ex} + {\SUF@PART@StyleSwitch} +\else +\titleformat{\part}[hang] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart} + {1em} + {\SUF@PART@StyleSwitch} +\fi +\else +% \end{macrocode} +% \subparagraph{The default \opt{`book'} mode} +% \begin{macrocode} +\ifsuftesi@numparpart +\titleformat{\part}[display] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart} + {2ex} + {\SUF@PART@StyleSwitch} +\else +\titleformat{\part}[hang] + {\SUF@chaptersize\SUF@lr@PARTSwitch} + {\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart} + {1em} + {\SUF@PART@StyleSwitch} \fi +\fi + % \end{macrocode} % \DescribeMacro{\paragraph} % \begin{macrocode} @@ -1553,7 +1995,6 @@ [{.}\hspace*{1em}] \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep} % \end{macrocode} -% \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}, @@ -1699,7 +2140,6 @@ } \else % \end{macrocode} -% \DescribeMacro{\maketitle} % For |notitlepage| option: % \begin{macrocode} \renewcommand\maketitle{\par @@ -1762,26 +2202,36 @@ \vskip 1.5em} \fi % \end{macrocode} -% \subsection{The frontispiece} +% \subsection{Frontispiece} % \begin{macrocode} \AtBeginDocument{% -\@ifpackageloaded{frontespizio}{% - \ifsuftesi@periodical - \Margini {5.5cm}{7cm}{4.5cm}{1cm} +\@ifpackagewith{frontespizio}{suftesi} + {\ifsuftesi@periodical + \Margini {5.5cm}{7cm}{4.5cm}{0cm} \else \ifsuftesi@compact - \Margini{1cm}{7cm}{6cm}{1cm}% - \Rientro{1cm}% + \Margini {4.5cm}{7cm}{4.5cm}{0cm} \else \ifsuftesi@supercompact - \Margini{1cm}{10cm}{8cm}{1cm}% - \Rientro{1cm}% + \Margini {4.5cm}{10cm}{6cm}{1cm} \else \fi \fi -\fi - }% -{\relax}} +\fi} +{\@ifpackageloaded{frontespizio} + {\ifsuftesi@periodical + \Margini {1cm}{7cm}{5cm}{1cm} + \else + \ifsuftesi@compact + \Margini {1cm}{7cm}{6cm}{1cm} + \else + \ifsuftesi@supercompact + \Margini {1cm}{10cm}{8cm}{1cm} + \else + \fi + \fi +\fi} +{\relax}}} % \end{macrocode} % \begin{environment}{theindex} % \begin{macrocode} @@ -1791,10 +2241,14 @@ \else \@restonecoltrue \fi + \ifsuftesi@article + \twocolumn[\section*{\indexname}]% + \else \twocolumn[\@makeschapterhead{\indexname}]% + \fi \@mkboth{\indexname}{\indexname}% \thispagestyle{plain}% - \raggedright\small% + \raggedright% \parindent\z@ \parskip\z@ \@plus .3\p@\relax \columnseprule \z@ @@ -1859,7 +2313,7 @@ \renewcommand\appendix{\par \setcounter{section}{0}% \setcounter{subsection}{0}% - \gdef\thesection{\@Alph\c@section}} + \gdef\SUF@thesection{\@Alph\c@section}} \else \renewcommand\appendix{\par \setcounter{chapter}{0}% @@ -1879,7 +2333,7 @@ % \end{macrocode} % \paragraph{The \opt{elements} headers} % \begin{macrocode} -\ifsuftesi@elements% +\ifsuftesi@elementsheader% \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} \renewcommand{\sectionmark}[1]{\markright{#1}} \fancypagestyle{elements}{% @@ -1906,17 +2360,17 @@ \renewcommand{\chaptermark}[1]{% \markboth{\chaptertitlename\ \SUF@thechapter}{#1}} \ifsuftesi@article - \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}} + \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}} \else \renewcommand{\sectionmark}[1]{} \fi \fi % \end{macrocode} -% \subparagraph{The \opt{plain} style} +% \paragraph{The \opt{plain} style} % \begin{macrocode} -\fancypagestyle{plain}{\pagestyle{sufplain}} +\fancypagestyle{plain}{\fancyhf{}} % \end{macrocode} -% \subparagraph{The \opt{sufplain} style} +% \paragraph{The \opt{sufplain} style} % \begin{macrocode} \fancypagestyle{sufplain}{% \fancyhf{}% @@ -1924,18 +2378,8 @@ \ifsuftesi@bozza\footnotesize\SUF@versionstring\else\fi} \fancyfoot[C]{\footnotesize\SUF@thepage}} % \end{macrocode} -% \subparagraph{The \opt{centerheader} style} +% \paragraph{The \opt{centerheader} style} % \begin{macrocode} -\def\SUF@LR@MarkSwitch{% - \ifsuftesi@article - \ifsuftesi@authortitle - \SUF@leftmark - \else - \SUF@rightmark - \fi - \else - \SUF@leftmark - \fi} \fancypagestyle{centerheader}{% \fancyhf{}% \fancyfoot[RE,LO]{% @@ -1946,7 +2390,7 @@ \fancyfoot[C]{\footnotesize\SUF@thepage}% }% % \end{macrocode} -% \subparagraph{The \opt{sufdefault} style} +% \paragraph{The \opt{sufdefault} style} % \begin{macrocode} \fancypagestyle{sufdefault}{% \fancyhf{}% @@ -1957,35 +2401,15 @@ \fancyhead[RE]{\footnotesize\xheadbreakfalse% \SUF@LR@MarkSwitch} }% -\ifsuftesi@italicRhead - \def\SUF@Rheadstyle{\itshape} - \else - \ifsuftesi@smallcapsRhead - \def\SUF@Rheadstyle{\SUF@headingsmallcaps} - \else - \def\SUF@Rheadstyle{} - \fi -\fi -\ifsuftesi@italicLhead - \def\SUF@Lheadstyle{\itshape} - \else - \ifsuftesi@smallcapsLhead - \def\SUF@Lheadstyle{\SUF@headingsmallcaps} - \else - \def\SUF@Lheadstyle{} - \fi -\fi - \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\SUF@thepage{\thepage} +% +\ifsuftesi@article + \ifsuftesi@authortitle + \def\SUF@LR@MarkSwitch{\SUF@leftmark} + \else + \def\SUF@LR@MarkSwitch{\SUF@rightmark} + \fi +\else + \def\SUF@LR@MarkSwitch{\SUF@leftmark} \fi \def\SUF@leftrightmark{% \if@mainmatter\leftmark\else\rightmark\fi} @@ -1995,68 +2419,12 @@ \pagestyle{sufdefault} \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi - \ifsuftesi@elements\pagestyle{elements}\else\fi + \ifsuftesi@elementsheader\pagestyle{elements}\else\fi % \end{macrocode} % \subsection{Text elements} -% \subsubsection{Captions} -% \begin{macrocode} -\RequirePackage{caption} -\ifsuftesi@elements - \captionsetup{labelsep=period,font={small,sf},singlelinecheck=false} -\else - \captionsetup{labelsep=period,font=small,singlelinecheck=false} -\fi -% \end{macrocode} -% \subsubsection{Epigraphs} -% \begin{macrocode} -\RequirePackage{epigraph} -\ifsuftesi@elements - \relax - \else - \ifsuftesi@sufelements - \relax - \else - \setlength{\beforeepigraphskip}{-3\baselineskip} - \setlength{\afterepigraphskip}{2\baselineskip} - \setlength{\epigraphrule}{0pt} - \renewcommand{\textflush}{flushepinormal} - \renewcommand{\sourceflush}{flushepinormal} - \renewcommand{\epigraphsize}{\footnotesize} - \fi -\fi -% \end{macrocode} -% \subsubsection{Lists} -% \begin{macrocode} -\RequirePackage[inline]{enumitem} - \setlist{labelsep=0.5\parindent,noitemsep,font=\normalfont} - \setdescription{font=\normalfont\itshape,noitemsep} -\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.3\parindent,label=\alph*.} - \setenumerate[3]{leftmargin= 1.3\parindent,label=\roman*.} - \setitemize[1]{leftmargin=0pt} - \setitemize[2]{leftmargin=1.3\parindent} - \setitemize[3]{leftmargin=1.3\parindent} - \fi -\fi -\renewcommand\labelitemii{\normalfont \textendash} -% \end{macrocode} +% % \subsubsection{Block Quotations} +% % \DescribeEnv{quotation} % \DescribeEnv{quote} % \DescribeEnv{verse} @@ -2067,30 +2435,17 @@ {\list{}{\listparindent\parindent% \itemindent \listparindent \leftmargin \parindent - \ifsuftesi@ralignquotation - \else - \rightmargin \parindent - \fi - \parsep \z@ \@plus\p@}% + \SUF@quote@style + \parsep \z@ \@plus\p@}% \item\relax% - \ifsuftesi@smallquotation - \small - \else - \footnotesize - \fi\noindent\ignorespaces} + \SUF@quotation@size% + \noindent\ignorespaces} {\endlist} \renewenvironment{quote} {\list{}{\leftmargin \parindent - \ifsuftesi@ralignquotation\ - \else - \rightmargin \parindent - \fi}% + \SUF@quote@style}% \item\relax% - \ifsuftesi@smallquotation - \small - \else - \footnotesize - \fi}%\ignorespaces? + \SUF@quotation@size}%\ignorespaces? {\endlist} \renewenvironment{verse} {\let\\\@centercr @@ -2100,36 +2455,54 @@ \rightmargin \leftmargin \advance\leftmargin 1.5em}% \item\relax - \ifsuftesi@smallquotation - \small - \else - \footnotesize - \fi} + \SUF@quotation@size} {\endlist} % \end{macrocode} -% \subsubsection{Notes} -% \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: +% \paragraph{The \opt{fewfootnotes} option} +% Enable only with three footnotes per page maximum. +% \begin{macrocode} +\let\oldfootnote\footnote +\ifsuftesi@fewfootnotes +\def\@fnsymbol#1{\ensuremath{\ifcase#1 + \or * \or ** \or *** \ClassError{suftesi} + {Too many footnotes\MessageBreak + Use class option 'fewfootnote=false'} + {Too many footnotes\MessageBreak + Use class option 'fewfootnote=false'} + \else\@ctrerr\fi}} +\renewcommand{\footnote}[1]{% + \begingroup + \@addtoreset{footnote}{page} + \renewcommand\thefootnote{\fnsymbol{footnote}}\oldfootnote{#1} + \endgroup} +\else\fi +% \end{macrocode} +% \DescribeMacro{\xfootnote} +% Prints a footnote with discretionary +% symbol give in the first argument. +% \begin{macrocode} +\newcommand{\xfootnote}[2]{% + \begingroup + \addtocounter{footnote}{-1} + \@addtoreset{footnote}{page} + \renewcommand\thefootnote{\ensuremath{#1}}\oldfootnote{#2} + \endgroup} +% \end{macrocode} +% \subsubsection{Marginal notes} +% \DescribeMacro{\marginpar} +% The |\marginpar| command is redefined according to the look +% of \emph{Classic Thesis} by André \textcite{Miede:2011} +% \index{Miede, André}. Thanks to Lorenzo +% Pantieri\index{Pantieri, Lorenzo} and Enrico +% Gregorio\index{Gregorio, Enrico}. % \begin{macrocode} - \renewcommand\@makefntext{% - \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em} - \fi -\fi +\def\SUF@mpsetup{% % \end{macrocode} -% \DescribeMacro{\marginpar} -% The |\marginpar| command is redefined according to the look of \emph{Classic Thesis} by André \textcite{Miede:2011}: +% In the \emph{Elements} (i.e. with \opt{elements} option) +% the marginal notes are printed in roman, +% but I prefer italic shape for the other options: % \begin{macrocode} -\def\SUF@mpsetup{%thanks to Lorenzo Pantieri and Enrico Gregorio - \ifsuftesi@elements\relax + \ifsuftesi@elementsheader\relax \else\itshape\fi \footnotesize% \parindent=0pt \lineskip=0pt \lineskiplimit=0pt % @@ -2140,10 +2513,6 @@ \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} % \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 roman font: @@ -2175,18 +2544,6 @@ % \end{macrocode} % \subsubsection{Colophon} % Some useful commands to print a colophon or a copyright notice. -% \begin{macrocode} -\edef\SUF@engine{% - \ifxetex - \noexpand\XeLaTeX - \else - \ifluatex - Lua\noexpand\LaTeX - \else - \noexpand\LaTeX - \fi - \fi} -% \end{macrocode} % \DescribeMacro{\colophon} % \begin{macrocode} \newcommand{\colophon}[3][]{% @@ -2196,10 +2553,10 @@ \def\next{#2} \ifx\next\@empty\else \noindent Copyright \copyright{} \the\year~#2\\[1ex] - Tutti i diritti riservato + Tutti i diritti riservati \fi \vfill - {\small\noindent Questo lavoro è stato composto con \SUF@engine{}% + {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}% \def\next{#1} \ifx\next\@empty\else su #1 \fi usando la classe \textsf{suftesi} di @@ -2235,35 +2592,12 @@ \centering\small #1 \end{minipage} \end{center} - \vspace*{\stretch{6}} - } + \vspace*{\stretch{6}}} % \end{macrocode} % \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. @@ -2305,17 +2639,16 @@ \setlength\SUF@label@subparagraph {\dimexpr(\SUF@label@paragraph+.5em)} \setlength\SUF@label@figure - {\SUF@label@chapter} + {\SUF@label@section} \setlength\SUF@label@table - {\SUF@label@chapter} + {\SUF@label@section} } % \end{macrocode} -% The part entry is the same in both default and -% \opt{topcpageleft} style. +% Part in article mode % \begin{macrocode} \titlecontents{part} [0em] - {\addvspace{3ex}\SUF@tocchapsize\partname~} + {\addvspace{3ex}\partname\hspace*{.5em}} {\makebox[\SUF@label@part][l]{\thecontentslabel}\hspace*{1em}} {} {} @@ -2323,7 +2656,7 @@ % \end{macrocode} % \subsubsection{The \opt{tocpageleft} table of contents} % \begin{macrocode} -\ifsuftesi@tocpageleft +\ifsuftesi@pagelefttoc % \end{macrocode} % \DescribeMacro{\contentsmargin} % First we reset the right margin to zero: @@ -2379,9 +2712,9 @@ \setlength\SUF@addto@tochang@subpar {\dimexpr(\SUF@addto@tochang@par+\SUF@label@subparagraph+.5em)} \setlength\SUF@addto@tochang@fig - {\SUF@addto@tochang@chap} + {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)} \setlength\SUF@addto@tochang@tab - {\SUF@addto@tochang@chap} + {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@section+\SUF@label@chapter)} } % \end{macrocode} % \paragraph{TOC entries} @@ -2390,10 +2723,13 @@ [\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}} + \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} + \makebox[1em][l]{\thecontentspage}% + \hskip\SUF@addto@tochang@chap} {} [\addvspace{1ex}] \titlecontents{section} @@ -2451,7 +2787,7 @@ {} {\hskip-\SUF@tochang@fig% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@fig% - \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}} + \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}} {} {} \titlecontents{table} @@ -2488,9 +2824,9 @@ \setlength\SUF@tocindent@subpar {\dimexpr(\SUF@tocindent@par+\SUF@label@subparagraph+1em)} \setlength\SUF@tocindent@fig - {\SUF@tocindent@chap} + {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)} \setlength\SUF@tocindent@tab - {\SUF@tocindent@chap} + {\dimexpr(\SUF@tocindent@chap+\SUF@label@section-\SUF@label@chapter)} } % \end{macrocode} % \paragraph{TOC entries} @@ -2499,8 +2835,9 @@ [\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} + \makebox[\SUF@label@chapter][l]{\thecontentslabel}% + \hspace*{1em}} + {\hskip-\SUF@tocindent@chap} {\SUF@chaptitlerule\contentspage} [\addvspace{1ex}] \titlecontents{section} @@ -2547,15 +2884,15 @@ \titlecontents{figure} [\SUF@tocindent@fig] {} - {\hskip-\dimexpr(\SUF@label@figure+1em)% - \makebox[\SUF@label@figure][l]{\thecontentslabel}} + {\hskip-\SUF@tocindent@fig% + \makebox[\SUF@label@figure][l]{\thecontentslabel}\hspace*{1em}} {} {\SUF@titlerule\contentspage} \titlecontents{table} [\SUF@tocindent@tab] {} - {\hskip-\dimexpr(\SUF@label@table+1em)% - \makebox[\SUF@label@table][l]{\thecontentslabel}} + {\hskip-\SUF@tocindent@tab% + \makebox[\SUF@label@table][l]{\thecontentslabel}\hspace*{1em}} {} {\SUF@titlerule\contentspage} \fi @@ -2568,24 +2905,24 @@ % \begin{macrocode} \ifsuftesi@article \renewcommand\tableofcontents{% - \thispagestyle{empty} - \section*{\contentsname - \@mkboth{\contentsname}{\contentsname}}% + \vspace{2ex}% + \section*{\contentsname% + \@mkboth{\contentsname}{\contentsname}}% + \thispagestyle{empty} \@starttoc{toc}% \vspace{2ex}% } \renewcommand\listoffigures{% - \section*{\listfigurename}% - \@mkboth{\listfigurename}% - {\listfigurename}% + \section*{\listfigurename% + \@mkboth{\listfigurename}{\listfigurename}}% + \thispagestyle{empty} \@starttoc{lof}% \vspace{2ex}% } \renewcommand\listoftables{% - \section*{\listtablename}% - \@mkboth{% - \listtablename}% - {\listtablename}% + \section*{\listtablename% + \@mkboth{\listtablename}{\listtablename}}% + \thispagestyle{empty} \@starttoc{lot}% \vspace{2ex}% } @@ -2599,10 +2936,11 @@ \else \@restonecolfalse \fi - \chapter*{\contentsname + \chapter*{\contentsname% \@mkboth{% \contentsname} {\contentsname}}% + \thispagestyle{empty} \@starttoc{toc}% \if@restonecol\twocolumn\fi } @@ -2612,9 +2950,10 @@ \else \@restonecolfalse \fi - \chapter*{\listfigurename}% + \chapter*{\listfigurename% \@mkboth{\listfigurename}% - {\listfigurename}% + {\listfigurename}}% + \thispagestyle{empty} \@starttoc{lof}% \if@restonecol\twocolumn\fi } @@ -2624,10 +2963,11 @@ \else \@restonecolfalse \fi - \chapter*{\listtablename}% + \chapter*{\listtablename% \@mkboth{% \listtablename}% - {\listtablename}% + {\listtablename}}% + \thispagestyle{empty} \@starttoc{lot}% \if@restonecol\twocolumn\fi } @@ -2731,12 +3071,8 @@ % \end{macrocode} %</class> % -% \subsection{The bibliography file} -% % \iffalse %<*bib> -% \fi -% \begin{verbatim} @book{Morison:1111, Author = {Stanley Morison}, Booktitle = {First Principles of Typography}, @@ -2841,8 +3177,6 @@ Title = {Gestire la bibliografia con {\LaTeX}}, Volume = {6}, Year = {2008}} -% \end{verbatim} -% \iffalse %</bib> % \fi % \iffalse @@ -2861,13 +3195,14 @@ end %</fakelogo> % \fi % \iffalse -%<*rmstyle1> +%<*style-roman1> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle1]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman1]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2875,16 +3210,17 @@ rmstyle1]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle1> +%</style-roman1> % \fi % \iffalse -%<*rmstyle2> +%<*style-roman2> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle2]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman2]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2892,16 +3228,17 @@ rmstyle2]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle2> +%</style-roman2> % \fi % \iffalse -%<*rmstyle3> +%<*style-roman3> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle3]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman3]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2909,16 +3246,17 @@ rmstyle3]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle3> +%</style-roman3> % \fi % \iffalse -%<*rmstyle4> +%<*style-roman4> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle4]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman4]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2926,16 +3264,17 @@ rmstyle4]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle4> +%</style-roman4> % \fi % \iffalse -%<*rmstyle5> +%<*style-roman5> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle5]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman5]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2943,16 +3282,17 @@ rmstyle5]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle5> +%</style-roman5> % \fi % \iffalse -%<*rmstyle6> +%<*style-roman6> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -rmstyle6]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=roman6]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2960,16 +3300,17 @@ rmstyle6]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</rmstyle6> +%</style-roman6> % \fi % \iffalse -%<*itstyle1> +%<*style-italic1> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle1]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic1]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2977,16 +3318,17 @@ itstyle1]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle1> +%</style-italic1> % \fi % \iffalse -%<*itstyle2> +%<*style-italic2> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle2]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic2]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -2994,16 +3336,17 @@ itstyle2]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle2> +%</style-italic2> % \fi % \iffalse -%<*itstyle3> +%<*style-italic3> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle3]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic3]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3011,16 +3354,17 @@ itstyle3]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle3> +%</style-italic3> % \fi % \iffalse -%<*itstyle4> +%<*style-italic4> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle4]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic4]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3028,16 +3372,17 @@ itstyle4]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle4> +%</style-italic4> % \fi % \iffalse -%<*itstyle5> +%<*style-italic5> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle5]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic5]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3045,16 +3390,17 @@ itstyle5]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle5> +%</style-italic5> % \fi % \iffalse -%<*itstyle6> +%<*style-italic6> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle6]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic6]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3062,16 +3408,17 @@ itstyle6]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle6> +%</style-italic6> % \fi % \iffalse -%<*itstyle7> +%<*style-italic7> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle7]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic7]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3079,16 +3426,17 @@ itstyle7]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle7> +%</style-italic7> % \fi % \iffalse -%<*itstyle8> +%<*style-italic8> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle8]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic8]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3096,16 +3444,17 @@ itstyle8]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle8> +%</style-italic8> % \fi % \iffalse -%<*itstyle9> +%<*style-italic9> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle9]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic9]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3113,16 +3462,17 @@ itstyle9]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle9> +%</style-italic9> % \fi % \iffalse -%<*itstyle10> +%<*style-italic10> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle10]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic10]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3130,16 +3480,17 @@ itstyle10]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle10> +%</style-italic10> % \fi % \iffalse -%<*itstyle11> +%<*style-italic11> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle11]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic11]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3147,16 +3498,17 @@ itstyle11]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle11> +%</style-italic11> % \fi % \iffalse -%<*itstyle12> +%<*style-italic12> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -itstyle12]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=italic12]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3164,16 +3516,17 @@ itstyle12]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</itstyle12> +%</style-italic12> % \fi % \iffalse -%<*scstyle1> +%<*style-smallcaps1> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle1]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps1]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3181,16 +3534,17 @@ scstyle1]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle1> +%</style-smallcaps1> % \fi % \iffalse -%<*scstyle2> +%<*style-smallcaps2> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle2]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps2]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3198,16 +3552,17 @@ scstyle2]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle2> +%</style-smallcaps2> % \fi % \iffalse -%<*scstyle3> +%<*style-smallcaps3> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle3]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps3]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3215,16 +3570,17 @@ scstyle3]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle3> +%</style-smallcaps3> % \fi % \iffalse -%<*scstyle4> +%<*style-smallcaps4> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle4]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps4]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3232,16 +3588,17 @@ scstyle4]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle4> +%</style-smallcaps4> % \fi % \iffalse -%<*scstyle5> +%<*style-smallcaps5> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle5]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps5]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3249,16 +3606,17 @@ scstyle5]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle5> +%</style-smallcaps5> % \fi % \iffalse -%<*scstyle6> +%<*style-smallcaps6> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle6]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps6]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3266,16 +3624,17 @@ scstyle6]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle6> +%</style-smallcaps6> % \fi % \iffalse -%<*scstyle7> +%<*style-smallcaps7> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle7]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps7]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3283,16 +3642,17 @@ scstyle7]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle7> +%</style-smallcaps7> % \fi % \iffalse -%<*scstyle8> +%<*style-smallcaps8> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle8]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps8]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3300,16 +3660,17 @@ scstyle8]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle8> +%</style-smallcaps8> % \fi % \iffalse -%<*scstyle9> +%<*style-smallcaps9> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle9]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps9]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3317,16 +3678,17 @@ scstyle9]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle9> +%</style-smallcaps9> % \fi % \iffalse -%<*scstyle10> +%<*style-smallcaps10> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle10]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps10]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3334,16 +3696,17 @@ scstyle10]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle10> +%</style-smallcaps10> % \fi % \iffalse -%<*scstyle11> +%<*style-smallcaps11> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle11]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps11]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3351,16 +3714,17 @@ scstyle11]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle11> +%</style-smallcaps11> % \fi % \iffalse -%<*scstyle12> +%<*style-smallcaps12> %% !TEX encoding = UTF-8 Unicode %% !TEX TS-program = XeLaTeX -\documentclass[periodical,nocrop, -scstyle12]{suftesi} +\documentclass[pagelayout=periodical,crop=false, +style=smallcaps12]{suftesi} \usepackage{lipsum,fontspec} \setmainfont[Numbers=OldStyle]{Junicode} +\setcounter{chapter}{2} \begin{document} \chapter{Titolo del capitolo} \section{Dolor sit amet} @@ -3368,7 +3732,7 @@ scstyle12]{suftesi} \subsection{Peniteitiagite} \lipsum[9] \end{document} -%</scstyle12> +%</style-smallcaps12> % \fi % \iffalse %<*collect-examples> @@ -3387,37 +3751,38 @@ scstyle12]{suftesi} \textcolor{teal}{\bfseries\fbox{\scalebox{4}{#1}}}} \end{picture}} } +\setcounter{chapter}{2} \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} +\inputex{style-roman1} +\inputex{style-roman2} +\inputex{style-roman3} +\inputex{style-roman4} +\inputex{style-roman5} +\inputex{style-roman6} +\inputex{style-italic1} +\inputex{style-italic2} +\inputex{style-italic3} +\inputex{style-italic4} +\inputex{style-italic5} +\inputex{style-italic6} +\inputex{style-italic7} +\inputex{style-italic8} +\inputex{style-italic9} +\inputex{style-italic10} +\inputex{style-italic11} +\inputex{style-italic12} +\inputex{style-smallcaps1} +\inputex{style-smallcaps2} +\inputex{style-smallcaps3} +\inputex{style-smallcaps4} +\inputex{style-smallcaps5} +\inputex{style-smallcaps6} +\inputex{style-smallcaps7} +\inputex{style-smallcaps8} +\inputex{style-smallcaps9} +\inputex{style-smallcaps10} +\inputex{style-smallcaps11} +\inputex{style-smallcaps12} \end{document} %</collect-examples> % \fi diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins index 1c7fb4f8ff8..7090720d439 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins @@ -43,40 +43,40 @@ \Msg{*** Generating the class file ***} \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}} + \nopreamble\nopostamble + \file{suftesi.bib}{\from{suftesi.dtx}{bib}} + \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}} + \file{style-roman1.tex}{\from{suftesi.dtx}{style-roman1}} + \file{style-roman2.tex}{\from{suftesi.dtx}{style-roman2}} + \file{style-roman3.tex}{\from{suftesi.dtx}{style-roman3}} + \file{style-roman4.tex}{\from{suftesi.dtx}{style-roman4}} + \file{style-roman5.tex}{\from{suftesi.dtx}{style-roman5}} + \file{style-roman6.tex}{\from{suftesi.dtx}{style-roman6}} + \file{style-italic1.tex}{\from{suftesi.dtx}{style-italic1}} + \file{style-italic2.tex}{\from{suftesi.dtx}{style-italic2}} + \file{style-italic3.tex}{\from{suftesi.dtx}{style-italic3}} + \file{style-italic4.tex}{\from{suftesi.dtx}{style-italic4}} + \file{style-italic5.tex}{\from{suftesi.dtx}{style-italic5}} + \file{style-italic6.tex}{\from{suftesi.dtx}{style-italic6}} + \file{style-italic7.tex}{\from{suftesi.dtx}{style-italic7}} + \file{style-italic8.tex}{\from{suftesi.dtx}{style-italic8}} + \file{style-italic9.tex}{\from{suftesi.dtx}{style-italic9}} + \file{style-italic10.tex}{\from{suftesi.dtx}{style-italic10}} + \file{style-italic11.tex}{\from{suftesi.dtx}{style-italic11}} + \file{style-italic12.tex}{\from{suftesi.dtx}{style-italic12}} + \file{style-smallcaps1.tex}{\from{suftesi.dtx}{style-smallcaps1}} + \file{style-smallcaps2.tex}{\from{suftesi.dtx}{style-smallcaps2}} + \file{style-smallcaps3.tex}{\from{suftesi.dtx}{style-smallcaps3}} + \file{style-smallcaps4.tex}{\from{suftesi.dtx}{style-smallcaps4}} + \file{style-smallcaps5.tex}{\from{suftesi.dtx}{style-smallcaps5}} + \file{style-smallcaps6.tex}{\from{suftesi.dtx}{style-smallcaps6}} + \file{style-smallcaps7.tex}{\from{suftesi.dtx}{style-smallcaps7}} + \file{style-smallcaps8.tex}{\from{suftesi.dtx}{style-smallcaps8}} + \file{style-smallcaps9.tex}{\from{suftesi.dtx}{style-smallcaps9}} + \file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}} + \file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}} + \file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}} + \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}} } \Msg{***********************************************************} |