summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/babel-contrib/italian/README.txt8
-rw-r--r--macros/latex/contrib/babel-contrib/italian/italian.dtx116
-rw-r--r--macros/latex/contrib/babel-contrib/italian/italian.pdfbin446223 -> 446180 bytes
-rw-r--r--macros/latex/contrib/decorule/MANIFEST7
-rw-r--r--macros/latex/contrib/decorule/README87
-rw-r--r--macros/latex/contrib/decorule/README.md187
-rw-r--r--macros/latex/contrib/decorule/VERSION1
-rw-r--r--macros/latex/contrib/decorule/decorule.dtx1194
-rw-r--r--macros/latex/contrib/decorule/decorule.ins34
-rw-r--r--macros/latex/contrib/decorule/decorule.pdfbin423349 -> 396165 bytes
-rw-r--r--macros/latex/contrib/suftesi/suftesi.dtx2539
-rw-r--r--macros/latex/contrib/suftesi/suftesi.pdfbin758153 -> 762256 bytes
12 files changed, 2556 insertions, 1617 deletions
diff --git a/macros/latex/contrib/babel-contrib/italian/README.txt b/macros/latex/contrib/babel-contrib/italian/README.txt
index cc96d0bdf0..1d7ea33902 100644
--- a/macros/latex/contrib/babel-contrib/italian/README.txt
+++ b/macros/latex/contrib/babel-contrib/italian/README.txt
@@ -1,10 +1,10 @@
-The italian.dtx file has version number 1.4.03 dated 2019-11-16.
-It is and update of a series fo files stating with the first one in 1990
-Copyright (C) 1990-2019 Claudio Beccari
+The italian.dtx file has version number 1.4.04 dated 2020-05-21.
+It is and update of a series fo files starting with the first one in 1990
+Copyright (C) 1990-2020 Claudio Beccari
Maintainer Claudio Beccari
Contact: claudio dot beccari at gmail dot com
-This bundle containes the source file italian.dtx and this README.txt file. By running pdfLaTeX on thei italian.dtx file you obtain bith the documentation italian.pdf and the language description file italian.ldf.
+This bundle contains the source file italian.dtx and this README.txt file. By running pdfLaTeX on this italian.dtx file you obtain both the documentation italian.pdf and the language description file italian.ldf.
Description
This file contain the necessary and supplementary data for typesetting documents in Italian with babel as the manager of the language management.
diff --git a/macros/latex/contrib/babel-contrib/italian/italian.dtx b/macros/latex/contrib/babel-contrib/italian/italian.dtx
index 6d5a088d6b..da0f09ab40 100644
--- a/macros/latex/contrib/babel-contrib/italian/italian.dtx
+++ b/macros/latex/contrib/babel-contrib/italian/italian.dtx
@@ -10,7 +10,7 @@
\preamble
------------------------------------------
The Italian support for babel: italian.ldf.
-Copyright (C) 1990-2019 Claudio Beccari
+Copyright (C) 1990-2020 Claudio Beccari
All rights reserved
License information appended.
@@ -60,7 +60,7 @@ This file is a self unpacking one.
%</driver>
%<code>\ProvidesLanguage{italian}
%<*code>
- [2019/11/16 v.1.4.03 Italian support for the babel system]
+ [2020/05/21 v.1.4.04 Italian support for the babel system]
%</code>
%%
%% Please report errors to: claudio dot beccari at gmail dot com
@@ -99,7 +99,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
%</driver>
%\fi
%
-% \CheckSum{753}
+% \CheckSum{772}
%
% \changes{italian-0.99}{1990/07/11}{First version, from english.doc}
% \changes{italian-1.0}{1991/04/23}{Modified for babel 3.0}
@@ -171,6 +171,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% xelatex or lualatex.}
% \changes{italian-1.4.01}{2019/01/05}{Rewritten code introduced in 1.4.00,
% and the documentation modified accordingly.}
+% \changes{italian-1.4.04}{2020-05-21}{Added option for ordinal day~1 in
+% \string\dateitalian.}
%
% \section{The Italian language}
% \textbf{Important notice}: This language description file relies on
@@ -190,7 +192,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% defines all the required and some optional language-specific
% macros for the Italian language.
%
-% \begin{table}[htb]\centering
+% \begin{table}[!htb]\centering
% \begin{tabular}{cp{90mm}}
% \toprule
% |"| & inserts a compound word mark where hyphenation is legal;
@@ -211,16 +213,17 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% \bottomrule
% \end{tabular}
% \caption{shorthands for the Italian language. These shorthands are
-% available only if command \texttt{\string\setactivedoublequote} is given
-% after loading \babel\ and before \texttt{\string\begin\{document\}}.}
-% \label{t:itshrtct}
+% available only if command \texttt{\string\setactivedoublequote} is
+% given after loading \babel\ and before
+% \texttt{\string\begin\{document\}}.}\label{t:itshrtct}
% \end{table}
%
% The features of this language definition file are the following:
% \begin{enumerate}
% \item The Italian hyphenation is invoked, provided that the Italian
% hyphenation pattern files were loaded when the specific format file
-% was built.
+% was built. This is normally done with the initial installation of
+% \TeX\-Live, but other distributions may not do so.
% \item The language dependent infix words to be inserted by such
% commands as |\chapter|, |\caption|, |\tableofcontents|,
% etc. are redefined in accordance with the Italian
@@ -234,9 +237,6 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% |\finalhyphendemerits| is set to such a high value that
% hyphenation is strongly discouraged between the last two lines
% of a paragraph.
-%^^A
-%^^A Qui ci si potrebbero mettere le indicazioni per gli attributi e modificatori
-%^^A
% \item Some language specific shorthands have been defined so as to
% allow etymological hyphenation, specifically |"| inserts a
% break point at any word boundary that the typesetter chooses,
@@ -267,8 +267,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% is required in the first word, them the |"-| shorthand comes in
% handy; pay attention though, that if you use an en-dash or an
% em-dash (both should not be used in Italian as compound words
-% connectors, but\dots) then the |"-| shorthand might impeach the |--|
-% or |---| ligatures, thus producing an unacceptable appearance.
+% connectors, but\dots) then the |"-| shorthand might impeach the
+% |--| or |---| ligatures, thus producing an unacceptable appearance.
% \item The shorthand |""| introduces the raised (English) opening
% double quotes; this shorthand proves its usefulness when one
% reminds that the Italian keyboard misses the back tick key, and
@@ -292,14 +292,17 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% The definition of |\unit| takes place only at ``begin document''
% so that it is possible to verify if some other similar
% functionalities have already been defined by other packages, such
-% as |units.sty| or |siunitx.sty|. In particular command |\unit| is
-% deactivated by default; the user can activate it by entering the
-% command |\setISOcompliance| after loading the \babel\ package and
-% before the |\begin{document}| statement. The above checks will enter
-% into action even if this ISO compliance is set, in order to avoid
-% conflicts with the above named packages. The |\ap| and |\ped|
-% commands remain available because up to now no specific conflicts
-% have been reported.
+% as |units.sty| or |siunitx.sty|. Command |\unit| does not
+% conflict with package |SIunitx| and it may be redefined by means
+% of its internals.
+% Nevertheless command |\unit| is deactivated by
+% default; the user can activate it by entering the command
+% |\setISOcompliance| after loading the \babel\ package and before the
+% |\begin{document}| statement. The above checks will enter into
+% action even if this ISO compliance is set, in order to avoid
+% conflicts with the above named packages. The |\ap| and |\ped|
+% commands remain available because up to now no specific conflicts
+% have been reported.
% \item Since in all languages different from English the decimal
% separator according to the ISO regulations \emph{must} be a
% comma\footnote{Actually the Bureau International des Pois et
@@ -311,22 +314,26 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% in mathematics it behaves correctly.
% There are other packages that provide a similar functionality, for
% example |icomma| and |ncccomma|; |icomma|, apparently is not in
-% conflict with |dcolomn|, but requires a space after the comma all
-% the times it plays the r\^ole of a punctuation mark; |ncccomma|,
-% checks if the next token is a digit, but it repeats ten tests every
-% time it meets a comma, irrespective from what it is followed by.
-% I believe that my solution is better than that provided by both
-% those packages; but I assume that if the user loads one of those
-% packages, it prefers to use their functionality; in case one of those
-% packages is loaded, this module excludes its intelligent comma
-% functionality. By default this functionality is turned \emph{off},
-% therefore the user should turn it on by means of the
-% |\IntelligentComma| command; it can turn it off by means of
-% |\NoIntelligentComma|. Please, read subsection~\ref{ssec:comma} to
-% see the various situations where a mathematical comma may be used
-% and how to overcome the few cases when the macros of this file don't
-% behave as expected. The section describes also some limitations when
-% some conflicting packages are being loaded.
+% conflict with |dcolumn|, but requires a space after the comma
+% all the times it plays the r\^ole of a punctuation mark;
+% |ncccomma| checks if the next token is a digit, but it repeats ten
+% tests every time it meets a comma, irrespective from what it is
+% followed by. I believe that my solution is better than that
+% provided by both those packages; but I assume that
+% if the user loads one of those packages, it prefers to use their
+% functionality; in case one of those packages is loaded, this module
+% excludes its intelligent comma functionality.
+% By default this functionality is turned \emph{off}, therefore the
+% user should turn it on by means of the |\IntelligentComma| command;
+% it can turn it off by means of |\NoIntelligentComma|. Please, read
+% subsection~\ref{ssec:comma} to see the various situations where a
+% mathematical comma may be used and how to overcome the few cases
+% when the macros of this file don't behave as expected. The section
+% describes also some limitations when some conflicting packages are
+% being loaded. Apparently there are conflicts with package
+% |unicode-math| because active characters are defined with different
+% codes. Therefore this functionality is not available when
+% typesetting with XeLaTeX or LuaLaTeX.
% \item In Italian legal documents it is common to tag list-items
% with the old fashioned 21-letter Italian alphabet, that differs from
% the Latin one by the omission of the letters `j', `k', `w',`x', and
@@ -351,6 +358,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% essential with open software such as the uncountable contributions
% to the \TeX\ system. Thank you very much.
%
+% \StopEventually{%
% \begin{thebibliography}{1}
% \bibitem{CBec} Beccari C., ``Computer Aided Hyphenation for
% Italian and Modern Latin'', \textsf{TUGboat} vol.~13, n.~1,
@@ -358,9 +366,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% \bibitem{Becc2} Beccari C., ``Typesetting mathematics for science
% and technology according to ISO\,31/XI'', \textsf{TUGboat}
% vol.~18, n.~1, pp.~39-48 (1997).
-% \end{thebibliography}
-%
-% \StopEventually{}%
+% \end{thebibliography}}
%
%\section{The commented code}
% The macro |\LdfInit| takes care of preventing that this file is
@@ -445,9 +451,27 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% The macro |\dateitalian| redefines the command
% |\today| to produce Italian dates.
% \changes{italian-1.0c}{1991/06/06}{Removed \cs{global} definitions}
+% \changes{italian-1.4.04}{2020-05-10}{Added commands
+% \cs{OrdinalDayNumberOn} and \cs{OrdinalDayNumberOff}}
+% Normally in Italian day numbers a set as cardinal numbers; some
+% people prefer to use the ordinal number for day~1, and use the
+% cardinal number with the superscript masculine `o'. By default
+% this functionality is turned off but the user can select it with
+% command |\OrdinalDayNumberOn| and deselect it with
+% |\OrdinalDayNumberOff|. The national official regulation require
+% the cardinal numbers only with fully numerical dates; they allow,
+% without prescribing, roman numbers and ordinal numbers only when
+% the month name is spelled out in letters.
% \begin{macrocode}
+\newif\ifOrdinalDayNumber \OrdinalDayNumberfalse
+\def\OrdinalDayNumberOn{\OrdinalDayNumbertrue}
+\def\OrdinalDayNumberOff{\OrdinalDayNumberfalse}
\def\dateitalian{%
- \def\today{\number\day~\ifcase\month\or
+ \def\today{\ifnum\number\day=\@ne
+ \ifOrdinalDayNumber1\ap{o}\else1\fi
+ \else
+ \number\day
+ \fi~\ifcase\month\or
gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or
luglio\or agosto\or settembre\or ottobre\or novembre\or
dicembre\fi\space \number\year}}%
@@ -502,7 +526,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% typesetting engines xelatelx and lualatex.}
% \changes{italian 1.4.03}{2019-11-16}{Adjust the lccode for the
% apostrophe so as to work also with platex and uplatex. Thanks to
-% Hironobu Yamashita <h.y.acetaminophen@gmail.com> who spottes the
+% Hironobu Yamashita <h.y.acetaminophen@gmail.com> who spotted the
% error and suggested the correction.}
%
% In order to enable the hyphenation of words such as
@@ -531,8 +555,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% lead to their proper font alternative variants being used. Apparently
% the |\babelfont| command is more performant in transmitting the proper
% information to |fontspec|. Of course |\babelfont| must be used after the
-% |babel| package has been invoked; while there appears to be any loading
-% precedence requirements when |fontspec| and |polyglossia| are used
+% |babel| package has been invoked; while there appears to be no loading
+% precedence requirements when |fontspec| and |polyglossia| are used.
% \end{macro}
% \end{macro}
%
@@ -618,10 +642,10 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
% hyphenation}
%
% \subsection{Support for etymological hyphenation}
-
+%
% In Italian etymological hyphenation is desirable with
% technical terms, chemical names, and the like.
-
+%
% \subsubsection{Some history}
% In his article on Italian hyphenation \cite{CBec} Beccari pointed
% out that the Italian language gets hyphenated on a phonetic
diff --git a/macros/latex/contrib/babel-contrib/italian/italian.pdf b/macros/latex/contrib/babel-contrib/italian/italian.pdf
index 7f0838f365..f881ca2719 100644
--- a/macros/latex/contrib/babel-contrib/italian/italian.pdf
+++ b/macros/latex/contrib/babel-contrib/italian/italian.pdf
Binary files differ
diff --git a/macros/latex/contrib/decorule/MANIFEST b/macros/latex/contrib/decorule/MANIFEST
index 5315031b5f..c4e0a46368 100644
--- a/macros/latex/contrib/decorule/MANIFEST
+++ b/macros/latex/contrib/decorule/MANIFEST
@@ -1,7 +1,6 @@
-README
-MANIFEST
decorule.dtx
decorule.ins
decorule.pdf
-decorule.dvi
-decorule.ps.gz
+MANIFEST
+README.md
+VERSION
diff --git a/macros/latex/contrib/decorule/README b/macros/latex/contrib/decorule/README
deleted file mode 100644
index fa7fef1c5a..0000000000
--- a/macros/latex/contrib/decorule/README
+++ /dev/null
@@ -1,87 +0,0 @@
-This is the README file for the decorule package.
-
-Summary
-
-This package implements a decorative swelled rule using
-only a symbol from a font installed with all distributions of
-\TeX{}, so it works independently, without the need to install
-any additional software or fonts.
-
-This is the packaged version of the macro which was
-originally published in the 'Typographers' Inn'
-column in TUGboat (Flynn 2010).
-
-This version fixes the bug caused by failing to supply the
-correct values for DVI drivers for rendering glyph rotation.
-The result now works in Postscript output but DVI viewers may
-still display incorrectly.
-
-INSTALLATION
-
-To install this package, run LaTeX on the decorule.ins file.
-This will create the package file decorule.sty, which you must
-move to a directory (folder) where LaTeX will find it.
-
-For personal installations, that is:
-
-(Mac) ~/Library/texmf/tex/latex/decorule
-(Unix / GNU/Linux) ~/texmf/tex/latex/decorule
-(MS-Windows 95/XP) C:\texmf\tex\latex\decorule
-(Windows 7/8) Computer\System\Users\your~name\texmf\tex\latex\decorule
- [replacing your-name with your account name]
-
-Create that directory (folder) if it does not exist.
-
-If you are a Windows user with MiKTeX and this is your
-first time installing packages by hand, you must also
-add the texmf folder to MiKTeX's list of supported
-folders (in the Roots tab of the MiKTeX Maintenance/Settings
-program), and then update the FNDB in the General tab.
-
-For shared installations (multi-user systems), identify
-the shared local directory with the command
-
- kpsewhich -expand-var '$TEXMFLOCAL'
-
-This will give you the texmf location within which you must
-create the tex/latex/decorule subdirectories. Do not forget
-to run the texhash or mktexlsr filename indexer program
-after installation, otherwise the files will not be findable.
-
-USAGE
-
-Add this line to the Preamble of your LateX document:
-
- \usepackage[options]{decorule}
-
-Read the documentation for the options available.
-
-
-BUGS
-
-None known of.
-
-
-COPYRIGHT
-
-%% decorule.*
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any later
-% version. The latest version of this license is in:
-%
-% http://www.latex-project.org/lppl.txt
-%
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
-%
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
-
-Please send comments and bug reports to the maintainer.
diff --git a/macros/latex/contrib/decorule/README.md b/macros/latex/contrib/decorule/README.md
new file mode 100644
index 0000000000..fdbc0de71a
--- /dev/null
+++ b/macros/latex/contrib/decorule/README.md
@@ -0,0 +1,187 @@
+
+[//]: # (decorule LaTeX package)
+
+# decorule
+
+This is the README.md file for the decorule LaTeX package v0.7 (2020-04-01)
+generated by ClassPack v.1.19 (2020-05-19) on 21 May 2020 at 11:04:52
+
+## Summary
+
+This package implements a decorative swelled rule using only a symbol
+from a font installed with all distributions of TeX, so it works
+independently, without the need to install any additional software or
+fonts.
+
+This is the packaged version of the macro which was originally published
+in the “Typographers' Inn” column in TUGboat (Flynn, 2010).
+
+
+## Automated installation
+
+If this package is distributed from CTAN, it should be in a zip file
+which allows it to be installed automatically by the TeX Live Manager
+(tlmgr) and similar automated installers.
+
+If you are using automated LaTeX package installation, no further action
+is required: the package will be installed the first time you use it in
+a LaTeX document.
+
+If you are using the TeX Live Manager (_tlmgr_) program manually, you
+can install this package with the command:
+
+ $ tlmgr install decorule
+
+
+## TDS installation
+
+This package is also available as a TeX Directory System (TDS) zip file
+(`.tds.zip`). This is the standard directory layout for a modern TeX
+installation which enables the package to be unzipped directly into your
+Personal TeX Directory without the need to use _tlmgr_. If you haven’t
+yet created a Personal TeX Directory, see below for details of what one
+is, and how to create it.
+ * You can install this package on any TDS-compliant personal system
+(laptop, desktop, workstation, table, smartphone, PDA, etc) by unzipping
+it straight into your Personal TeX Directory. This will put all the
+files into the right places, so you can start using them immediately.
+ * On a shared (multiuser) system like a server, the administrator can
+unzip it into the `$TEXMFLOCAL` directory instead (see below), and run
+your TeX directory-indexing program (eg _texhash_, _mktexlsr_, etc) so
+that everyone can use it.
+ * If you are using an old non-TDS-compliant system, see below under Manual
+Installation.
+
+### Your Personal TeX Directory
+
+This is a directory (folder) where you should put all local manual
+modifications (updates, additions such as new or updated classes,
+packages, and fonts) that are _not_ handled automatically by _tlmgr_.
+The name and location are fixed (for all practical purposes):
+ * Apple Mac OS X
+
+ ~/Library/texmf
+ * Unix and GNU/Linux
+
+ ~/texmf
+ * MS-Windows 95/XP/NT
+
+ C:\texmf
+ * MS-Windows 2007 and above
+
+ Computer\System\YOURNAME\texmf
+
+Create that folder now if it does not already exist. Put (or unzip) all
+additions to your system that are _not_ handled by _tlmgr_ into this
+directory, following _exactly_ the subdirectory structure that is used
+in your main TeX distribution (unzipping a TDS file does this for you).
+This is what enables LaTeX to find stuff automatically.
+
+
+> #### If you are a Windows user running _MiKTeX_
+> When you create the folder for your Personal TeX Directory, you MUST add it to _MiKTeX_ ’s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
+> > Each time you add or remove software in your Personal TeX Directory, you MUST then click on the `Update FNDB` button in the `General` tab of the _MiKTeX Maintenance/Settings_ program, otherwise _MiKTeX_ will not find them and nothing will work!
+>
+
+Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run
+their filename database indexer program (_mktexlsr_ or _texhash_) for
+files put into a personal TeX directory.
+
+
+## Installation on shared systems
+
+On multi-user systems (Unix-based), identify the shared local directory
+tree with the command
+
+ kpsewhich -expand-var '$TEXMFLOCAL'
+
+This will give you the location of the shared `texmf` directory into
+which you must unzip these files.
+
+Do not forget to run your local TeX filename database indexer program
+(_texhash_ or _mktexlsr_) after installation, otherwise the files will
+not be found by LaTeX and nothing will work!
+
+
+## Manual installation (non-TDS systems)
+
+To install this software manually, download and unzip the _non-_TDS zip
+file into a temporary directory and move the class and/or package
+file[s] and other files to the proper locations where LaTeX will find
+them on your system. This is referred to in some documentation as “the
+`TEXINPUTS` directory”, although it may be called something else on your
+system.
+
+_It is your responsibility to know where this location is._ See the
+question in the TeX FAQ at https://texfaq.org/FAQ-inst-wlcf.html for
+more information. If you do not know, or cannot find it, or do not have
+access to it, your TeX system may be out of date and may need replacing.
+
+
+
+## Online systems and “last resort” systems
+
+Some online LaTeX systems use CTAN, so a package from there should be
+available on demand. For other online LaTeX systems where you do not
+have access to the file system, unzip the _non-_TDS zip file into a
+temporary directory and upload the files to the online system. Follow
+their instructions for where to put them.
+
+In an emergency, or as a last resort on unmanageable systems, it is
+possible simply to put the class and/or package file[s] into your
+current working directory (the same folder as your `.tex` file[s]).
+
+While this may work, it is not supported, and may lead to other
+resources (packages, fonts, images etc) not being found.
+
+
+## Usage
+
+Include the line shown below in the Preamble of your LaTeX document; a
+`\documentclass` line should be at the top; a `\usepackage` command
+normally goes anywhere in the Preamble:
+
+ \usepackage[options]{decorule}
+
+(similarly for other classes or packages if more than one is supplied
+with this package). Read the documentation for the options available, if
+any. The documentation is distributed as a PDF document in the zip file.
+You can also regenerate it by typesetting the `decorule.dtx` file with
+`pdflatex` (and `biber` and _makeindex_) in the normal way.
+
+
+## Bugs and TODO
+
+No outstanding reported bugs at the time of this version.
+
+For TODO items, see the PDF documentation.
+
+
+## Copyright
+
+The following statement is included in the source code:
+
+ Transformed from decorule.xml by ClassPack db2dtx.xsl
+ version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+
+ decorule.sty is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either
+ version 1.3 of this license or (at your option) any later
+ version. The latest version of this license is in:
+
+ http://www.latex-project.org/lppl.txt
+
+ and version 1.3 or later is part of all distributions of
+ LaTeX version 2005/12/01 or later.
+
+ This work has the LPPL maintenance status ‘maintained’.
+
+ The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
+
+ This work consists of the files decorule.dtx and decorule.ins,
+ the derived file ,
+ and any other ancillary files listed in the MANIFEST.
+
+
diff --git a/macros/latex/contrib/decorule/VERSION b/macros/latex/contrib/decorule/VERSION
new file mode 100644
index 0000000000..67e019434c
--- /dev/null
+++ b/macros/latex/contrib/decorule/VERSION
@@ -0,0 +1 @@
+Date of most recent change is 2020-04-01
diff --git a/macros/latex/contrib/decorule/decorule.dtx b/macros/latex/contrib/decorule/decorule.dtx
index 80f70bd597..b7dbb68009 100644
--- a/macros/latex/contrib/decorule/decorule.dtx
+++ b/macros/latex/contrib/decorule/decorule.dtx
@@ -1,7 +1,9 @@
% \iffalse meta-comment
%
-%% decorule.dtx
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
+% Transformed from decorule.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+%
+% decorule.dtx is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -13,38 +15,404 @@
% and version 1.3 or later is part of all distributions of
% LaTeX version 2005/12/01 or later.
%
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
%
% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
%
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
+% This work consists of the files decorule.dtx and decorule.ins,
+% the derived file ,
+% and any other ancillary files listed in the MANIFEST.
%
% \fi
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2009/09/24]
-%<package>\ProvidesPackage{decorule}[2011/08/02 v0.6 The decorule LaTeX2e package]
-%<package>\RequirePackage{graphicx}
-%<package>\RequirePackage{fix-cm}
+%<package>\ProvidesPackage{decorule}[2020/04/01 v0.7
+%<package> A decorative swelled rule for LaTeX]
%<*driver>
+\RequirePackage{fix-cm}% included by default.
+\PassOptionsToPackage{svgnames}{xcolor}% xcolor/dox/hyperref implied
\documentclass[12pt]{ltxdoc}
-\usepackage{decorule}
-\usepackage[utf8x]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{fancyvrb}
-\usepackage{mflogo}
-\usepackage{chicago}
-\usepackage{url}
-\usepackage{nicefrac}
-\usepackage{lmodern}
-\usepackage[a4paper,margin=3cm]{geometry}
-\usepackage{parskip}
-\usepackage{varioref}
-\usepackage{listings}
-\usepackage{textcomp}
-\newcommand{\classorpackage}{package}
-\newcommand{\ConTeXt}{%
- C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
+%%
+%% Packages added for documentation
+%%
+\usepackage{dox}% used by default. (0)%
+ \makeatletter
+ \doxitem[idxtype=attribute]{Attribute}{CPK@attribute}{attributes}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=attributevalue]{AttributeValue}{CPK@attributevalue}{attribute values}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=class]{Class}{CPK@class}{classes}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=colour]{Colour}{CPK@colour}{colours}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=counter]{Counter}{CPK@counter}{counters}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=DTD]{DTD}{CPK@dtd}{DTDs/Schemas}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=element]{Element}{CPK@element}{element types}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=entity]{Entity}{CPK@entity}{entities}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=error]{Error}{CPK@error}{errors}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=field]{Field}{CPK@field}{fields}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=file]{File}{CPK@file}{files}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=function]{Function}{CPK@function}{functions}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=language]{Language}{CPK@language}{languages}
+ \makeatother
+ \makeatletter
+ \doxitem[macrolike,idxtype=length]{Length}{CPK@length}{lengths}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=mode]{Mode}{CPK@mode}{modes}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=option]{Option}{CPK@option}{options}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=package]{Package}{CPK@package}{packages}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=variable]{Variable}{CPK@variable}{variables}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=parameter]{Parameter}{CPK@parameter}{parameters}
+ \makeatother
+ \makeatletter
+ \doxitem[macrolike,idxtype=switch]{Switch}{CPK@switch}{switches}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=template]{Template}{CPK@template}{templates}
+ \makeatother
+ \makeatletter
+ \doxitem[idxtype=typeface]{Typeface}{CPK@typeface}{typefaces}
+ \makeatother
+ \makeatletter
+ \doxitem[macrolike,idxtype=box]{Box}{CPK@box}{boxes}
+ \makeatother
+ \newcommand{\LabelFont}[2][\relax]{\strut
+ {\fontencoding\encodingdefault
+ \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
+ \makeatletter
+ \let\CPK@macro\macro\let\CPK@endmacro\endmacro
+ \makeatother
+ \makeatletter
+ \let\CPK@environment\environment\let\CPK@endenvironment\endenvironment
+ \makeatother
+ \makeatletter
+ \def\PrintAttributeName#1{\LabelFont{@#1}}
+ \makeatother
+ \def\PrintAttributeValueName#1{\LabelFont{"#1"}}
+ \def\PrintClassName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+ \def\PrintColourName#1{\LabelFont[\color{#1}]{#1}}
+ \def\PrintCounterName#1{\LabelFont{#1}}
+ \def\PrintDTDName#1{\LabelFont{#1}}
+ \def\PrintElementName#1{\LabelFont{<#1>}}
+ \def\PrintEntityName#1{\LabelFont{\&#1;}}
+ \def\PrintEnvironmentName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+ \def\PrintErrorName#1{\LabelFont[\color{Red}!]{#1}}
+ \def\PrintFunctionName#1{\LabelFont[\bfseries\itshape]{#1}}
+ \def\PrintLanguageName#1{\LabelFont{#1}}
+ \def\PrintLengthName#1{\LabelFont{#1}}
+ \def\PrintMacroName#1{\LabelFont{#1}}
+ \def\PrintModeName#1{\LabelFont[\sffamily]{\textlangle#1\textrangle}}
+ \def\PrintOptionName#1{\LabelFont[\bfseries]{#1}}
+ \def\PrintPackageName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+ \def\PrintSwitchName#1{\LabelFont{#1}}
+ \def\PrintTemplateName#1{\LabelFont[\bfseries]{#1}}
+ \def\PrintVariableName#1{\LabelFont[\ttfamily]{#1}}
+ \def\PrintParameterName#1{\LabelFont[\ttfamily]{#1}}
+ \def\PrintFieldName#1{\LabelFont[\ttfamily]{#1}}
+\usepackage[T1]{fontenc}% used by default. (3)%
+ \let\SavedShow\show
+ \let\SavedShow\show
+\usepackage[utf8]{inputenc}[2008/03/30]% requested by author (6)%
+\usepackage{mflogo}% used by default. (35)%
+\usepackage[british]{babel}% used by default. (40)%
+\usepackage[backend=biber,doi=true,
+ isbn=true,url=true,uniquename=false,style=apa]{biblatex}% bibliography/@arch=biblatex detected. (41)%
+ \makeatletter
+ \AtBeginDocument{%
+ \setlength{\bibitemsep}{1ex}%
+ \setlength{\bibnamesep}{1.5\itemsep}%
+ \defbibheading{shortbib}[References]%
+ {\section{#1}}}
+ \@ifpackagewith{babel}{british}{%
+ \DeclareLanguageMapping{british}%
+ {british-apa}}{\relax}
+ \makeatother
+ \makeatletter
+ \providetoggle{blx@skipbiblist}
+ \makeatother
+\usepackage{csquotes}% bibliography/@arch=biblatex detected. (43)%
+\usepackage{array}% use of 'tgroup' detected (46)%
+\usepackage{calc}% used by default. (49)%
+ \makeatletter
+ {\scriptsize
+ \global\advance\@totalleftmargin by1em
+ \global\advance\MacroIndent by.5em}
+ \makeatother
+\usepackage{ccaption}% used by default. (52)%
+ \captionnamefont{\bfseries}
+ \captionstyle{\raggedright}
+\usepackage[inline]{enumitem}% use of 'variablelist' detected (56)%
+ \setlist[description]{style=unboxed}
+ \setlist[itemize]{leftmargin=2em}
+ \setlist[enumerate]{leftmargin=2em}
+ \newlist{inlineenum}{enumerate*}{1}
+ \setlist[inlineenum,1]{label=\emph{\alph*}),
+ itemjoin={{; }},itemjoin*={{; and }}}
+\usepackage{fancybox}% use of 'note' detected (57)%
+\usepackage{fancyvrb}% use of 'bibliography' detected (60)%
+\usepackage{relsize}% use of 'acronym' detected (64)%
+\usepackage{textcase}% used by default. (67)%
+\usepackage{float}% used by default. (69)%
+ \renewcommand{\topfraction}{.85}
+ \renewcommand{\bottomfraction}{.7}
+ \renewcommand{\textfraction}{.15}
+ \renewcommand{\floatpagefraction}{.66}
+ \renewcommand{\dbltopfraction}{.66}
+ \renewcommand{\dblfloatpagefraction}{.66}
+ \setcounter{topnumber}{9}
+ \setcounter{bottomnumber}{9}
+ \setcounter{totalnumber}{20}
+ \setcounter{dbltopnumber}{9}
+\usepackage[a4paper,left=30mm,top=25mm,
+ textwidth=150mm,textheight=225mm,headheight=15pt]{geometry}% used by default. (71)%
+\usepackage{listings}% use of 'programlisting' detected (83)%
+ \lstdefinelanguage{dummy}
+ {morekeywords={dummy}}
+ \lstdefinelanguage{Makefile}
+ {otherkeywords={.PHONY,.DEFAULT},%
+ morekeywords={PHONY,DEFAULT,shell,ifeq,else,endif},%
+ keywordsprefix={.},%
+ moredelim=[l][\color{Green}]{:},%
+ morecomment=[l]{\#},%
+ moredelim=[s][\color{Blue}]{\$(}{)}%
+ }
+ \lstdefinelanguage{DocBook}[]{XML}
+ {morekeywords={abstract,address,affiliation,annotation,arg,
+ author,book,chapter,classname,cmdsynopsis,command,
+ constraintdef,contrib,copyright,cover,date,email,emphasis,
+ envar,filename,firstname,footnote,guibutton,guilabel,
+ guimenu,guimenuitem,guisubmenu,holder,info,itemizedlist,
+ listitem,literal,member,option,orderedlist,orgdiv,orgname,
+ package,para,parameter,part,personname,phrase,procedure,
+ productname,programlisting,quote,refsection,remark,
+ constructorsynopsis,methodparan,modifier,funcparams,olink,
+ bibliography,biblioentry,biblioset,subtitle,artpagenums,
+ volumenum,issuenum,DOCTYPE,SYSTEM,xml:id,releaseinfo,
+ replaceable,revdescription,revhistory,revision,sect1,sect2,
+ sect3,sect4,seg,seglistitem,segmentedlist,segtitle,
+ simplelist,step,surname,systemitem,tag,term,title,uri,
+ userinput,variablelist,varlistentry,wordasword,xref,year,
+ xlink:href}}
+
+ \makeatletter
+ \lstdefinelanguage{bash}
+ {morestring=[s]{[]},morekeywords={exit,logout,yes,no,@,
+ password,ssh,URL,cd,dvips,latex,ls,makeindex,man,mkdir,
+ pdflatex,sudo,texconfig,texdoc,updmap,xelatex,biber,
+ latexmk,bibtex}}
+
+ \makeatother
+ \lstdefinelanguage{APA}[]{XML}
+ {morekeywords={TTL}}
+
+ \lstdefinelanguage{OOXML}[]{XML}
+ {morekeywords={w:p,w:pPr,w:pStyle,w:rPr,w:rFonts,
+ w:r,w:t,w:lang}}
+
+ \lstdefinelanguage{SGML}[]{XML}
+ {morekeywords={sec,ttl}}
+
+ \lstdefinelanguage{DTD}[]{XML}
+ {morekeywords={ELEMENT,ENTITY,ATTLIST,CDATA,ID,REQUIRED,
+ IMPLIED,PCDATA}}
+
+ \lstdefinelanguage{Runoff}
+ {morekeywords={h1}}
+
+ \lstdefinelanguage{GML}
+ {morekeywords={h1}}
+
+ \lstdefinelanguage{Scribe}
+ {morekeywords={Heading},morestring=[s]{[]}}
+
+ \lstdefinelanguage{RTF}[]{TeX}
+ {moretexcs={rtf,ansi,deff,adeflang,fonttbl,f,froman,fprq,
+ fcharset,f1,fswiss,falt,fnil,colortbl,red,green,blue,
+ stylesheet,s,snext,nowidctlpar,hyphen,hyphlead,hyphtrail,
+ hyphmax,cf,kerning,dbch,af,langfe,afs,alang,loch,fs,
+ pgndec,pard,plain,qc,sb,sa,keepn,b,ab,rtlch,ltrch,par}}
+
+ \lstdefinelanguage{TEI}[]{XML}
+ {morekeywords={TEI,TEI.2,teiHeader,fileDesc,sourceDesc,
+ titleStmt,title,author,editor,respStmt,resp,name,
+ editionStmt,edition,text,body,publicationStmt,publisher,
+ div,div1,placeName,lg,l,s,cl,phr,w,list,distinct,p,pb,
+ mls,div2,head,num,val,app,lem,rdg,q,sup,uncl,note,
+ DOCTYPE,SYSTEM,xml:id}}[keywords,comments,strings]
+
+ \lstdefinelanguage{XSLT2}[]{XML}
+ {morekeywords={xsl:stylesheet,xsl:transform,
+ xsl:apply-imports,xsl:attribute-set,xsl:decimal-format,
+ xsl:import,xsl:include,xsl:key,xsl:namespace-alias,
+ xsl:output,xsl:param,
+ xsl:preserve-space,xsl:strip-space,xsl:template,
+ xsl:variable,xsl:character-map,xsl:function,
+ xsl:import-schema,xsl:param,xsl:variable,
+ xsl:apply-imports,xsl:apply-templates,xsl:attribute,
+ xsl:call-template,xsl:choose,xsl:comment,xsl:copy,
+ xsl:copy-of,xsl:element,xsl:fallback,xsl:for-each,
+ xsl:if,xsl:message,xsl:number,xsl:otherwise,
+ xsl:processing-instruction,xsl:text,xsl:value-of,
+ xsl:variable,xsl:when,xsl:with-param,xsl:sort,
+ xsl:for-each-group,xsl:next-match,xsl:analyze-string,
+ xsl:namespace,xsl:result-document,xsl:copy,
+ xsl:fallback,xsl:document,xsl:sequence,
+ xsl:matching-substring,xsl:non-matching-substring,
+ xsl:perform-sort,xsl:output-character},
+ alsodigit={-}}
+
+ \lstdefinelanguage{LaTeXe}[LaTeX]{TeX}
+ {morekeywords = {selectlanguage,foreignlanguage,
+ textbrokenbar,textlangle,textrangle,subsection,url,
+ chapter,tableofcontents,part,subsubsection,paragraph,
+ subparagraph,maketitle,setlength,listoffigures,
+ listoftables,color,arraybackslash,includegraphics,
+ textcite,parencite,graphicspath,lstinline,
+ DeclareLanguageMapping,textcolor,definecolor,colorbox,
+ fcolorbox,RequirePackage,PassOptionsToPackage}}
+
+ \lstdefinelanguage{BIBTeX}{
+ morekeywords = {title,author,edition,publisher,year,
+ address},
+ morestring=[b]",
+ }
+
+ \lstdefinelanguage{Email}{
+ morekeywords={From,Subject,To,Date},
+ }
+
+ \lstset{defaultdialect=LaTeXe,frame=single,
+ framesep=.5em,backgroundcolor=\color{AliceBlue},
+ rulecolor=\color{LightSteelBlue},framerule=1pt}
+
+ \lstloadlanguages{LaTeXe,DocBook,XML,XSLT2,bash}
+ \lstdefinelanguage{XMLFRAG}{tag=**[s]<>}[html]
+ \lstnewenvironment{listingsdoc}
+ {\lstset{language={[LaTeX]TeX}}}
+ {}
+ \newcommand\basicdefault[1]{\footnotesize
+ \color{Black}\ttfamily#1}
+
+ \lstset{basicstyle=\basicdefault{\spaceskip.5em}}
+ \lstset{literate=
+ {§}{{\S}}1
+ {©}{{\raisebox{.125ex}{\copyright}\enspace}}1
+ {«}{{\guillemotleft}}1
+ {»}{{\guillemotright}}1
+ {Á}{{\'A}}1
+ {Ä}{{\"A}}1
+ {É}{{\'E}}1
+ {Í}{{\'I}}1
+ {Ó}{{\'O}}1
+ {Ö}{{\"O}}1
+ {Ú}{{\'U}}1
+ {Ü}{{\"U}}1
+ {ß}{{\ss}}2
+ {à}{{\`a}}1
+ {á}{{\'a}}1
+ {ä}{{\"a}}1
+ {é}{{\'e}}1
+ {í}{{\'i}}1
+ {ó}{{\'o}}1
+ {ö}{{\"o}}1
+ {ú}{{\'u}}1
+ {ü}{{\"u}}1
+ {¹}{{\textsuperscript1}}1
+ {²}{{\textsuperscript2}}1
+ {³}{{\textsuperscript3}}1
+ {ı}{{\i}}1
+ {—}{{---}}1
+ {’}{{'}}1
+ {…}{{\dots}}1
+ {➝}{{$leftarrow$}}1
+ {⮠}{{$\hookleftarrow$}}1
+ {␣}{{\textvisiblespace}}1,
+ keywordstyle=\color{DarkGreen}\bfseries,
+ identifierstyle=\color{DarkRed},
+ commentstyle=\color{Gray}\upshape,
+ stringstyle=\color{DarkBlue}\upshape,
+ emphstyle=\color{Chocolate}\upshape,
+ showstringspaces=false,
+ columns=fullflexible,
+ keepspaces=true}
+\usepackage{makeidx}% used by default. (85)%
+ \makeindex
+\usepackage{nicefrac}% used by default. (91)%
+ \def\textonehalf{\ensuremath{\nicefrac12}}
+\usepackage{parskip}% used by default. (93)%
+\usepackage{sectsty}% used by default. (96)%
+ \allsectionsfont{\sffamily\raggedright}
+ \renewcommand*{\descriptionlabel}[1]{\hspace\labelsep
+ \sffamily\bfseries #1}
+\usepackage[normalem]{ulem}% use of 'link' detected (103)%
+\usepackage{url}% use of 'ulink' detected (104)%
+ \AtBeginDocument{\urlstyle{tt}}
+\usepackage{varioref}% use of 'xref' detected (107)%
+ \vrefwarning
+ \labelformat{appendix}{Appendix~#1}
+ \makeatletter
+ \labelformat{chapter}{\@chapapp~#1}
+ \makeatother
+ \labelformat{section}{section~#1}
+ \labelformat{subsection}{section~#1}
+ \labelformat{subsubsection}{section~#1}
+ \labelformat{paragraph}{section~#1}
+ \labelformat{figure}{Figure~#1}
+ \labelformat{table}{Table~#1}
+ \labelformat{item}{item~#1}
+ \renewcommand{\reftextcurrent}{elsewhere on this
+ page}
+ \def\reftextafter{on the
+ \reftextvario{next}{following} page}
+\usepackage{xcolor}% used by default. (115)%
+ \makeatletter
+ \@ifundefined{T}{%
+ \newcommand{\T}[2]{{\fontencoding{T1}%
+ \selectfont#2}}}{}
+ \makeatother
+\usepackage{menukeys}% use of 'guimenu' detected (118)%
+ \renewmenumacro{\menu}[>]{roundedmenus}
+ \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
+ \renewmenumacro{\keys}{shadowedroundedkeys}
+\usepackage{classpack}[2020/05/19]% used by default. (120)%
+\usepackage{decorule}[2020/04/01]% added by spec
+\addbibresource{decorule.bib}
+%
+%%
+%% Settings for docstrip and ltxdoc
+%%
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -54,114 +422,166 @@
%</driver>
% \fi
%
-% \CheckSum{142}
+% \CheckSum{145}
%
% \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
% Lower-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
% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
%
-% \changes{v0.6}{2011/08/02}{Fix for the DVI-related display bug: Heiko Overdiek kindly identified the problem with the c@sym@rotate counter, that it isn't expandable. The graphics package only uses edef, but in the special, the explicit number is needed, because PostScript or GhostScript don't know \TeX{}. The result now works in Postscript output but DVI viewers may still display incorrectly..}
-% \changes{v0.5}{2011/07/28}{Fixes after release: Added par breaks and centering. Attempted to identify why it fails when creating DVI but works for PDF (section on Bugs created)..}
-% \changes{v0.4}{2011/06/13}{Bugs fixed on first release: 1) Added missing packages (graphicx and fix-cm); 2) Removed bogus change record from .sty file.}
-% \changes{v0.3}{2011/06/11}{Revised for .dtx file: 1) Rewrote documentation; 2) Generated .dtx.}
-% \changes{v0.2}{2010/07/14}{Updated to package format: Wrote .dtx file by hand.}
-% \changes{v0.1}{2010/03/20}{Written for TUGboat: Developed by hand.}
+% \changes{v0.7}{2020/04/01}{Regression release: 1) Updated to use ClassPack 1.19; 2) Switched all conformance attributes on revision dates to YYYY-MM-DD; 3) The jump in versions is because the previously submitted version was misnumbered as 0.6 when it should have been 0.06. Thanks to Erik Braun at CTAN for spotting this..}
+% \changes{v0.34}{2020/04/01}{Regression release: 1) Recreated package with latest version (1.18) of ClassPack; 2) Fixed bug in using the angle counter that was preventing \XeLaTeX{} generating output.}
+% \changes{v0.33}{2019/03/03}{Regression release: Recreated package with latest version (1.13) of ClassPack.}
+% \changes{v0.32}{2017/01/10}{Regression release: Recreated package with latest version (1.06) of ClassPack.}
+% \changes{v0.31}{2017/02/10}{Regression release: Recreated package with latest version (1.04) of ClassPack.}
+% \changes{v0.30}{2016/06/19}{Regression release: Recreated package with latest version (1.01) of ClassPack.}
+% \changes{v0.29}{2016/05/10}{Regenerated: Recreated package with new classpack code to create zip file to the CTAN standard.}
+% \changes{v0.28}{2014/04/01}{Maintenance release: Added PNG image for conversion to EPUB3.}
+% \changes{v0.27}{2013/03/27}{Maintenance release: Regression test for ClassPack v0.75 (autopackage with multifile).}
+% \changes{v0.26}{2013/02/23}{Internal update: Regression test for ClassPack v0.74 (autopackage).}
+% \changes{v0.25}{2012/06/15}{Internal update: Reworded final paragraph of documentation since the package is now available on CTAN. Removed palatino..}
+% \changes{v0.24}{2012/03/23}{Internal update: Updated header, replaced docmfp with dox package, checked conformance with latest version of classpack, added packages calc, listings, and palatino.}
+% \changes{v0.23}{2011/08/15}{Maintenance release: Updated documentation with docmfp, varioref, and geometry.}
+% \changes{v0.22}{2011/06/13}{Bugs fixed on first release: 1) Added missing packages (graphicx and fix-cm); 2) Removed bogus change record from .sty file.}
+% \changes{v0.21}{2011/06/11}{Revised for .dtx file: 1) Rewrote documentation; 2) Generated .dtx.}
+% \changes{v0.20}{2010/07/14}{Updated to package format: Wrote .dtx file by hand.}
+% \changes{v0.11}{2010/03/20}{Written for TUGboat: Developed by hand.}
%
% \GetFileInfo{decorule.dtx}
%
% \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
-% \DoNotIndex{\@flushglue,\@gobble,\@input}
-% \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
-% \DoNotIndex{\@namedef,\@ne,\@spaces,\@tempa}
-% \DoNotIndex{\@tempb,\@tempswafalse,\@tempswatrue}
-% \DoNotIndex{\@thanks,\@thefnmark,\@topnum}
-% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa,\@totalleftmargin}
-% \DoNotIndex{\",\/,\@ifundefined,\@nil,\@verbatim,\@vobeyspaces}
-% \DoNotIndex{\|,\~,\ ,\active,\advance,\aftergroup,\begingroup,\bgroup}
-% \DoNotIndex{\mathcal,\csname,\def,\documentstyle,\dospecials,\edef}
-% \DoNotIndex{\egroup}
-% \DoNotIndex{\else,\endcsname,\endgroup,\endinput,\endtrivlist}
-% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef,\global}
-% \DoNotIndex{\hbox,\hss,\if,\if@inlabel,\if@tempswa,\if@twocolumn}
-% \DoNotIndex{\ifcase}
-% \DoNotIndex{\ifcat,\iffalse,\ifx,\ignorespaces,\index,\input,\item}
-% \DoNotIndex{\jobname,\kern,\leavevmode,\leftskip,\let,\llap,\lower}
-% \DoNotIndex{\m@ne,\next,\newpage,\nobreak,\noexpand,\nonfrenchspacing}
-% \DoNotIndex{\obeylines,\or,\protect,\raggedleft,\rightskip,\rm,\sc}
-% \DoNotIndex{\setbox,\setcounter,\small,\space,\string,\strut}
-% \DoNotIndex{\strutbox}
-% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin,\trivlist,\tt}
-% \DoNotIndex{\twocolumn,\typeout,\vss,\vtop,\xdef,\z@}
-% \DoNotIndex{\,,\@bsphack,\@esphack,\@noligs,\@vobeyspaces,\@xverbatim}
-% \DoNotIndex{\`,\catcode,\end,\escapechar,\frenchspacing,\glossary}
-% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht,\it,\langle}
-% \DoNotIndex{\leaders,\long,\makelabel,\marginpar,\markboth,\mathcode}
-% \DoNotIndex{\mathsurround,\mbox,\newcount,\newdimen,\newskip}
-% \DoNotIndex{\nopagebreak}
-% \DoNotIndex{\parfillskip,\parindent,\parskip,\penalty,\raise,\rangle}
-% \DoNotIndex{\section,\setlength,\TeX,\topsep,\underline,\unskip,\verb}
-% \DoNotIndex{\vskip,\vspace,\widetilde,\\,\%,\@date,\@defpar}
-% \DoNotIndex{\[,\{,\},\]}
-% \DoNotIndex{\count@,\ifnum,\loop,\today,\uppercase,\uccode}
-% \DoNotIndex{\baselineskip,\begin,\tw@}
-% \DoNotIndex{\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k,\l,\m,\n,\o,\p,\q}
-% \DoNotIndex{\r,\s,\t,\u,\v,\w,\x,\y,\z,\A,\B,\C,\D,\E,\F,\G,\H}
-% \DoNotIndex{\I,\J,\K,\L,\M,\N,\O,\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z}
-% \DoNotIndex{\1,\2,\3,\4,\5,\6,\7,\8,\9,\0}
-% \DoNotIndex{\!,\#,\$,\&,\',\(,\),\+,\.,\:,\;,\<,\=,\>,\?,\_}
-% \DoNotIndex{\discretionary,\immediate,\makeatletter,\makeatother}
-% \DoNotIndex{\meaning,\newenvironment,\par,\relax,\renewenvironment}
-% \DoNotIndex{\repeat,\scriptsize,\selectfont,\the,\undefined}
-% \DoNotIndex{\arabic,\do,\makeindex,\null,\number,\show,\write,\@ehc}
-% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title,\everypar}
-% \DoNotIndex{\if@minipage,\if@restonecol,\ifeof,\ifmmode}
-% \DoNotIndex{\lccode,\newtoks,\onecolumn,\openin,\p@,\SelfDocumenting}
-% \DoNotIndex{\settowidth,\@resetonecoltrue,\@resetonecolfalse,\bf}
-% \DoNotIndex{\clearpage,\closein,\lowercase,\@inlabelfalse}
-% \DoNotIndex{\selectfont,\mathcode,\newmathalphabet,\rmdefault}
-% \DoNotIndex{\bfdefault}
+% \DoNotIndex{\@flushglue,\@gobble,\@input,\@makefnmark}
+% \DoNotIndex{\@makeother,\@maketitle,\@namedef,\@ne}
+% \DoNotIndex{\@spaces,\@tempa,\@tempb,\@tempswafalse}
+% \DoNotIndex{\@tempswatrue,\@thanks,\@thefnmark,\@topnum}
+% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa}
+% \DoNotIndex{\@totalleftmargin,\",\/,\@ifundefined,\@nil}
+% \DoNotIndex{\@verbatim,\@vobeyspaces,\|,\~,\ ,\active}
+% \DoNotIndex{\advance,\aftergroup,\begingroup,\bgroup}
+% \DoNotIndex{\mathcal,\csname,\def,\documentstyle}
+% \DoNotIndex{\dospecials,\edef,\egroup,\else,\endcsname}
+% \DoNotIndex{\endgroup,\endinput,\endtrivlist}
+% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef}
+% \DoNotIndex{\global,\hbox,\hss,\if,\if@inlabel}
+% \DoNotIndex{\if@tempswa,\if@twocolumn,\ifcase,\ifcat}
+% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\index,\input}
+% \DoNotIndex{\item,\jobname,\kern,\leavevmode,\leftskip}
+% \DoNotIndex{\let,\llap,\lower,\m@ne,\next,\newpage}
+% \DoNotIndex{\nobreak,\noexpand,\nonfrenchspacing}
+% \DoNotIndex{\obeylines,\or,\protect,\raggedleft}
+% \DoNotIndex{\rightskip,\rm,\sc,\setbox,\setcounter}
+% \DoNotIndex{\small,\space,\string,\strut,\strutbox}
+% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin}
+% \DoNotIndex{\trivlist,\tt,\twocolumn,\typeout,\vss,\vtop}
+% \DoNotIndex{\xdef,\z@,\,,\@bsphack,\@esphack,\@noligs}
+% \DoNotIndex{\@vobeyspaces,\@xverbatim,\`,\catcode,\end}
+% \DoNotIndex{\escapechar,\frenchspacing,\glossary}
+% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht}
+% \DoNotIndex{\it,\langle,\leaders,\long,\makelabel}
+% \DoNotIndex{\marginpar,\markboth,\mathcode,\mathsurround}
+% \DoNotIndex{\mbox,\newcount,\newdimen,\newskip}
+% \DoNotIndex{\nopagebreak,\parfillskip,\parindent}
+% \DoNotIndex{\parskip,\penalty,\raise,\rangle,\section}
+% \DoNotIndex{\setlength,\TeX,\topsep,\underline,\unskip}
+% \DoNotIndex{\verb,\vskip,\vspace,\widetilde,\\,\%,\@date}
+% \DoNotIndex{\@defpar,\[,\{,\},\],\count@,\ifnum,\loop}
+% \DoNotIndex{\today,\uppercase,\uccode,\baselineskip}
+% \DoNotIndex{\begin,\tw@,\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k}
+% \DoNotIndex{\l,\m,\n,\o,\p,\q,\r,\s,\t,\u,\v,\w,\x,\y,\z}
+% \DoNotIndex{\A,\B,\C,\D,\E,\F,\G,\H,\I,\J,\K,\L,\M,\N,\O}
+% \DoNotIndex{\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z,\1,\2,\3,\4}
+% \DoNotIndex{\5,\6,\7,\8,\9,\0,\!,\#,\$,\&,\',\(,\)}
+% \DoNotIndex{\+,\.,\:,\;,\<,\=,\>,\?,\_,\discretionary}
+% \DoNotIndex{\immediate,\makeatletter,\makeatother}
+% \DoNotIndex{\meaning,\newenvironment,\par,\relax}
+% \DoNotIndex{\renewenvironment,\repeat,\scriptsize}
+% \DoNotIndex{\selectfont,\the,\undefined,\arabic,\do}
+% \DoNotIndex{\makeindex,\null,\number,\show,\write,\@ehc}
+% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title}
+% \DoNotIndex{\everypar,\if@minipage,\if@restonecol,\ifeof}
+% \DoNotIndex{\ifmmode,\lccode,\newtoks,\onecolumn,\openin}
+% \DoNotIndex{\p@,\SelfDocumenting,\settowidth}
+% \DoNotIndex{\@resetonecoltrue,\@resetonecolfalse,\bf}
+% \DoNotIndex{\clearpage,\closein,\lowercase}
+% \DoNotIndex{\@inlabelfalse,\selectfont,\mathcode}
+% \DoNotIndex{\newmathalphabet,\rmdefault,\bfdefault}
+% \DoNotIndex{\DeclareRobustCommand}
+% \DoNotIndex{\sim}
+% \DoNotIndex{\decorule}
+% \DoNotIndex{\hbox}
+% \DoNotIndex{\hss}
%
-% \def\fileversion{0.6}
-% \def\filedate{2011/08/02}
-% \title{The \textsf{decorule} LaTeX2e package\thanks{%
+% \def\fileversion{0.7}
+% \def\filedate{2020/04/01}
+% \title{The \textsf{decorule} \LaTeXe\ package\thanks{%
% This document corresponds to \textsf{decorule}
-% \textit{v.}\ \fileversion, dated \filedate.}
-% \\[1ex]\Large
-% A decorative swelled rule}
-% \author{Peter Flynn\\\normalsize
-% Silmaril Consultants\\[-4pt]\normalsize
-% Textual Therapy Division\\\normalsize
-% (\texttt{peter@silmaril.ie})}
+% \textit{v.}\ \fileversion p, dated \filedate.}
+% \\[1em]\Large
+% A decorative swelled rule for
+% \LaTeX{}}
+% \author{Peter Flynn\\\normalsize Silmaril Consultants\\[-.25ex]\normalsize Textual Therapy Division\\\normalsize(\url{peter@silmaril.ie})}
% \maketitle
% \renewcommand{\abstractname}{Summary}\thispagestyle{empty}
-% \begin{abstract}\noindent
+% \begin{abstract}
+% \parskip=0.5\baselineskip
+% \advance\parskip by 0pt plus 2pt
+% \parindent=0pt% \noindent
% This package implements a decorative swelled rule using
% only a symbol from a font installed with all distributions of
% \TeX{}, so it works independently, without the need to install
% any additional software or fonts.\par
% This is the packaged version of the macro which was
% originally published in the `Typographers' Inn'
-% column in TUGboat \cite{tb97}.\par
-% This version fixes the bug caused by failing to supply the
-% correct values for DVI drivers for rendering glyph rotation.
-% The result now works in Postscript output but DVI viewers may
-% still display incorrectly.\par
+% column in TUGboat \parencite{tb97}.\par
% \end{abstract}
% \clearpage
% \tableofcontents
% \clearpage
+% \section*{Latest changes}
+% \subsection*{v.0.7 (2020-04-01)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Updated to use ClassPack 1.19\par
+% \item Switched all conformance attributes on revision
+% dates to YYYY-MM-DD\par
+% \item The jump in versions is because the previously
+% submitted version was misnumbered as 0.6 when it
+% should have been 0.06. Thanks to Erik Braun at CTAN
+% for spotting this.\par
+% \end{itemize}
+% \subsection*{v.0.34 (2020-04-01)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.18) of
+% \emph{ClassPack}\par
+% \item Fixed bug in using the angle counter that was
+% preventing \XeLaTeX{} generating output\par
+% \end{itemize}
+% \subsection*{v.0.33 (2019-03-03)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.13) of
+% \emph{ClassPack}\par
+% \end{itemize}
+% \subsection*{v.0.31 (2017-02-10)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.04) of
+% \emph{ClassPack}\par
+% \end{itemize}
+% See p.\thinspace\pageref{} for earlier changes.
+% \clearpage
% \section{Swelled rules}
% Swelled rules were a popular device in 19th century
% typesetting, and were usually done as special sorts from a
@@ -174,228 +594,234 @@
% feature is not implemented in this version and is left as an
% exercise to the user).\par
% \subsection{Other work}
-% As discussed in the original article \cite{tb97} there is an \textsf{swrule} package
-% by Tobias Dussa \cite{dussa} which builds a
+% As discussed in the original article \parencite{tb97} there is an \textsf{swrule} package
+% by Tobias Dussa \parencite{dussa} which builds a
% geometric lozenge from very fine lines, and there is a paper
-% by Steve Peter \cite{peter} which describes
+% by Steve Peter \parencite{peter} which describes
% a more extensible method using \MP{} for
-% \ConTeXt{}.\par
+% Con\TeX t{}.\par
% \subsection{This solution}
% However, it is also possible to produce one using just a
% character from a font, combined with some looping in a macro
% with careful positioning and kerning. This example was
-% constructed from the swung dash (\DescribeMacro{\sim}\verb`\sim`)
+% constructed from the swung dash ({\ttfamily{}\textbackslash{}sim})
% character in math mode, rotated and scaled to fit in an
-% asending and then descending series.\par
-% This package is available from your nearest CTAN
-% respository in the directory \url{}. The original
-% example is available at
-% \url{http://latex.silmaril.ie/packages/decorule}.
-% All suggestions for improving and extending it are
-% welcome.\par
-% \decorule{}\par
-% \subsection{Bugs}
-% Rainer adS and Herbert Schulz kindly pointed out on
-% \url{comp.text.tex}\footnote{%
-% \url{<j0sco9$emv$1@news.albasani.net>}
-% and
-% \url{<herbs-038AC9.15151428072011@news.wowway.com>}} that it failed when using standard (DVI)
-% \LaTeX{}, although it was correct when using
-% \emph{pdflatex}.\par
-% Attempts to render the DVI with (eg)
-% \emph{dvipdf} were failing with a
-% Ghostscript error: \verb`/undefined in \c@sym@rotate`.\par
-% Heiko Overdiek kindly identified the problem with the
-% \DescribeMacro{\c@sym@rotate}\verb`\c@sym@rotate` counter, that `it
-% isn't expandable. The graphics package only uses \texttt{edef}, but in the \texttt{special}, the explicit number is
-% needed, because PostScript or GhostScript don't know
-% \TeX{}.'\par
-% The result now works in Postscript output but DVI
-% viewers may still display incorrectly.\par
+% ascending and then descending series.\par
+% {\bigskip\centering{}\decorule{}\par}
+% \changes{v0.25}{2012/06/15}{Changed order of paragraphs and added space}
+% {\par\medskip{}The package is available on
+% {\smaller CTAN} in
+% \url{http://ctan.org/pkg/decorule}, and the development
+% files will be available at
+% \url{http://latex.silmaril.ie/packages} when the
+% \textsf{classpack} toolkit is released.
+% Suggestions for improving and extending this package are
+% welcome.\par}
% \clearpage
% \raggedright
-% \addtocontents{toc}{\medskip}
-% \addcontentsline{toc}{section}{\refname}
-% \bibliography{decorule}
-% \bibliographystyle{chicago}
-% \begin{VerbatimOut}{decorule.bib}
-%<*ignore>
-@article{tb97,
-author = {Peter Flynn},
-shortauthor = {Flynn},
-title = {{Typographers' Inn: Where have all the flowers gone?}},
-pages = {21-22},
-journal = {{TUGboat}},
-volume = {31},
-number = {1},
-year = {2010}
-}
-@article{peter,
-author = {Steve Peter},
-shortauthor = {Peter},
-title = {{Swelled rules and \MP{}}},
-pages = {193-195},
-journal = {{TUGboat}},
-volume = {26},
-number = {3},
-year = {2005}
-}
-@misc{dussa,
-author = {Tobias Dussa},
-shortauthor = {Dussa},
-title = {{swrule.sty}},
-year = {2001},
-month = {Oct},
-howpublished = {CTAN: \TeX{} Users Group},
-url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
-}
-%</ignore>
-% \end{VerbatimOut}
-% \StopEventually{%
+% \raggedright\printbibliography
+% \StopEventually{\label{endcode}%
% \clearpage
-% \newgeometry{left=3cm}
+% \newgeometry{left=3cm}%
+% \addcontentsline{toc}{section}{Change History}%
+% \label{}%
% \PrintChanges
% \clearpage
+% \label{codeindex}%
+% \addcontentsline{toc}{section}{Index}%
% \PrintIndex}
-% \newgeometry{left=5cm}
+% \addtolength{\CPKrevmarg}{\widthof{\LabelFont{DCR@rotate}}}
+% \newgeometry{left=\CPKrevmarg}
+% \message{Margin reset to \the\CPKrevmarg, to fit <DCR@rotate>}
+% \iffalse
+%<*package>
+% \fi
% \clearpage
% \section{Implementation}
-% The package consists of a single main macro \texttt{decorule}, which cycles through sizes
+% The package consists of a single main macro {\ttfamily{}\textbackslash{}decorule}, which cycles through sizes
% of the symbol from minimum to maximum, rotating and scaling
% according to values preset here; and then from the maximum
% back down to the minimum.\par
-% \subsection{Preliminary declarations}
-% \begin{macro}{\sym@min}
+% \subsection{Auto-initialisation}\label{:autoinit}
+% This section is added automatically by \textit{ClassPack}
+% as a preamble to all classes and style packages.
+% The \textsf{fixltx2e} package, which used to be included
+% automatically, is no longer preloaded, as its
+% features are now a part of the latest \LaTeXe\ kernel.\par
+% The code starts with identity and requirements which are
+% generated automatically as needed by the Doc\TeX\ system.
+% For details see the \textsf{ltxdoc} package documentation.
+% \par\smallskip
+% \begingroup\color{DarkRed}\tabcolsep3pt\footnotesize
+% \begin{tabular}{>{\refstepcounter{CodelineNo}\tiny\theCodelineNo}r@{\enspace}l}
+% &\verb`\NeedsTeXFormat{LaTeX2e}[2009/09/24]`\\
+% &\verb`\ProvidesPackage{decorule}[2020/04/01 v0.7`\\
+% &\verb` A decorative swelled rule for \LaTeX{}]`
+% \end{tabular}\endgroup
+% \setcounter{CodelineNo}{3}
+%\iffalse
+%%
+%% Packages required for the class or package
+%%
+% \fi
+% \subsection{Packages required}\label{stypackages}
+% \begin{CPK@package}{fix-cm}
+% Allow infinitely-variable font scaling.
+% \iffalse
+%% Allow infinitely-variable font scaling.
+% \fi
+% \begin{macrocode}
+\RequirePackage{fix-cm}%
+% \end{macrocode}
+% \end{CPK@package}
+% \begin{CPK@package}{graphicx}
+% Provide for graphics (PNG, JPG, or PDF format (only) for
+% pdflatex; EPS format (only) for standard \LaTeX{}).
+% \iffalse
+%% Provide for graphics (PNG, JPG, or PDF format (only) for pdflatex; EPS format (only) for standard \LaTeX{}).
+% \fi
+% \begin{macrocode}
+\RequirePackage{graphicx}%
+% \end{macrocode}
+% \end{CPK@package}
+%
+% \subsection{Preliminary declarations}\label{packages-here}
+% \iffalse
+%%
+%% ******************************************************************
+%%
+%% Preliminary declarations
+% \fi
+% \begin{CPK@counter}{DCR@min}\label{counter--DCR@min}
% Define a counter and a minimum point size to start and
% end with. This value is an integer, hence a counter is
% used.\par
% \begin{macrocode}
-\newcounter{sym@min}
-\setcounter{sym@min}{1}
+\newcounter{DCR@min}
+\setcounter{DCR@min}{1}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@max}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@max}\label{counter--DCR@max}
% Do the same for the maximum point size that the rule
% will get to in the middle.\par
% \begin{macrocode}
-\newcounter{sym@max}
-\setcounter{sym@max}{20}
+\newcounter{DCR@max}
+\setcounter{DCR@max}{20}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@step}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@step}\label{counter--DCR@step}
% Set the step size or the increments of the glyph in
% whole points.\par
% \begin{macrocode}
-\newcounter{sym@step}
-\setcounter{sym@step}{1}
+\newcounter{DCR@step}
+\setcounter{DCR@step}{1}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@rotate}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@rotate}\label{counter--DCR@rotate}
% Specify the amount in (whole) degrees by which we will
% need to rotate the symbol to make each glyph mesh with the
-% previous one. The use of the
-% \DescribeMacro{\thesym@rotate}\verb`\thesym@rotate` form is a bugfix due to
-% Heiko Oberdiek in \url{news:comp.text.tex} at \textlangle\verb`j0sonk$q9v$1@dont-email.me`\textrangle{}.\par
-% \changes{v0.6}{2011/08/02}{Added fix from Heiko for sym@rotate}
+% previous one.\par
% \begin{macrocode}
-\newcounter{sym@rotate}
-\renewcommand*{\thesym@rotate}{\the\c@sym@rotate}%
-\setcounter{sym@rotate}{45}
+\newcounter{DCR@rotate}
+\setcounter{DCR@rotate}{45}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@size}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@size}\label{counter--DCR@size}
% Define a counter to hold the current (calculated) size
% as we loop through the sizes.\par
% \begin{macrocode}
-\newcounter{sym@size}
+\newcounter{DCR@size}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@raise}
+% \end{CPK@counter}
+% \begin{CPK@length}{\DCR@raise}\label{length--DCR@raise}
% Define a length to hold the amount calculated at each
% step to raise/lower each glyph by (because we rotate them as
% we go).\par
% \begin{macrocode}
-\newlength{\sym@raise}
+\newlength{\DCR@raise}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@skip}
+% \end{CPK@length}
+% \begin{CPK@length}{\DCR@skip}\label{length--DCR@skip}
% Define another length to hold the amount calculated to
% backspace between successive glyphs to make sure they
% touch.\par
% \begin{macrocode}
-\newlength{\sym@skip}
+\newlength{\DCR@skip}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@symbol}
+% \end{CPK@length}
+% \begin{CPK@macro}{\DCR@symbol}\label{macro--DCR@symbol}
% Lastly, define the font character to use as the glyph.
% For the swelled rule we use the swung dash.\par
% \begin{macrocode}
-\newcommand{\sym@symbol}{$\sim$}
+\newcommand{\DCR@symbol}{\ensuremath{\sim}}
% \end{macrocode}
-% \end{macro}
+% \end{CPK@macro}
% \subsection{The main macro}
-% \begin{macro}{\decorule}
+% \iffalse
+%%
+%% ******************************************************************
+%%
+%% The main macro
+% \fi
+% \begin{CPK@macro}{\decorule}\label{macro--decorule}
% Now we can define the macro that does the actual
% work.\par
-% \changes{v0.3}{2011/06/11}{Rearranged spacing to suit the .dtx layout}
-% \changes{v0.5}{2011/07/28}{Added par breaks and centering}
+% \changes{v0.21}{2011/06/06}{Rearranged spacing to suit the .dtx layout}
% \begin{macrocode}
-\newcommand{\decorule}{\par\begingroup\centering
+\newcommand{\decorule}{%
% \end{macrocode}
% Start by setting the initial size to the minimum size
% declared above:\par
% \begin{macrocode}
-\setcounter{sym@size}{\c@sym@min}
+ \begingroup\fontencoding{OT1}\fontfamily{cmr}\selectfont%
+ \setcounter{DCR@size}{\c@DCR@min}%
% \end{macrocode}
-% Go through the steps up to, but not including, the
-% maximum size:\par
+% Loop through the steps up to, but not including, the
+% maximum size (this loop ends on line 28):\par
% \begin{macrocode}
-\loop
+ \loop
% \end{macrocode}
-% Raise each glyph above the baseline by half the
-% point size that we will use:\par
+% We want to raise each glyph above the baseline by half the
+% point size that we will use, so set the amount to the
+% current size and then divide by two:\par
% \begin{macrocode}
-\setlength{\sym@raise}{\c@sym@size pt}%
- \divide\sym@raise by2
+ \setlength{\DCR@raise}{\c@DCR@size pt}%
+ \divide\DCR@raise by2
% \end{macrocode}
% Raise, rotate, and (in this case of
-% \DescribeMacro{\sim}\verb`\sim`) reflect the glyph in a \texttt{hbox} of its own point size,
-% using \texttt{hss} to prevent
-% \TeX{} squawking. Heiko Oberdiek also identified the fix of
-% using \DescribeMacro{\thesym@rotate}\verb`\thesym@rotate` instead of
-% \DescribeMacro{\c@sym@rotate}\verb`\c@sym@rotate` for the box rotation, here
-% and elsewhere below.\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
+% {\ttfamily{}\textbackslash{}sim}) reflect the glyph in a
+% {\ttfamily{}\textbackslash{}hbox} of its own point size, using
+% {\ttfamily{}\textbackslash{}hss} as
+% infinitely-flexible space to prevent \TeX{} squawking if
+% the glyph is slightly oversized:\par
% \begin{macrocode}
-\raisebox{-\sym@raise}{%
- \fontsize{\c@sym@size}{0}\selectfont
- \rotatebox{\thesym@rotate}{\reflectbox{\hbox
- to\c@sym@size pt{\hss\sym@symbol\hss}}}}%
+ \raisebox{-\DCR@raise}{\fontsize{\c@DCR@size}{0}\selectfont
+ \rotatebox{\the\c@DCR@rotate}{%
+ \reflectbox{\hbox to\c@DCR@size pt{\hss\DCR@symbol\hss}}}}%
% \end{macrocode}
% Calculate the amount to backspace as \nicefrac23 of the
% current size:\par
% \begin{macrocode}
-\setlength{\sym@skip}{\c@sym@size pt}%
- \divide\sym@skip by3
- \multiply\sym@skip by2
- \kern-\sym@skip
+ \setlength{\DCR@skip}{\c@DCR@size pt}%
+ \divide\DCR@skip by3
+ \multiply\DCR@skip by2
+ \kern-\DCR@skip
% \end{macrocode}
% Increment the counter and repeat:\par
% \begin{macrocode}
-\addtocounter{sym@size}{\c@sym@step}%
- \ifnum\c@sym@size<\c@sym@max
+ \addtocounter{DCR@size}{\c@DCR@step}%
+ \ifnum\c@DCR@size<\c@DCR@max
\repeat
% \end{macrocode}
% Now do the same for the sole occurrence of the maximum
-% size:\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
+% size: this marks the mid-point of the rule:\par
% \begin{macrocode}
-\setlength{\sym@raise}{\c@sym@max pt}%
- \divide\sym@raise by2
- \raisebox{-\sym@raise}{%
- \fontsize{\c@sym@max}{0}\selectfont
- \rotatebox{\thesym@rotate}{\reflectbox{\hbox
- to\c@sym@max pt{\hss\sym@symbol\hss}}}}%
+ \setlength{\DCR@raise}{\c@DCR@max pt}%
+ \divide\DCR@raise by2
+ \raisebox{-\DCR@raise}{%
+ \fontsize{\c@DCR@max}{0}\selectfont
+ \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+ to\c@DCR@max pt{\hss\DCR@symbol\hss}}}}%
% \end{macrocode}
% Start back down following the exact same pattern in
% reverse, using the current size (one step less than the
@@ -403,49 +829,52 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% from the last loop of the outward journey. This time,
% however, do the kerning \emph{before} the
% glyph.\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
% \begin{macrocode}
-\loop
- \setlength{\sym@skip}{\c@sym@size pt}%
- \divide\sym@skip by3
- \multiply\sym@skip by2
- \kern-\sym@skip
- \setlength{\sym@raise}{\c@sym@size pt}%
- \divide\sym@raise by2
- \raisebox{-\sym@raise}{%
- \fontsize{\c@sym@size}{0}\selectfont
- \rotatebox{\thesym@rotate}{\reflectbox{\hbox
- to\c@sym@size pt{\hss\sym@symbol\hss}}}}%
- \addtocounter{sym@size}{-\c@sym@step}%
- \ifnum\c@sym@size>\c@sym@min
+ \loop
+ \setlength{\DCR@skip}{\c@DCR@size pt}%
+ \divide\DCR@skip by3
+ \multiply\DCR@skip by2
+ \kern-\DCR@skip
+ \setlength{\DCR@raise}{\c@DCR@size pt}%
+ \divide\DCR@raise by2
+ \raisebox{-\DCR@raise}{%
+ \fontsize{\c@DCR@size}{0}\selectfont
+ \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+ to\c@DCR@size pt{\hss\DCR@symbol\hss}}}}%
+ \addtocounter{DCR@size}{-\c@DCR@step}%
+ \ifnum\c@DCR@size>\c@DCR@min
\repeat
% \end{macrocode}
% Finally, do the minimum size:\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
% \begin{macrocode}
-\setlength{\sym@skip}{\c@sym@min pt}%
- \divide\sym@skip by3
- \multiply\sym@skip by2
- \kern-\sym@skip
- \setlength{\sym@raise}{\c@sym@min pt}%
- \divide\sym@raise by2
- \raisebox{-\sym@raise}{%
- \fontsize{\c@sym@min}{0}\selectfont
- \rotatebox{\thesym@rotate}{\reflectbox{\hbox
- to\c@sym@min pt{\hss\sym@symbol\hss}}}}%
-\par\endgroup}
+ \setlength{\DCR@skip}{\c@DCR@min pt}%
+ \divide\DCR@skip by3
+ \multiply\DCR@skip by2
+ \kern-\DCR@skip
+ \setlength{\DCR@raise}{\c@DCR@min pt}%
+ \divide\DCR@raise by2
+ \raisebox{-\DCR@raise}{%
+ \fontsize{\c@DCR@min}{0}\selectfont
+ \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+ to\c@DCR@min pt{\hss\DCR@symbol\hss}}}}%
+ \endgroup}
% \end{macrocode}
-% \end{macro}
+% \end{CPK@macro}
+% \iffalse
+%</package>
+% \fi
% \appendix
-% \newgeometry{left=3cm}
+% \newgeometry{left=3cm}
% \clearpage
-% \section{The \LaTeX{} Project Public License}\label{LPPL:LPPL}
-% \begin{quotation}\small\noindent
+% \section{The \LaTeX{} Project Public License (v\thinspace{}1.3c)}\label{LPPL}
+% \begin{quotation}\small\sffamily\parindent0pt
+% \parskip.5\baselineskip
+% \color{DarkBlue}\noindent
% Everyone is allowed to distribute verbatim copies of this
-% license document, but modification of it is not allowed.
+% license document, but modification of it is not allowed.\par
% \end{quotation}
-% \subsection{Preamble}\label{LPPL:Preamble}
-% The \LaTeX{} Project Public License (\textsc{lppl})
+% \subsection{Preamble}\label{Preamble}
+% The \LaTeX{} Project Public License ({\smaller LPPL})
% is the primary license under which the \LaTeX{} kernel and the
% base \LaTeX{} packages are distributed.\par
% You may use this license for any work of which you hold the
@@ -453,8 +882,8 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% particularly suitable if your work is \TeX{}-related (such as a
% \LaTeX{} package), but it is written in such a way that you can
% use it even if your work is unrelated to \TeX{}.\par
-% The section \emph{Whether and How to Distribute Works under This
-% License}, below, gives instructions, examples, and
+% The section “Whether and How to Distribute Works under This
+% License”, below, gives instructions, examples, and
% recommendations for authors who are considering distributing
% their works under this license.\par
% This license gives conditions under which a work may be
@@ -466,42 +895,41 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% you wish while maintaining the availability, integrity, and
% reliability of that work. If you do not see how to achieve your
% goal while meeting these conditions, then read the document
-% \url{cfgguide.tex} and \url{modguide.tex} in the base \LaTeX{}
+% {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
% distribution for suggestions.\par
-% \subsection{Definitions}\label{LPPL:Definitions}
+% \subsection{Definitions}\label{Definitions}
% In this license document the following terms are used:\par
-% \begingroup\raggedright
-% \begin{description}
-% \item[Work:]Any work being distributed under this License.
-% \item[Derived Work:]Any work that under any applicable law is derived from
-% the Work.
-% \item[Modification:]Any procedure that produces a Derived Work under any
+% \begin{description}[style=unboxed]
+% \item[Work\thinspace:]Any work being distributed under this License.\par
+% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
+% the Work.\par
+% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
% applicable law~--- for example, the production of a file
% containing an original file associated with the Work or a
% significant portion of such a file, either verbatim or
% with modifications and/or translated into another
-% language.
-% \item[Modify:]To apply any procedure that produces a Derived Work
-% under any applicable law.
-% \item[Distribution:]Making copies of the Work available from one person to
+% language.\par
+% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
+% under any applicable law.\par
+% \item[Distribution\thinspace:]Making copies of the Work available from one person to
% another, in whole or in part. Distribution includes (but
% is not limited to) making any electronic components of the
% Work accessible by file transfer protocols such as
-% \textsc{ftp} or \textsc{http} or by
+% {\smaller FTP} or {\smaller HTTP} or by
% shared file systems such as Sun's Network File System
-% (\textsc{nfs}).
-% \item[Compiled Work:]A version of the Work that has been processed into a
+% ({\smaller NFS}).\par
+% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
% form where it is directly usable on a computer system.
% This processing may include using installation facilities
% provided by the Work, transformations of the Work, copying
% of components of the Work, or other activities. Note that
% modification of any installation facilities provided by
-% the Work constitutes modification of the Work.
-% \item[Current Maintainer:]A person or persons nominated as such within the Work.
+% the Work constitutes modification of the Work.\par
+% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
% If there is no such explicit nomination then it is the
% `Copyright Holder' under any applicable
-% law.
-% \item[Base Interpreter:]A program or process that is normally needed for
+% law.\par
+% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
% running or interpreting a part or the whole of the
% Work.\par
% A Base Interpreter may depend on external components
@@ -512,45 +940,45 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% Work, the only applicable Base Interpreter is a
% `\LaTeX{}-Format' or in the case of files
% belonging to the `\LaTeX{}-format' a program
-% implementing the `\TeX{} language'.
-% \end{description}\endgroup
-% \subsection{Conditions on Distribution and Modification}\label{LPPL:Conditions}
+% implementing the `\TeX{} language'.\par
+% \end{description}
+% \subsection{Conditions on Distribution and Modification}\label{Conditions}
% \begin{enumerate}
% \item Activities other than distribution and/or modification
% of the Work are not covered by this license; they are
% outside its scope. In particular, the act of running the
% Work is not restricted and no requirements are made
-% concerning any offers of support for the Work.
-% \item \label{LPPL:item:distribute}You may distribute a complete, unmodified copy of the
+% concerning any offers of support for the Work.\par
+% \item \label{item-distribute}You may distribute a complete, unmodified copy of the
% Work as you received it. Distribution of only part of the
% Work is considered modification of the Work, and no right to
% distribute such a Derived Work may be assumed under the
-% terms of this clause.
+% terms of this clause.\par
% \item You may distribute a Compiled Work that has been
% generated from a complete, unmodified copy of the Work as
-% distributed under Clause~\vref{LPPL:item:distribute} above, as
+% distributed under Clause~item~\ref{item-distribute} above above, as
% long as that Compiled Work is distributed in such a way that
% the recipients may install the Compiled Work on their system
% exactly as it would have been installed if they generated a
-% Compiled Work directly from the Work.
-% \item \label{LPPL:item:currmaint}If you are the Current Maintainer of the Work, you may,
+% Compiled Work directly from the Work.\par
+% \item \label{item-currmaint}If you are the Current Maintainer of the Work, you may,
% without restriction, modify the Work, thus creating a
% Derived Work. You may also distribute the Derived Work
% without restriction, including Compiled Works generated from
% the Derived Work. Derived Works distributed in this manner
% by the Current Maintainer are considered to be updated
-% versions of the Work.
+% versions of the Work.\par
% \item If you are not the Current Maintainer of the Work, you
% may modify your copy of the Work, thus creating a Derived
% Work based on the Work, and compile this Derived Work, thus
-% creating a Compiled Work based on the Derived Work.
-% \item \label{LPPL:item:conditions}If you are not the Current Maintainer of the Work, you
+% creating a Compiled Work based on the Derived Work.\par
+% \item \label{item-conditions}If you are not the Current Maintainer of the Work, you
% may distribute a Derived Work provided the following
% conditions are met for every component of the Work unless
% that component clearly states in the copyright notice that
% it is exempt from that condition. Only the Current
% Maintainer is allowed to add such statements of exemption to
-% a component of the Work.
+% a component of the Work.\par
% \begin{enumerate}
% \item If a component of this Derived Work can be a direct
% replacement for a component of the Work when that
@@ -560,22 +988,22 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% Interpreter, the replacement component of this Derived
% Work clearly and unambiguously identifies itself as a
% modified version of this component to the user when used
-% interactively with that Base Interpreter.
+% interactively with that Base Interpreter.\par
% \item Every component of the Derived Work contains
% prominent notices detailing the nature of the changes to
% that component, or a prominent reference to another file
% that is distributed as part of the Derived Work and that
% contains a complete and accurate log of the
-% changes.
+% changes.\par
% \item No information in the Derived Work implies that any
% persons, including (but not limited to) the authors of
% the original version of the Work, provide any support,
% including (but not limited to) the reporting and
% handling of errors, to recipients of the Derived Work
% unless those persons have stated explicitly that they do
-% provide such support for the Derived Work.
+% provide such support for the Derived Work.\par
% \item You distribute at least one of the following with
-% the Derived Work:
+% the Derived Work:\par
% \begin{enumerate}
% \item A complete, unmodified copy of the Work; if your
% distribution of a modified component is made by
@@ -584,50 +1012,50 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% to copy the Work from the same or some similar place
% meets this condition, even though third parties are
% not compelled to copy the Work along with the
-% modified component;
+% modified component;\par
% \item Information that is sufficient to obtain a
-% complete, unmodified copy of the Work.
+% complete, unmodified copy of the Work.\par
% \end{enumerate}
% \end{enumerate}
% \item If you are not the Current Maintainer of the Work, you
% may distribute a Compiled Work generated from a Derived
% Work, as long as the Derived Work is distributed to all
% recipients of the Compiled Work, and as long as the
-% conditions of Clause~\vref{LPPL:item:conditions}, above, are met
-% with regard to the Derived Work.
+% conditions of Clause~item~\ref{item-conditions} above, above, are met
+% with regard to the Derived Work.\par
% \item The conditions above are not intended to prohibit, and
% hence do not apply to, the modification, by any method, of
% any component so that it becomes identical to an updated
% version of that component of the Work as it is distributed
-% by the Current Maintainer under Clause~\vref{LPPL:item:currmaint}, above.
+% by the Current Maintainer under Clause~item~\ref{item-currmaint} above, above.\par
% \item Distribution of the Work or any Derived Work in an
% alternative format, where the Work or that Derived Work (in
% whole or in part) is then produced by applying some process
% to that format, does not relax or nullify any sections of
% this license as they pertain to the results of applying that
-% process.
+% process.\par
% \item % \begin{enumerate}
% \item A Derived Work may be distributed under a different
% license provided that license itself honors the
-% conditions listed in Clause~\vref{LPPL:item:conditions} above, in
+% conditions listed in Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, in
% regard to the Work, though it does not have to honor the
-% rest of the conditions in this license.
+% rest of the conditions in this license.\par
% \item If a Derived Work is distributed under a different
% license, that Derived Work must provide sufficient
% documentation as part of itself to allow each recipient
% of that Derived Work to honor the restrictions in
-% Clause~\vref{LPPL:item:conditions} above, concerning
-% changes from the Work.
+% Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, concerning
+% changes from the Work.\par
% \end{enumerate}
% \item This license places no restrictions on works that are
% unrelated to the Work, nor does this license place any
% restrictions on aggregating such works with the Work by any
-% means.
+% means.\par
% \item Nothing in this license is intended to, or may be used
% to, prevent complete compliance by all parties with all
-% applicable laws.
+% applicable laws.\par
% \end{enumerate}
-% \subsection{No Warranty}\label{LPPL:Warranty}
+% \subsection{No Warranty}\label{Warranty}
% There is no warranty for the Work. Except when otherwise
% stated in writing, the Copyright Holder provides the Work
% `as is', without warranty of any kind, either
@@ -649,7 +1077,7 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% operate with any other programs), even if the Copyright Holder
% or said author or said other party has been advised of the
% possibility of such damages.\par
-% \subsection{Maintenance of The Work}\label{LPPL:Maintenance}
+% \subsection{Maintenance of The Work}\label{Maintenance}
% The Work has the status `author-maintained'
% if the Copyright Holder explicitly and prominently states near
% the primary copyright notice in the Work that the Work can only
@@ -675,80 +1103,80 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% \begin{enumerate}
% \item Make a reasonable attempt to trace the Current
% Maintainer (and the Copyright Holder, if the two differ)
-% through the means of an Internet or similar search.
+% through the means of an Internet or similar search.\par
% \item If this search is successful, then enquire whether the
-% Work is still maintained.
+% Work is still maintained.\par
% \begin{enumerate}
% \item If it is being maintained, then ask the Current
% Maintainer to update their communication data within one
-% month.
-% \item \label{LPPL:item:intention}If the search is unsuccessful or no action to resume
+% month.\par
+% \item \label{item-intention}If the search is unsuccessful or no action to resume
% active maintenance is taken by the Current Maintainer,
% then announce within the pertinent community your
% intention to take over maintenance. (If the Work is a
% \LaTeX{} work, this could be done, for example, by
-% posting to \url{news:comp.text.tex}.)
+% posting to \url{news:comp.text.tex}.)\par
% \end{enumerate}
% \item % \begin{enumerate}
% \item If the Current Maintainer is reachable and agrees to
% pass maintenance of the Work to you, then this takes
-% effect immediately upon announcement.
-% \item \label{LPPL:item:announce}If the Current Maintainer is not reachable and the
+% effect immediately upon announcement.\par
+% \item \label{item-announce}If the Current Maintainer is not reachable and the
% Copyright Holder agrees that maintenance of the Work be
% passed to you, then this takes effect immediately upon
-% announcement.
+% announcement.\par
% \end{enumerate}
-% \item \label{LPPL:item:change}If you make an `intention announcement'
-% as described in~\vref{LPPL:item:intention} above and after three
+% \item \label{item-change}If you make an `intention announcement'
+% as described in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention} above and after three
% months your intention is challenged neither by the Current
% Maintainer nor by the Copyright Holder nor by other people,
% then you may arrange for the Work to be changed so as to
-% name you as the (new) Current Maintainer.
+% name you as the (new) Current Maintainer.\par
% \item If the previously unreachable Current Maintainer becomes
% reachable once more within three months of a change
-% completed under the terms of~\vref{LPPL:item:announce}
-% or~\vref{LPPL:item:change}, then that
+% completed under the terms of~item~\ref{item-announce} in the list on p.\thinspace\pageref{item-announce}
+% or~item~\ref{item-change} above, then that
% Current
% Maintainer must become or remain the Current Maintainer upon
% request provided they then update their communication data
-% within one month.
+% within one month.\par
% \end{enumerate}
% A change in the Current Maintainer does not, of itself,
% alter the fact that the Work is distributed under the
-% \textsc{lppl} license.\par
+% {\smaller LPPL} license.\par
% If you become the Current Maintainer of the Work, you should
% immediately provide, within the Work, a prominent and
% unambiguous statement of your status as Current Maintainer. You
% should also announce your new status to the same pertinent
-% community as in~\vref{LPPL:item:intention}
+% community as in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention}
% above.\par
% \subsection{Whether and How to Distribute Works under This
-% License}\label{LPPL:Distribute}
+% License}\label{Distribute}
% This section contains important instructions, examples, and
% recommendations for authors who are considering distributing
% their works under this license. These authors are addressed as
% `you' in this section.\par
-% \subsubsection{Choosing This License or Another License}\label{LPPL:Choosing}
+% \subsubsection{Choosing This License or Another License}\label{Choosing}
% If for any part of your work you want or need to use
% \emph{distribution} conditions that differ
% significantly from those in this license, then do not refer to
% this license anywhere in your work but, instead, distribute
% your work under a different license. You may use the text of
% this license as a model for your own license, but your license
-% should not refer to the \textsc{lppl} or otherwise
+% should not refer to the {\smaller LPPL} or otherwise
% give the impression that your work is distributed under the
-% \textsc{lppl}.\par
-% The document \url{modguide.tex} in the base \LaTeX{}
+% {\smaller LPPL}.\par
+% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
% distribution explains the motivation behind the conditions of
% this license. It explains, for example, why distributing
-% \LaTeX{} under the \textsc{gnu} General Public
-% License (\textsc{gpl}) was considered inappropriate.
+% \LaTeX{} under the {\smaller GNU} General Public
+% License ({\smaller GPL}) was considered inappropriate.
% Even if your work is unrelated to \LaTeX{}, the discussion in
-% \url{modguide.tex} may still be
+% {\ttfamily{}modguide.tex} may still be
% relevant, and authors intending to distribute their works
% under any license are encouraged to read it.\par
% \subsubsection{A Recommendation on Modification Without
-% Distribution}\label{LPPL:WithoutDistribution}
+% Distribution}\label{WithoutDistribution}
% It is wise never to modify a component of the Work, even
% for your own personal use, without also meeting the above
% conditions for distributing the modified component. While you
@@ -763,7 +1191,7 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% of the Work identical with the public one. Many works provide
% ways to control the behavior of that work without altering any
% of its licensed components.\par
-% \subsubsection{How to Use This License}\label{LPPL:HowTo}
+% \subsubsection{How to Use This License}\label{HowTo}
% To use this license, place in each of the components of
% your work both an explicit copyright notice including your
% name and the year the work was authored and/or last
@@ -771,7 +1199,10 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% distribution and/or modification of that component is
% constrained by the conditions in this license.\par
% Here is an example of such a notice and statement:\par
-% \begin{verbatim}
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
%%% pig.dtx
%%% Copyright 2005 M. Y. Name
%%
@@ -789,27 +1220,30 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
%%
%% This work consists of the files pig.dtx and pig.ins
%% and the derived file pig.sty.
-% \end{verbatim}
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
% Given such a notice and statement in a file, the
% conditions given in this license document would apply, with
% the `Work' referring to the three files
-% \url{pig.dtx}, \url{pig.ins}, and \url{pig.sty} (the last being generated
-% from \url{pig.dtx} using \url{pig.ins}), the `Base
+% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
+% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
% Interpreter' referring to any
% `\LaTeX{}-Format', and both `Copyright
% Holder' and `Current Maintainer'
% referring to the person
-% M.~Y.~Name\index{M.~Y.~Name}.\par
+% M.~Y.~Name\index{!}.\par
% If you do not want the Maintenance section of
-% \textsc{lppl} to apply to your Work, change
+% {\smaller LPPL} to apply to your Work, change
% `maintained' above into
% `author-maintained'. However, we recommend that
% you use `maintained' as the Maintenance
% section was added in order to ensure that your Work remains
% useful to the community even when you can no longer maintain
% and support it yourself.\par
-% \subsubsection{Derived Works That Are Not Replacements}\label{LPPL:NotReplacements}
-% Several clauses of the \textsc{lppl} specify
+% \subsubsection{Derived Works That Are Not Replacements}\label{NotReplacements}
+% Several clauses of the {\smaller LPPL} specify
% means to provide reliability and stability for the user
% community. They therefore concern themselves with the case
% that a Derived Work is intended to be used as a (compatible or
@@ -817,22 +1251,28 @@ url = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
% the case (e.g., if a few lines of code are reused for a
% completely different task), then clauses 6b and 6d shall not
% apply.\par
-% \subsubsection{Important Recommendations}\label{LPPL:Recommendations}
-% \paragraph{Defining What Constitutes the Work}
-% The \textsc{lppl} requires that distributions
+% \subsubsection{Important Recommendations}\label{Recommendations}
+% \paragraph[Defining What Constitutes the Work]{Defining What Constitutes the Work :}
+% The {\smaller LPPL} requires that distributions
% of the Work contain all the files of the Work. It is
% therefore important that you provide a way for the licensee
% to determine which files constitute the Work. This could,
% for example, be achieved by explicitly listing all the files
% of the Work near the copyright notice of each file or by
% using a line such as:\par
-% \begin{verbatim}
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
%% This work consists of all files listed in manifest.txt.
-% \end{verbatim}
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
% in that place. In the absence of an unequivocal list it
% might be impossible for the licensee to determine what is
% considered by you to comprise the Work and, in such a case,
% the licensee would be entitled to make reasonable
% conjectures as to which files comprise the Work.\par
% \Finale
-\endinput
+
diff --git a/macros/latex/contrib/decorule/decorule.ins b/macros/latex/contrib/decorule/decorule.ins
index b6080f8753..9033256828 100644
--- a/macros/latex/contrib/decorule/decorule.ins
+++ b/macros/latex/contrib/decorule/decorule.ins
@@ -1,5 +1,7 @@
-%%% decorule.ins
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
+% Transformed from decorule.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+%
+% decorule.ins is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -11,26 +13,44 @@
% and version 1.3 or later is part of all distributions of
% LaTeX version 2005/12/01 or later.
%
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
%
% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
%
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
+% This work consists of the files decorule.dtx and decorule.ins,
+% the derived file
+% and any other ancillary files listed in the MANIFEST.
%
\input docstrip.tex
\keepsilent
\usedir{tex/latex/decorule}
\preamble
+
+This is a generated file.
+
+Copyright © 2010 by Peter Flynn
+
This file was generated from an XML master source.
Amendments and corrections should be notified to the maintiner
for inclusion in future versions.
+
\endpreamble
-\generate{\file{decorule.sty}{\from{decorule.dtx}{package}}}
+\generate{\file{decorule.sty}{\from{decorule.dtx}{package}}
+}
\obeyspaces
\Msg{********************************************************}
\Msg{** **}
-\Msg{** Read the documentation before using this package. **}
+\Msg{** Read the documentation before using this package. **}
+\Msg{** **}
+\Msg{** To finish the installation you have to move the **}
+\Msg{** following file into a directory searched by TeX: **}
+\Msg{** **}
+\Msg{** **}
+\Msg{** **}
+\Msg{** To produce the documentation run the file **}
+\Msg{** decorule.dtx through pdfLaTeX and BiBTeX **}
+\Msg{** **}
+\Msg{** Happy LaTeXing! **}
\Msg{** **}
\Msg{********************************************************}
\endbatchfile
diff --git a/macros/latex/contrib/decorule/decorule.pdf b/macros/latex/contrib/decorule/decorule.pdf
index 6cdb2bd06d..027e981ede 100644
--- a/macros/latex/contrib/decorule/decorule.pdf
+++ b/macros/latex/contrib/decorule/decorule.pdf
Binary files differ
diff --git a/macros/latex/contrib/suftesi/suftesi.dtx b/macros/latex/contrib/suftesi/suftesi.dtx
index 8faa427e85..cdeca22b56 100644
--- a/macros/latex/contrib/suftesi/suftesi.dtx
+++ b/macros/latex/contrib/suftesi/suftesi.dtx
@@ -4,28 +4,34 @@
\input docstrip
\preamble
- Copyright 2009-2020 by Ivan Valbusa
+The 'suftesi' document class
+Copyright (C) 2009-2020 Ivan Valbusa
+<ivan dot valbusa at gmail dot com>
- This program is provided under the terms of the
- LaTeX Project Public License distributed from CTAN
- archives in directory macros/latex/base/lppl.txt.
+All rights reserved.
- Author: Ivan Valbusa
- ivan dot valbusa at univr dot it
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
- This work has the LPPL maintenance status "author-maintained".
+This work consists of all files listed in README
-\endpreamble
+This work has the LPPL maintenance status "author-maintained".
+\endpreamble
\keepsilent
\askforoverwritefalse
\Msg{*** Generating the class file ***}
-\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
- \nopreamble\nopostamble
- \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
- }
-
+\generate{
+ \file{suftesi.cls}{\from{suftesi.dtx}{class}}
+ \nopreamble\nopostamble
+ \file{suftesi.bib}{\from{suftesi.dtx}{bib}}}
+
\Msg{***********************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the following}
@@ -40,26 +46,9 @@
\Msg{*}
\Msg{* Happy TeXing}
\Msg{***********************************************************}
-
\endgroup
%</internal>
-%
-% Copyright (C) 2009-2020 by Ivan Valbusa
-% <ivan dot valbusa at univr dot it>
-% -------------------------------------------------------
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work consists of all files listed in README
-%
% \fi
-%
% \iffalse
%<*driver>
\ProvidesFile{suftesi.dtx}
@@ -67,87 +56,79 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
+ [2020/05/21 v2.9.9 A class for typesetting theses, books and articles]
%</class>
%<*driver>
-\documentclass[10pt]{ltxdoc}
+\documentclass[12pt]{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[greek.ancient,english]{babel}
-% fonts and colors
-\usepackage{cochineal}
-\usepackage[varqu,varl,var0]{inconsolata}
-\usepackage{biolinum}
-\usepackage{amsthm}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+%--------------------------------------------------------
+% GRAPHICS
+%--------------------------------------------------------
\usepackage[svgnames]{xcolor}
\definecolor{philA}{named}{DarkRed}
\definecolor{philB}{named}{NavyBlue}
\definecolor{sufred}{rgb}{0.5,0,0}
\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
-\usepackage{metalogo}
-\usepackage{guit}
+\usepackage{tikz}
+\usetikzlibrary{shadows}
+\usepackage[framemethod=TikZ]{mdframed}
+\mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
+%--------------------------------------------------------
+% DOC FACILITIES
+%--------------------------------------------------------
+\usepackage{metalogo,hologo}
+\usepackage{guit}% before ltxdockit but after xcolor!
\usepackage[final]{microtype}
-% doc facilities
\let\cs\relax
\let\cmd\relax
\usepackage{ltxdockit}
-\usepackage{siunitx}
+%--------------------------------------------------------
+% FONTS
+%--------------------------------------------------------
+\usepackage{cochineal}
% To use the cochineal inside the document we have to define the family
% because the .fd files of the font refer to conditionals
% defined in 'cochineal.sty’:
\DeclareFontFamily{T1}{Cochineal-LF}{}
\DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
- <-> s*[1.0] Cochineal-Roman-osf-t1}{}
-% layout
+ <-> s*[1.0] Cochineal-Roman-osf-t1}{}
+\usepackage[varqu,varl,var0]{inconsolata}
+\usepackage{biolinum}
+\usepackage{amsthm}
+\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cal=boondoxo]{mathalpha}
+%--------------------------------------------------------
+% LAYOUT
+%--------------------------------------------------------
+\usepackage[skip=1.5ex]{parskip}
\setcounter{tocdepth}{3}
\usepackage{geometry}
\geometry{
- a4paper,
- margin=3cm,
- headheight=15pt,
- ignoreall,
- heightrounded}
+ a4paper,
+ margin=3cm,
+ %paperwidth=128mm,
+ %paperheight=96mm,
+ %margin=1cm,
+ headheight=15pt,
+ ignoreall,
+ heightrounded}
\usepackage{sectsty}
\allsectionsfont{\sffamily}
-\usepackage{fancyhdr}
-\fancyhf{}
-\fancyhead[L]{© 2009-\the\year\quad Ivan Valbusa}
-\fancyfoot[L]{\textsf{suftesi}
- \fileversion{}~--~\filedate}
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyhead[R]{\thepage}
-\pagestyle{fancy}
-% Graphics
-\usepackage[framemethod=TikZ]{mdframed}
- \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
-\usepackage{tikz}
- \usetikzlibrary{shadows}
-\usepackage{afterpage}
-% Tables
+% --------------------------------------------------------
+% OTHER PACKAGES
+% --------------------------------------------------------
+\usepackage[autostyle]{csquotes}
+\usepackage[style=philosophy-classic,backend=biber]{biblatex}
+\addbibresource{suftesi.bib}
\usepackage{array}
\usepackage{booktabs}
\usepackage{multirow}
-% Bibliography
-\usepackage[autostyle]{csquotes}
-\usepackage[style=philosophy-classic,backend=biber]{biblatex}
- \addbibresource{suftesi.bib}
-\usepackage{metalogo}
-\usepackage{guit}
-% Greek examples
-\def\latintxt{Aliquam auctor, pede consequat
- laoreet varius, eros tellus maris quam, pellentesque hendrerit.}
-\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
- nibh est placerat.}
-\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ
-ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί
-ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}
-\newcommand{\greekexample}[4]{%
- \noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt}%
- { \fontfamily{#2}\fontsize{#4}{13}\selectfont%
- \textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
-% New commands
+\usepackage{siunitx}
+%--------------------------------------------------------
+% COMMANDS AND ENVIRONMENTS
+%--------------------------------------------------------
\newcommand{\new}{\marginpar{\textcolor{red}{\textbf{NEW!}}}}
\newcommand{\argstyle}{\itshape}
\DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
@@ -156,85 +137,79 @@
$\langle${\argstyle\rmfamily#1\kern0.12em}$\rangle$}
\DeclareRobustCommand*{\arm}[1]{\ar{\meta{\argstyle#1}}}
\DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
+\newcommand*{\OR}{${}\mid{}$}
% New environments
-\newenvironment{ttquote}
- {\begin{mdframed}[default]
- \ttfamily\microtypesetup{activate=false}}
- {\end{mdframed}}
-\newenvironment{latexcode}
- {\begin{mdframed}[default]}
- {\end{mdframed}}
+\newenvironment{ttquote}{%
+ \begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
+\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
% Correct (?) \optitem to use \meta inside #2
\makeatletter
\renewcommand*{\ltd@ol@optitem}[3][]{%
\ifblank{#1}
- {\ltd@option{}{#2}{#3}{}}
- {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
-\def\ltd@textverb#1{~#1~}
-\renewenvironment*{optionlist}
-{\list{}{%
- \setlength{\labelwidth}{2.5cm}%
- \setlength{\labelsep}{\z@}%
- \setlength{\leftmargin}{2.5cm}%
- \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
- \ltd@optionlist}
-{\endlist}
-\renewenvironment*{ltxsyntax}[1][3cm]
-{\list{}{%
- \setlength{\labelwidth}{3cm}%
- \setlength{\labelsep}{0pt}%
- \setlength{\leftmargin}{#1}%
- \renewcommand*{\makelabel}[1]{%
- \hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}%
- \let\csitem\ltd@csitem
- \let\cmditem\ltd@cmditem
- \let\envitem\ltd@envitem
- \let\lenitem\ltd@csitem
- \let\boolitem\ltd@boolitem
- \let\cntitem\ltd@item
- \let\optitem\ltd@item}
-{\endlist}
-{\endlist}
+ {\ltd@option{}{#2}{#3}{}}
+ {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
\renewenvironment*{valuelist}[1][]
{\list{}{%
- \ifblank{#1}
- {\setlength{\labelwidth}{5em}}
- {\setlength{\labelwidth}{#1}}%
- \setlength{\labelsep}{1em}%
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \setlength{\itemsep}{0pt}%
- \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
+ \ifblank{#1}
+ {\setlength{\labelwidth}{5em}}
+ {\setlength{\labelwidth}{#1}}%
+ \setlength{\labelsep}{1em}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{0pt}%
+ \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
{\endlist}
\newcommand*{\valuelistfont}{%
- \color{olive}\sffamily\displayverbfont}
+ \color{olive}\sffamily\displayverbfont}
\renewcommand*{\optionlistfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
\renewcommand*{\ltxsyntaxlabelfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
\renewcommand*{\marglistfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
% Table of contents
\renewcommand\tableofcontents{%
- \setlength{\columnsep}{1cm}
- {\centering
- \section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}}
- \thispagestyle{empty}
- \begin{multicols}{2}
- \@starttoc{toc}%
+ \setlength{\columnsep}{1cm}
+ {\centering
+ \section*{\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}}
+ \thispagestyle{empty}
+ \begin{multicols}{2}
+ \@starttoc{toc}%
\end{multicols}}
\makeatother
-% hyperref setup
+% --------------------------------------------------------
+% GREEK EXAMPLES
+% --------------------------------------------------------
+\makeatletter
+\newcommand{\mygrsize}{\f@size}
+\makeatother
+\newcommand{\mygrpxsize}{12.5}
+\def\latintxt{Aliquam auctor, pede consequat
+ laoreet varius, eros tellus maris quam, pellentesque hendrerit.}
+\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
+ nibh est placerat.}
+\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ
+ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί
+ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}
+\newcommand{\greekexample}[4]{%
+ \noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt\ }%
+ {\fontfamily{#2}\fontsize{#4}{13}\selectfont%
+ \textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
+% --------------------------------------------------------
+% HYPERREF SETUP
+% --------------------------------------------------------
\usepackage{hyperref}
\hypersetup{%
- hidelinks,
+ hidelinks,
pdftitle={User's Guide to \textsf{suftesi}},
pdfsubject={A document class for typesetting theses,
books and articles},
pdfauthor={Ivan Valbusa},
pdfkeywords={thesis, humanities, books}}
-
+% --------------------------------------------------------
+% FINAL SETTINGS
+% --------------------------------------------------------
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -246,7 +221,7 @@
%</driver>
% \fi
%
-% \CheckSum{5277}
+% \CheckSum{5385}
%
% \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
@@ -264,6 +239,7 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v2.9.9}{2020/05/21}{Removed a bug with \cmd{appendix} and roman chapter numbers in table of contents. Updated documentation.}
% \changes{v2.9.8}{2020/02/24}{Removed license restrictions. Updated documentation.}
% \changes{v2.9.7}{2020/02/22}{New option \opt{fontisize}. The \opt{parindent} options now accepts arbitrary values. Updated documentation.}
% \changes{v2.9.6a}{2020/02/11}{Maintenance release}
@@ -356,17 +332,62 @@
% \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
% \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
%
+% \thispagestyle{empty}
+% \begin{tikzpicture}[overlay,remember picture]
+% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm) node[align=center,anchor=center] {%
+% Ivan Valbusa\\[1cm]
+%
+%\Huge\color{gray}\bfseries \parbox{10cm}{\centering The \\{{\color{philA}\fontsize{30}{32}\textsf{suftesi}}\\ document class}}\\[1cm]
+% \color{black!60!Goldenrod}
+%
+%\normalsize \fileversion{} -- \filedate
+%
+%};
+% \end{tikzpicture}
+% \clearpage\thispagestyle{empty}
+%
+% \null\vfill
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section*{Legalese}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
+% \smallskip
+%
+% \noindent This package is author-maintained.
+% Permission is granted to copy, distribute and/or modify this software
+% under the terms of the \LaTeX{} Project Public License, version 1.3 or
+% later (\url{http://latex-project.org/lppl}).
+% This software is provided ``as is'', without warranty of any kind,
+% either expressed or implied, including, but not limited to, the implied
+% warranties of merchantability and fitness for a particular purpose.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section*{Feedback}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% If you have any questions, feedback or requests please email
+% me at \texttt{ivan dot valbusa at gmail dot com}. If you need specific
+% features not already implemented, remember to attach the example files.
+%
+% \clearpage
+%
% \begin{center}
-% {\color{philA}\bfseries
-% \Huge User's Guide to \textsf{suftesi}\\[3mm]}
-% {\large\itshape A document class for typesetting theses, books and articles}
+% {\color{philA}\bfseries\sffamily
+% \Huge User's Guide to \texttt{suftesi}\\[3mm]}
+% {\large\bfseries\sffamily A document class for typesetting theses, books and articles}
% \vspace{.8cm}
%
% \normalsize\fileversion{} -- \filedate
% \vspace{.7cm}
%
% Ivan Valbusa\\[2mm]
-% \footnotesize\texttt{Ivan dot Valbusa at univr dot it}
+% \footnotesize\texttt{ivan dot valbusa at gmail dot com}
% \vspace{1cm}
% \end{center}
% \begin{abstract}
@@ -376,70 +397,94 @@
% provides a set of ``humanistic'' page layouts, title styles
% and heading styles to typeset books, articles and theses.
% The styles are very simple and sober and also have the aim of
-% finding an aesthetic harmony in the formal simplicity \parencite[see][]{valbusa:20122}. They are
+% finding an aesthetic harmony in the formal simplicity
+% \parencite[see][]{valbusa:20122}. They are
% largely inspired by some interesting readings, particularly
-% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
+% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992},
+% \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
% \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}.
% \end{abstract}
%
-% \tableofcontents
-%
-% \section*{Legalese}
-%
-% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
-% \smallskip
-%
-% \noindent This package is author-maintained.
-% Permission is granted to copy, distribute and/or modify this software under the
-% terms of the LaTeX Project Public License, version 1.3 or later (\url{http://latex-project.org/lppl}).
-% This software is provided ``as is'', without warranty of any kind, either expressed or implied,
-% including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \tableofcontents
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% \section*{A brief history}
+% \clearpage
%
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona.
%
-% \section*{Acknowledgments}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section*{A brief history}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione
+ % a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human
+ % sciences}) which I held at the Graduate School of Human Sciences and Philosophy
+% (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e
+% \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June
+% 2010. Originally thought as a class to typeset theses, during these years
+% it has developed many new features and styles. Finally it has become the
+% referential class of the Joint Project \emph{Formal Style for PhD
+ % Theses with \LaTeX} of the University of Verona.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section*{Acknowledgments}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% I would like to thank Professors Paola Di~Nicola,
-% Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
-% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
-% I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
-
-% \section*{Feedback}
-%
-% \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
+% Director of the Graduate School, and Ugo Savardi who suggested to propose
+% the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and
+% Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course;
+% Catia Cordioli, for her help in the organization of the lessons;
+% Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided
+% the \TeX{}~Live~2009 \textsc{DVD}s.
+% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX,
+% for the \TeX pert support and his priceless ``magic formulas'', and Tommaso
+% Gordini for his valuable advice in choosing and improving the class
+% features during these years. I would finally thank all the participants
+% to the course who patiently resisted the four intensive lessons.
+% This work is dedicated to them.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Usage}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% \section{Use}
+% The class can be loaded as usual with:
%
-% The \sty{suftesi} class is called as usual by
% \begin{ttquote}
% \cmd{documentclass}\oarm{options}\{suftesi\}
% \end{ttquote}
-% All the options defined by the class are in the \meta{key}=\meta{value} format.
-%
-% In addition to these you can also use the options defined by the standard \sty{book} class (on which \sty{suftesi} is based) except those modifying
-% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper}, \opt{legalpaper}, \opt{executivepaper} and \opt{landscape}), which are automatically disabled. The class loads the packages listed in table \ref{tab:pkgloaded}.
-%
-% \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
-% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX) and to select a main font.
-%
+% All the options defined by the class are in
+% the \meta{key}\texttt{=}\meta{value} format. In addition to these you can
+% also use the options defined by the standard
+% \sty{book} class (on which \sty{suftesi} is based) except those modifying
+% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper},
+%\opt{legalpaper}, \opt{executivepaper} and \opt{landscape}), which are
+% automatically disabled. The class loads the packages listed in
+% the following table.
%
% \begin{table}[h]
% \centering
% \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
% \toprule
-% & textrm{Global} & appendix, caption, color, crop, enumitem, emptypage,
-% fancyhdr, fixltxhyph, fontenc, geometry, iftex,
-% microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses) \\\midrule
-% & \textrm{pdf\LaTeX{} only} & fontenc, substitutefont \\\midrule
-% & \textrm{Lua\LaTeX{} only} & luatex85 \\\midrule
-% defaultfont~= & ~standard & lmodern \\
-% & ~palatino & textcomp, newpxtext, biolinum, inconsolata, newpxmath \\
-% & ~libertine & textcomp, libertine, biolinum, inconsolata, newtxmath \\
-% & ~cochineal & textcomp, cochineal, biolinum, inconsolata, newtxmath \\
-% & ~compatibility & mathpazo, beramono \\\midrule
-% mathfont~= & ~extended & amsthm, mathalfa \\\bottomrule
+% & \textrm{Global} & appendix, caption, color, crop, enumitem, emptypage,
+% fancyhdr, fixltxhyph, fontenc, geometry, iftex,
+% microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses) \\\midrule
+% & \textrm{pdf\LaTeX{} only} & fontenc, substitutefont \\\midrule
+% & \textrm{Lua\LaTeX{} only} & luatex85 \\\midrule
+% defaultfont~= & ~standard & lmodern \\
+% & ~palatino & textcomp, newpxtext, biolinum, inconsolata, newpxmath \\
+% & ~libertine & textcomp, libertine, biolinum, inconsolata, newtxmath \\
+% & ~cochineal & textcomp, cochineal, biolinum, inconsolata, newtxmath \\
+% & ~compatibility & mathpazo, beramono \\\midrule
+% mathfont~= & ~extended & amsthm, mathalpha \\\bottomrule
% \end{tabular}
% \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
% \end{table}
@@ -447,68 +492,129 @@
% \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
%
%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% \section{Class features}
+% For using the class with the \XeTeX{} and \LuaTeX{} engines you need
+% to load the \sty{fontspec} package (\sty{mathspec} is an alternative
+% only for \XeTeX) and to select a main font.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Class features}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at
+% The \sty{suftesi} class provides a large set of options to customize
+% the style of page, titles, headings and other text elements (see section
+% \ref{sec:options}). The simplest way to get to know the class features
+% is therefore to typeset one of the templates which you can find in the
+% \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution
+% \parencite[see also][]{valbusa:20122}. The class files as well as the
+% templates are also available online on the CTAN’s website at
% \textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
%
-% \subsection{Document structure}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Document structure}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% With \sty{suftesi} you can typeset book-style documents (with chapters), article-style documents (without chapters) and collections of papers (see section \ref{sec:collection}). The kind of document is set by the \opt{structure} option which defaults to \opt{book} (see section \ref{sec:options}).
-%
-% \begin{ttquote}
-% \cmd{documentclass}[structure=\meta{value},\meta{options}]\{suftesi\}
-% ^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\
-% ^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\}
-% \end{ttquote}
-%
-% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. It is not compatible with \sty{crop}.}
+% With \sty{suftesi} you can typeset book-style documents (with chapters),
+% article-style documents (without chapters) and collections of papers
+% (see section \ref{sec:collection}). The kind of document is set by the
+% \opt{structure} option which defaults to \opt{book} (see section
+% \ref{sec:options}).
+%
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer
+% loaded. It is not compatible with \sty{crop}.}
%
-% \subsection{Page layouts}
-%
-% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts the \opt{version=screen} and \opt{version=cscreen} options are particularly useful as they show the output in its real size. See section \ref{sec:page-styles} for details.
-%
-% \begin{table}[h]
-% \centering
-% \begin{tabular}{lcccccccl}
-% \toprule
-% & \multicolumn{4}{c}{Dimensions(mm)} & \multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){6-9}
-% & \multicolumn{2}{c}{Typeblock}& \multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}
-% & \multicolumn{2}{c}{Stock}\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}
-% Layout & w & h & w & h & t\,/\,b & i \,/\,o & Typeblock & Page\\
-% \cmidrule(r){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}\cmidrule(r){1-1}
-% \opt{standard} & 110 & 220 & 210 & 297 & $1:2$ & $1:2$ & $1:2$ & $1:\sqrt{2}$ \\
-% \opt{standardaureo} & 136 & 220 & 210 & 297 & $2:3$ & $2:3$ & $5:8$ \makebox[0pt]{\textsuperscript{*}} & $1:\sqrt{2}$ \\
-% \opt{compact} & 110 & 165 & 160 & 240 & $2:3$ & $2:3$ & $2:3$ & $2:3$ \\
-% \opt{compactaureo} & 118 & 191 & 160 & 240 & $2:3$ & $2:3$ & $5:8$ \makebox[0pt]{\textsuperscript{*}} & $2:3$ \\
-% \opt{supercompact} & 100 & 150 & 140 & 210 & $2:3$ & $2:3$ & $2:3$ & $2:3$ \\
-% \opt{supercompactaureo} & 108 & 175 & 140 & 210 & $1:1$ & $1:1$ & $5:8$ \makebox[0pt]{\textsuperscript{*}} & $2:3$ \\
-% \opt{periodical} & 110 & 165 & 170 & 240 & $2:3$ & $2:3$ & $2:3$ & $1:\sqrt{2}$ \\
-% \opt{periodicalaureo} & 120 & 194 & 170 & 240 & $2:3$ & $2:3$ & $5:8$ \makebox[0pt]{\textsuperscript{*}} & $1:\sqrt{2}$ \\
-% \bottomrule\\[-2ex]
-% \multicolumn{9}{r}{\footnotesize\textsuperscript{*}$5:8\approx1:1,618$}
-% \end{tabular}\\[-3ex]
-% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
-% \end{table}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Page layouts}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class provides eight page layouts which can be selected by the
+% \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard}
+% layout (default) or \opt{standardaureo} layout are aimed to typeset
+% A4 documents, while the other seven layouts are particularly suitable
+% to typeset compact books, articles or theses. For these compact layouts
+% the \opt{version=screen} and \opt{version=cscreen} options are particularly
+% useful as they show the output in its real size. See section
+% \ref{sec:page-styles} for details.
+%
+%\begin{table}[h]
+%\centering
+%\begin{tabular}{@{}lccccr@{\,$:$\,}lr@{\,$:$\,}lcr@{\,$:$\,}l@{}}
+%\toprule
+% &
+% \multicolumn{4}{c}{Dimensions (mm)} &
+% \multicolumn{7}{c}{Proportions} \\
+% \cmidrule(lr){2-5}
+% \cmidrule(l){6-12}
+% &
+% \multicolumn{2}{c}{Typeblock} &
+% \multicolumn{2}{c}{Page} &
+% \multicolumn{4}{c}{Margins} &
+% \multicolumn{3}{c}{Stock} \\
+% \cmidrule(lr){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% Layout & w & h & w & h &
+% \multicolumn{2}{c}{t\,/\,b} &
+% \multicolumn{2}{c}{i\,/\,o} &
+% Typeblock &
+% \multicolumn{2}{c}{Page} \\
+% \cmidrule(r){1-1}
+% \cmidrule(rl){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% \opt{standard} & 110 & 220 & 210 & 297 & $1$ & $2$ & $1$ & $2$ & 1\,:\,2 & $1$ & $\sqrt{2}$ \\
+% \opt{standardaureo} & 136 & 220 & 210 & 297 & $2$ & $3$ & $2$ & $3$ &
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}} & $1$ & $\sqrt{2}$ \\
+% \opt{compact} & 110 & 165 & 160 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{compactaureo} & 118 & 191 & 160 & 240 & $2$ & $3$ & $2$ & $3$ &
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}} & $2$ & $3$ \\
+% \opt{supercompact} & 100 & 150 & 140 & 210 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{supercompactaureo} & 108 & 175 & 140 & 210 & $1$ & $1$ & $1$ & $1$ &
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}} & $2$ & $3$ \\
+% \opt{periodical} & 110 & 165 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $1$ & $\sqrt{2}$ \\
+% \opt{periodicalaureo} & 120 & 194 & 170 & 240 & $2$ & $3$ & $2$ & $3$ &
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}} & $1$ & $\sqrt{2}$ \\
+%\bottomrule\\[-2ex]
+%\multicolumn{12}{r}{\footnotesize\textsuperscript{*}5\,:\,8\,$\approx$\,1\,:\,1,618}
+%\end{tabular}\\[-3ex]
+%\caption{The layouts of \sty{suftesi}}\label{tab:layouts}
+%\end{table}
+%
+% You can define your own layouts through the \cmd{geometry} command
+% and you can change the value of \cmd{baselineskip} too. For example
+% you can resize the typeblock of the \texttt{supercompactaureo} layout
+% to fit your particular needs. In this case remember to declare
+% \cmd{normalsize} like in the following example:
%
-% You can define your own layouts through the \cmd{geometry} command and you can change the value of \cmd{baselineskip} too. For example you can resize the typeblock of the \texttt{supercompactaureo} layout to fit your particular needs. In this case remember to declare \cmd{normalsize} like in the following example:
% \begin{latexcode}
-% \begin{verbatim}
-% \linespread{0.95}
-% \normalsize
-% \geometry{
-% textheight= 162mm,
-% textwidth= 100mm,
-% paperwidth= 140mm,
-% paperheight= 210mm,
-% hmarginratio= 2:3,
-% vmarginratio= 1:1,
-% marginparwidth= 11mm,
-% marginparsep= 7pt,
-% ignoreall,
-% heightrounded}
-% \end{verbatim}
+%\begin{verbatim}
+%\linespread{0.95}
+%\normalsize
+%\geometry{
+% textheight= 162mm,
+% textwidth= 100mm,
+% paperwidth= 140mm,
+% paperheight= 210mm,
+% hmarginratio= 2:3,
+% vmarginratio= 1:1,
+% marginparwidth= 11mm,
+% marginparsep= 7pt,
+% ignoreall,
+% heightrounded}
+%\end{verbatim}
% \end{latexcode}%
% ^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
%
@@ -522,26 +628,62 @@
% ^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
% ^^A\end{figure}
%
-% \subsection{Fonts}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% The default roman font is Cochineal by Michael Sharpe,
-% the sans serif font is Linux Biolinum O, designed by Philipp H. Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastina Kosch, a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion (Robert Slimbach). It is a very complete typeface and it offers full support for Greek and Cyrillic, real small caps (even in italic shape) and four figure styles. Moreover it provides support for mathematics through the \sty{newtxmath} package.
-%
-% The \opt{defaultfont} option allows you to can change the default roman font to New PX (Palatino-like), Linux Libertine O, or Latin modern.
-% You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} option which turns off the default font settings (see section \ref{sec:options} for details).
-%
-% Today there are several Garamond-like fonts in TeX Live distribution. See, for example \textit{Garamond Libre} (Open Type only) and \textit{Cormorant Garamond}. The Bembo-like fonts \textit{Etbb} and \textit{fbb} should also be considered if you appreciate humanist fonts. In any case, before using a font, read the license carefully.
-%
-% Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at
-% \url{http://tug.org/fonts/getnonfreefonts/}.
-%
-%
-% \subsubsection[Mathematics]{Typesetting mathematics}
-%
-% The class loads by default a ‘minimal’ mathematical support for Cochineal (default), Linux Libertine O or New PX via the \sty{newtxmath} or \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. These non-standard fonts have a very good mathematical support but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details.
-%
-% If some of the loaded packages conflict or if you simply want to change some of the default font settings you should first reset the font default with \opt{defaultfont=none} option and then load the packages in the right order and with your favorite options.
+% the sans serif font is Linux Biolinum O, designed by Philipp H.
+% Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata
+% by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastian Kosch,
+% a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion
+% (Robert Slimbach). It is a very complete typeface and it offers full
+% support for Greek and Cyrillic, real small caps (even in italic shape)
+% and four figure styles. Moreover it provides support for mathematics
+% through the \sty{newtxmath} package.
+%
+% The \opt{defaultfont} option allows you to can change the default roman
+% font to New PX (Palatino-like), Linux Libertine O, or Latin Modern.
+% You can use other fonts as well, but in this case remember to load the
+% \opt{defaultfont=none} option which turns off the default font settings
+% (see section \ref{sec:options} for details).
+%
+% Today there are several Garamond-like fonts in \TeX~Live distribution.
+% See, for example Garamond Libre (OpenType only) and Cormorant Garamond.
+% The Bembo-like fonts Etbb and fbb should also be considered if you
+% appreciate humanist fonts. In any case, before using a font, read the
+% license carefully.
+%
+% Another beautiful Garamond-like font, complete of real small caps,
+% bold weight and mathematical support, is made available by the
+% \sty{garamondx} package by Michael Sharpe, which provides an extension
+% of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the
+% package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}.
+% They are not distributed as part of \TeX~Live, but they may be downloaded
+% using the \texttt{getnonfreefonts} script. See the instructions for
+% installation at \url{http://tug.org/fonts/getnonfreefonts/}.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsubsection[Mathematics]{Typesetting mathematics}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class loads by default a ‘minimal’ mathematical support for Cochineal
+% (default), Linux Libertine O or New PX via the \sty{newtxmath} or
+% \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont}
+% option is provided to extend or disable the support for mathematics when
+% using these fonts. These non-standard fonts have a very good mathematical
+% support but if you aim at typesetting high mathematics the Latin Modern
+% font family remains, of course, the better choice: \opt{defaultfont=standard}.
+% See section \ref{sec:fonts} for details.
+%
+% If some of the loaded packages conflict or if you simply want to change
+% some of the default font settings you should first reset the font default
+% with \opt{defaultfont=none} option and then load the packages in the right
+% order and with your favorite options.
% ^^AFor example, these are the codes loaded for the three non-standard fonts:
% ^^A
% ^^A\paragraph{defaultfont=cochineal}
@@ -557,7 +699,7 @@
% ^^A\usepackage{cochineal}
% ^^A\usepackage{amsthm}
% ^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-% ^^A\usepackge[cal=boondoxo]{mathalfa}
+% ^^A\usepackge[cal=boondoxo]{mathalpha}
% ^^A\useosf
% ^^A\useproportional
% ^^A\end{verbatim}
@@ -573,7 +715,7 @@
% ^^A\usepackage[varqu,varl]{inconsolata}
% ^^A\usepackage{amsthm}
% ^^A\usepackage[bigdelims,vvarbb]{newpxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa}
+% ^^A\usepackage[cal=boondoxo]{mathalpha}
% ^^A\useosf
% ^^A\useproportional
% ^^A\end{verbatim}
@@ -588,43 +730,90 @@
% ^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata}
% ^^A\usepackage{amsthm}
% ^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa}
+% ^^A\usepackage[cal=boondoxo]{mathalpha}
% ^^A\useosf
% ^^A\end{verbatim}
% ^^A\end{latexcode}
%
%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsubsection[Greek]{Typesetting Greek}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The Cochineal default font is complete of Greek and Cyrillic. Anyway
+% the class provides the \opt{greekfont} option (see section \ref{sec:fonts})
+% to select four different Greek fonts for use with the roman typeface
+% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard}
+% option, i.e. with Latin Modern font family which uses the CB Greek by default).
+% These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society)
+% and CB Greek (by Claudio Beccari). You may, of course, choose a different font
+% but in this case, as previously cleared, remember to load the
+% \opt{defaultfont=none} option.
+%
+% \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]\vskip-\baselineskip
+% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{\mygrsize}
+% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{\mygrsize}
+% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{\mygrsize}
+% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{\mygrsize}
+% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{\mygrsize}
+% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{\mygrsize}
+% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{\mygrsize}
+% \greekexample{zplosf}{porson}{New PX/Porson}{\mygrsize}
+% \greekexample{zplosf}{lmr}{New PX/CB Greek}{\mygrpxsize}
+% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{\mygrsize}
+% \end{mdframed}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{The cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.6 \sty{suftesi} provides a command to print a simple
+% cover page (figure \ref{fig:cover}), inspired by the Italian designer
+% Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for
+% the text and the circle as well as other graphical elements are partially
+% customizable (see section \ref{sec:options} for details). The cover shown
+% in figure \ref{fig:cover} is obtained with the following code:
+% \begin{latexcode}
+%\begin{verbatim}
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
+%\Cfootcolor{black}
+%
+%\makecover[ball color=DarkBlue,draw=none]
+%\end{verbatim}
+% \end{latexcode}
%
+% To produce a complete book cover, with spine and dust jacket, you should
+% take a look at the \sty{bookcover} package by Tibor Tómács.
%
-% \subsubsection[Greek]{Typesetting Greek}
-%
-% The Cochineal default font is complete of Greek and Cyrillic. Anyway the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) to select four different Greek fonts for use with the roman typeface
-% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) and CB Greek (by Claudio Beccari). You may, of course, choose a different font but in this case, as previously cleared, remember to load the \opt{defaultfont=none} option.
-%
%
-% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{10}
-% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{10}
-% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10}
-% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{10}
-% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{10}
-% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{10}
-% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10}
-% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10}
-% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{10}
-% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{10}
-% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{10}
-% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{10}
-% \greekexample{zplosf}{porson}{New PX/Porson}{10}
-% \greekexample{zplosf}{lmr}{New PX/CB Greek}{10.5}
-% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{10}
-%
-%
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
-% \draw[line width=.5mm,fill=white,text=black,draw=black!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\ St. Anford\\ University\\[1mm] * * * }};
-% \node[anchor=north west] at (-2.5cm,18cm) {%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{The frontispiece} \enlargethispage{\baselineskip}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+%\begin{figure}
+%\begin{minipage}{.5\textwidth}
+%\centering
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=white,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
+%\draw[line width=.1mm,fill=black!70,text=white,draw=black!300] (-4.2,18.1) circle (13mm) node {\parbox{10mm}{\centering\tiny ---*---\\ St. Anford\\ University\\ ---*--- }};
+% \node[scale=0.4,anchor=north west] at (-2.5cm,19cm) {%
% \parbox{8cm}{%
% \small University of St. Anford\par
% \normalsize Department of Typography
@@ -655,18 +844,17 @@
%
% Thesis submitted in 2010
% }
-% };
-%
-% \end{tikzpicture}
-% \caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
-% \end{figure}
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
+% };
+%\end{tikzpicture}
+%\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
+%\end{minipage}
+%\begin{minipage}{.5\textwidth}
+%\centering
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=gray!5,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
% \node at (0,.65\textheight) (c) {};
% \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
-% \node[anchor=center,text=white] at (c) {\parbox{6cm}{%
+% \node[scale=0.4,anchor=center,text=white] at (c) {\parbox{6cm}{%
% \centering
% {\scriptsize\scshape Bruce Lee\\}
% \vspace*{\baselineskip}
@@ -676,203 +864,212 @@
% {\smallskip\normalsize How to survive in the modern societies\\}
%
% {\vspace*{2\baselineskip}\scriptsize edited by\\ Walker Texas Ranger\\}}};
-% \node[align=center] at (0,1) {\scriptsize \textcolor{black}{Punch Press}\\[1ex]\textcolor{black}{\fbox{§§§§}}\\};
-% \end{tikzpicture}
-% \caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
-% \end{figure}
-
-%
-% \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
-% \begin{latexcode}
-% \begin{verbatim}
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
-% \Cpagecolor{white!90!black}
-% \Ctextcolor{white}
-% \Cfootcolor{black}
-%
-% \makecover[ball color=DarkBlue,draw=none]
-% \end{verbatim}
-% \end{latexcode}
-%
-% To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
-%
-% \subsection{The frontispiece} \enlargethispage{\baselineskip}
-%
-% The class has an original frontispiece (see figure \ref{fig:frontispiece}) now directly available
-% loading the \sty{frontespizio} package
+% \node[align=center] at (0,2) {\scriptsize \textcolor{black}{Punch Press}\\\textcolor{black}{\bfseries P\&P}};
+%\end{tikzpicture}
+%\caption{A cover page of \sty{suftesi}}\label{fig:cover}
+%\end{minipage}
+%\end{figure}
+%
+% The class has an original frontispiece (see figure \ref{fig:frontispiece})
+% now directly available loading the \sty{frontespizio} package
% with the \opt{suftesi} option. It is meant only for Italian users
% \parencite[see][version 1.4 or later]{Gregorio:frontespizio}:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \usepackage[suftesi]{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage[suftesi]{frontespizio}
+%\end{verbatim}
% \end{latexcode}
-% Note that this frontispiece requires the use of a logo which could be restricted by some institutions. So before using it you have to be sure that you have the required permissions.
+%
+% Note that this frontispiece requires the use of a logo which could be
+% restricted by some institutions. So before using it you have to be sure
+% that you have the required permissions.
%
-% The \sty{frontespizio} package produces a frontispiece in the standard Computer Modern typeface. If you prefer a consistent font remember to load the needed packages or commands in the \cmd{Preambolo} command:
+% The \sty{frontespizio} package produces a frontispiece in the standard
+% Computer Modern typeface. If you prefer a consistent font remember
+% to load the needed packages or commands in the \cmd{Preambolo} command:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \begin{frontespizio}
-% \Preambolo{\usepackage[osf]{cochineal}}% <===
-% \Universita{Paperopoli}
-% \Dipartimento{Filosofia, Pedagogia e Psicologia}
-% \Corso[Laurea]{Filosofia}
-% \Annoaccademico{2030--2031}
-% \Titolo{La mia tesi:\\ una lunga serie di risultati\\
-% difficilissimi e complicatissimi}
-% \Sottotitolo{Alcune considerazioni mutevoli}
-% \Candidato[vr12301231]{Paolo Rossi}
-% \Relatore{Guido Bianchi}
-% \end{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{frontespizio}
+% \Preambolo{\usepackage[osf]{cochineal}}% <===
+% ...
+%\end{frontespizio}
+%\end{verbatim}
% \end{latexcode}
%
-%
-%
% ^^A\subsection{Title page}
%
% ^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
%
-% \subsection{The appendices}
-% Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment.
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{The appendices}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.9.5 the class relies on \sty{appendix} package to manage
+% the appendices \parencite[see][]{wilson-robertson:appendix}. To get the correct label in titles, headings and table of
+% contents, you should use the \env{appendices} environment.
% \begin{latexcode}
-% \begin{verbatim}
-% \renewcommand{\appendixpagename}{Appendices}
-% \renewcommand{\appendixname}{Appendix}
-% \addappheadtotoc
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\renewcommand{\appendixname}{Appendix}
+%\addappheadtotoc
%
-% \begin{document}
+%\begin{document}
%...
-% \appendixpage
-%
-% \begin{appendices}
-%
-% \chapter{First appendix}
-% Lorem ipsum
-%
-% \chapter{First appendix}
-% Lorem ipsum
-%
-% \end{appendices}
-% \end{document}
-% \end{verbatim}
+%\appendixpage
+%
+%\begin{appendices}
+%
+% \chapter{First appendix}
+% Lorem ipsum
+%
+% \chapter{First appendix}
+% Lorem ipsum
+%
+%\end{appendices}
+%\end{document}
+%\end{verbatim}
% \end{latexcode}
%
%
-% \section{Options}\label{sec:options}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Options}\label{sec:options}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% \subsection{Layout}\label{sec:page-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Layout}\label{sec:page-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[book]{structure}{\opt{book}, \opt{article}, \opt{collection}}
+% \optitem[book]{structure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
% \changes{v0.9b}{2012/09/23}{New option \opt{structure}}
-% \begin{valuelist}
-% \item[book] For typesetting texts with chapters.
-% \item[article] For typesetting articles or short theses
-% (without chapters).
-% \item[collection] For typesetting journals or collections of articles (see section \ref{sec:collection}).
-% \end{valuelist}
-% \optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo}, \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo}, \opt{supercompact}, \opt{supercompactaureo}}
+% \begin{valuelist}
+% \item[book] For typesetting texts with chapters.
+% \item[article] For typesetting articles or short theses
+% (without chapters).
+% \item[collection] For typesetting journals or collections of articles
+% (see section \ref{sec:collection}).
+% \end{valuelist}
+% \optitem[standard]{pagelayout}{\opt{standard}\OR\opt{standardaureo}%
+% \OR\opt{periodical}\OR\opt{periodicalaureo}\OR\opt{compact}\OR
+% \opt{compactaureo}\OR\opt{supercompact}\OR\opt{supercompactaureo}}
% \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
-% \begin{valuelist}
-% \item[standard]
-% Prints an A4 page with a
-% typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
-% \end{valuelist}
+% \begin{valuelist}
+% \item[standard] Prints an A4 page with a
+% typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
+% \end{valuelist}
% With the following values the option prints the typeblock
% on a an A4 paper showing the crop marks which can be controlled
% by the \opt{version} option.
-% \begin{valuelist}
-% \item[periodical]
-% Prints a page of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of $\SI{11}{cm} \times \SI{16,5}{cm}$.
-% \item[periodicalaureo] The same of \opt{periodical} but with a
-% \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$.
-% \item[compact]
-% Prints a page of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of $\SI{11}{cm} \times \SI{16,5}{cm}$.
-% \item[compactaureo]
-% The same as \opt{compact} but with
-% a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.% \item[supercompact]
-% Prints a page of $\SI{14}{cm} \times \SI{21}{cm}$ with a typeblock of $\SI{10}{cm} \times \SI{15,5}{cm}$.
-% \item[supercompactaureo]
-% The same as \opt{supercompact} but with
-% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
-% \end{valuelist}
+% \begin{valuelist}
+% \item[periodical]
+% Prints a page of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of
+% $\SI{11}{cm} \times \SI{16,5}{cm}$.
+% \item[periodicalaureo] The same of \opt{periodical} but with a
+% \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$.
+% \item[compact]
+% Prints a page of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of
+% $\SI{11}{cm} \times \SI{16,5}{cm}$.
+% \item[compactaureo]
+% The same as \opt{compact} but with
+% a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.
+% \item[supercompact]
+% Prints a page of $\SI{14}{cm} \times \SI{21}{cm}$ with a typeblock of
+% $\SI{10}{cm} \times \SI{15,5}{cm}$.
+% \item[supercompactaureo]
+% The same as \opt{supercompact} but with
+% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
+% \end{valuelist}
% The details of this option are shown in table \ref{tab:layouts}.
-% \optitem[final]{version}{\opt{screen}, \opt{cscreen}, \opt{draft}, \opt{final}}
-% \begin{valuelist}
-% \item[screen] Prints the \textsc{pdf} with its real dimensions.
-% \item[cscreen] The same as \opt{version=screen} but with a centered typeblock.
-% \end{valuelist}
-% These previous two options are provided to have a better view when you are
-% typesetting and reading the \textsc{pdf} on the screen or for online publications. The following options meant for printed documents.
-% \begin{valuelist}
-% \item[draft]
-% Prints the output on a A4 paper, showing the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \item[final] Prints the output on a A4 paper, hiding the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \end{valuelist}
-% Sometimes it is not desirable to have the crop marks on every page. In such a case you can use the \cmd{crop}|[off]| command after the first page of the document.
+% \optitem[final]{version}{\opt{screen}\OR\opt{cscreen}\OR\opt{draft}
+% \OR\opt{final}}
+% The following two options are provided to have a better view when
+% you are typesetting and reading the \textsc{pdf} on the screen
+% or for online publications.
+% \begin{valuelist}
+% \item[screen] Prints the PDF with its real dimensions.
+% \item[cscreen] The same as \opt{version=screen} but with a centered
+% typeblock.
+% \end{valuelist}
+% The following two options are meant for printed documents.
+% \begin{valuelist}
+% \item[draft]
+% Prints the output on a A4 paper, showing the crop marks.
+% Useless with \opt{standard} and \opt{standardaureo} layouts.
+% \item[final] Prints the output on a A4 paper, hiding the crop marks.
+% Useless with \opt{standard} and \opt{standardaureo} layouts.
+% \end{valuelist}
+% Sometimes it is not desirable to have the crop marks on every page.
+% In such a case you can use the \cmd{crop}|[off]| command
+% after the first page of the document.
% \end{optionlist}
%
-% \subsection{Font}\label{sec:fonts}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Font}\label{sec:fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[10]{fontsize}{10, 10.1, 10.2...,11, 11.1, 11.2...}
-% Sets the main font sizes for the document, changing the \cmd{baselineskip} accordingly. It is based on the \sty{fontsize} package. Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default font size also with the option \opt{SizeFeatures} of \sty{fontspec}. For example:
+% \optitem[10\OR 10pt]{fontsize}{\meta{dimen}}
+% Sets the main font sizes for the document, changing the \cmd{baselineskip}
+% accordingly (possible values: 10\OR 11pt\OR 10.7\OR 1.2ex\dots). It is based on the \sty{fontsize} package \parencite{Valbusa:fontsize}.
+% Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default
+% font size also with the option \opt{SizeFeatures} of \sty{fontspec}.
+% For example:
+%
% \begin{latexcode}
-% \begin{verbatim}
-% \setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
-% \end{verbatim}
+%\begin{verbatim}
+%\setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
+%\end{verbatim}
% \end{latexcode}
%
-% \end{optionlist}
-% The first three options below are available only with \LaTeX.
-% Using \XeLaTeX{} or \LuaLaTeX{}
-% the default font is the Computer Modern but you can change it through
-% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family by Georg Duffner.
-%
-% \begin{optionlist}
-% \optitem[cochineal]{defaultfont}{\opt{none}, \opt{cochineal}, \opt{libertine}, \opt{palatino}, \opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
+% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
% \begin{valuelist}
% \item[none] Does not load any font. Use this option
-% if you want full control over the font selection.
+% if you want full control over the font selection. This is the default with
+% \XeLaTeX{} or \LuaLaTeX.
% \item[cochineal] Loads the Cochineal serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
% \item[libertine] Loads the Linux Libertine O serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
-% \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisa} option offers a very good solution.
+% \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisia} option offers a very good solution.
% ^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text.
% \item[standard] Loads the \sty{lmodern} package: Latin Modern font family and CB Greek.
% \end{valuelist}
-% \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
+% \optitem[none]{greekfont}{\opt{none}\OR\opt{artemisia}\OR\opt{porson}\OR\opt{bodoni}\OR\opt{cbgreek}}
% Actually useless with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
% \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
% \begin{valuelist}
-% \item[none] Does not load any Greek font.
+% \item[none] Does not load any Greek font. This is the default with
+% \XeLaTeX{} or \LuaLaTeX.
% \item[artemisia] Loads the Artemisia font by the Greek Font Society.
% \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font (\sty{suftesi} <v.2.4) has been written by Enrico
-% Gregorio. Claudio Beccari successively added the code to improve the
-% scale factor when using this greek font in combination with Palatino.}
+% Gregorio. Claudio Beccari successively added the code to improve the
+% scale factor when using this greek font in combination with Palatino.}
% \item[bodoni] Loads the Bodoni font by the Greek Font Society.
% \item[cbgreek] Loads the standard CB~Greek font by Claudio Beccari.
% \end{valuelist}
%
-% \optitem[minimal]{mathfont}{\opt{none},\opt{minimal},\opt{extended}}
+% \optitem[minimal]{mathfont}{\opt{none}\OR\opt{minimal}\OR\opt{extended}}
%
% Available only with Cochineal, Libertine and New PX fonts.
% \begin{valuelist}
-% \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+% \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}. This is the default with
+% \XeLaTeX{} or \LuaLaTeX.
% \item[minimal] Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
-% \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalfa} packages.
+% \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages.
% \end{valuelist}
% \end{optionlist}
%
% \begin{optionlist}
-% \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
+% \optitem[low]{smallcapsstyle}{\opt{low}\OR\opt{upper}}
% Active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
% With \XeLaTeX{} or \LuaLaTeX{} this option is effective only if a font selection command (such as \cmd{setmainfont}) is given.
% \begin{valuelist}
@@ -881,10 +1078,14 @@
% \end{valuelist}
% \end{optionlist}
%
-% \subsection{Titles}\label{sec:titles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Titles}\label{sec:titles}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[roman]{\meta{level}font}{\opt{roman}, \opt{italic},
+% \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
% \opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the \meta{level} title in roman.
@@ -894,8 +1095,8 @@
% \end{valuelist}
% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
% \opt{subsec}, \opt{subsubsec}.
-% \optitem[left]{\meta{level}style}{\opt{left}, \opt{center},
-% \opt{right}, \opt{parleft}, \opt{parcenter},
+% \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR
+% \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR
% \opt{parright}}
% \begin{valuelist}
% \item[left] Aligns the \meta{level} title on the left.
@@ -909,9 +1110,10 @@
% \item[parcenter] As \opt{center} but with the title below the number.
% \item[parright] As \opt{right} but with the title below the number.
% \end{valuelist}
-% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
-% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic},
-% \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman},
+% Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+% \opt{subsec}, \opt{subsubsec}.
+% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR
+% \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
% \opt{dotRoman}}
% \begin{valuelist}
% \item[arabic] Arabic \meta{level} number.
@@ -925,67 +1127,75 @@
% \opt{subsec}, \opt{subsubsec}.
% \end{optionlist}
%
-%
-% \subsection{Contents lists}\label{sec:toc}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Contents lists}\label{sec:toc}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted},
-% \opt{ragged}, \opt{leftpage}}
+% \optitem[standard]{tocstyle}{\opt{standard}\OR\opt{dotted}\OR
+% \opt{ragged}\OR\opt{leftpage}}
% \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
-% \begin{valuelist}
-% \item[standard] Prints a standard table of contents with
+% \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:1992}.
-% \item[leftpage] Prints a table of contents with page numbers
+% \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:1992}.
+% \item[leftpage] Prints a table of contents with page numbers
% on the left margin.
-% \end{valuelist}
-% \optitem[sec]{compacttoc}{\opt{sec}, \opt{subsec},
+% \end{valuelist}
+% \optitem[sec]{compacttoc}{\opt{sec}\OR\opt{subsec}\OR
% \opt{subsubsec}}
-% \begin{valuelist}
-% \item[sec] Prints the sections, subsections and sub-subsections in a single paragraph. Note that in this case the option \opt{tocstyle=dotted} in uneffective as the dots are not printed for chapter entries.
-% \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
-% \item[subsubsec] Prints the sub-subsections in a single paragraph.
-% \end{valuelist}
-% \optitem[roman]{toc\meta{level}font}{\opt{roman}, \opt{italic},
+% \begin{valuelist}
+% \item[sec] Prints the sections, subsections and sub-subsections
+% in a single paragraph. Note that in this case the option
+% \opt{tocstyle=dotted} is uneffective as the dots are not printed for chapter entries.
+% \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
+% \item[subsubsec] Prints the sub-subsections in a single paragraph.
+% \end{valuelist}
+% \optitem[roman]{toc\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
% \opt{smallcaps}}
-% \begin{valuelist}
+% \begin{valuelist}
% \item[roman] Prints the \meta{level} TOC entry in roman.
% \item[italic] Prints the \meta{level} TOC entry in \emph{italic}.
% \item[smallcaps] Prints the \meta{level} TOC entry
% in \textsc{\lsstyle spaced small caps}
-% \end{valuelist}
+% \end{valuelist}
% Where \meta{level} can be \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
-% \optitem[all]{twocolcontents}{\opt{toc}, \opt{lof},
-% \opt{lot}, \opt{toclof}, \opt{toclot}, \opt{loflot}, \opt{all}}
+% \optitem[all]{twocolcontents}{\opt{toc}\OR\opt{lof}\OR
+% \opt{lot}\OR\opt{toclof}\OR\opt{toclot}\OR\opt{loflot}\OR\opt{all}}
% This option activates the \opt{tocstyle=ragged} option
% and disables the other values of \opt{tocstyle}.
-% \begin{valuelist}
-% \item[toc] Prints the table of contents in two columns.
-% \item[lof] Prints the list of figures in two columns.
-% \item[lot] Prints the list of tables in two columns.
-% \item[toclof] Prints the table of contents
+% \begin{valuelist}
+% \item[toc] Prints the table of contents in two columns.
+% \item[lof] Prints the list of figures in two columns.
+% \item[lot] Prints the list of tables in two columns.
+% \item[toclof] Prints the table of contents
% and the list of figures in two columns.
-% \item[toclot] Prints the table of contents
+% \item[toclot] Prints the table of contents
% and the list of tables in two columns.
-% \item[loflot] Prints the list of figures
+% \item[loflot] Prints the list of figures
% and the list of tables in two columns.
-% \item[all] Prints all the contents lists in two columns.
-% \end{valuelist}
+% \item[all] Prints all the contents lists in two columns.
+% \end{valuelist}
% \end{optionlist}
%
-% \subsection{Headings}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Headings}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[inner]{headerstyle}{\opt{inner}, \opt{center},
-% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
+% \optitem[inner]{headerstyle}{\opt{inner}\OR\opt{center}\OR
+% \opt{plain}\OR\opt{authortitleinner}\OR\opt{authortitlecenter}}
% \begin{valuelist}
% \item[inner] Prints the chapter title and the string ``Chapter~
% \meta{n}'' in the inner side
-% respectively of even and odd
-% headers, and the page number in the outer side.
+% of even and odd
+% headers respectively, 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
@@ -998,8 +1208,7 @@
% \item[authortitlecenter]
% As the previous one but with centered headers and footers.
% \end{valuelist}
-% \optitem[roman]{headerfont}{\opt{roman}, \opt{italic},
-% \opt{smallcaps}}
+% \optitem[roman]{headerfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the headers in roman.
% \item[italic] Prints the headers in \emph{italic}.
@@ -1007,139 +1216,155 @@
% \end{valuelist}
% \end{optionlist}
%
-% \subsection{Notes, lists, quotations}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Notes, lists, quotations}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
+% \optitem[center]{quotestyle}{\opt{center}\OR\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}}
+% \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}\OR\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.
-% \end{valuelist}
-% \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung},
-% \opt{dotted}, \opt{superscript}}
+% \begin{valuelist}
+% \item[footnotesize]
+% Prints the block quotations in \cmd{footnotesize} size.
+% \item[small]
+% Prints the block quotations in \cmd{small} size.
+% \end{valuelist}
+% \optitem[bulged]{footnotestyle}{\opt{bulged}\OR\opt{hung}\OR
+% \opt{dotted}\OR\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}
+% \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}
+% \optitem[false]{fewfootnotes}{\opt{true}\OR\opt{false}}
% \changes{v0.9b}{2012/09/23}{New option \opt{fewfootnotes}}
% Uses symbols instead of numbers to mark footnotes.
% It is active only in documents with
% 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]
+% \optitem[bulged]{liststyle}{\opt{bulged}\OR\opt{aligned}\OR\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{sanserif}, \opt{italic}, \opt{smallcaps}}
+% \end{valuelist}
+% \optitem[standard]{captionstyle}{\opt{standard}\OR\opt{sanserif}\OR\opt{italic}\OR\opt{smallcaps}}
% All these values print the caption in small size, changing the shape:
-% \begin{valuelist}
-% \item[standard] Prints the caption text and label in normal font.
-% \item[sanserif] Prints the caption text and label in \textsf{sanserif}.
-% \item[italic] Prints the caption text and label in \emph{italic}.
-% \item[smallcaps] Prints only the caption label in \textsc{\lsstyle spaced small caps}.
-% \end{valuelist}
+% \begin{valuelist}
+% \item[standard]
+% Prints the caption text and label in normal font.
+% \item[sanserif]
+% Prints the caption text and label in \textsf{sanserif}.
+% \item[italic]
+% Prints the caption text and label in \emph{italic}.
+% \item[smallcaps]
+% Prints only the caption label in \textsc{\lsstyle spaced small caps}.
+% \end{valuelist}
% \end{optionlist}
%
-%
-% \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
-% \optitem[\cmd{baselineskip}]{parindent}{\opt{1em}, \opt{1cm}, \opt{17pt}, \ldots}
+% \optitem[\cmd{baselineskip}]{parindent}{\meta{dimen}}
% \changes{v0.9b}{2012/09/23}{New option \opt{parindent}}
-% \begin{valuelist}
-% Sets the indentation of the first line of each paragraph except those following a section title.
-% For backward compatibility you should use \opt{parindet=1em} or \opt{parindet=1.5} in place
-% of \opt{parindet=compact} and \opt{parindet=wide} respectively.
-% \end{valuelist}
-% \boolitem[true]{marginpar}
-% \begin{valuelist}
-% \item[true] Prints the marginal notes.
-% \item[false] Hide the marginal notes.
-% \end{valuelist}
-% \boolitem[false]{partpage}
+% \begin{valuelist}
+% Sets the indentation of the first line of each paragraph except those following a section title. You can use any unit recognized by \TeX{} (for example: \opt{1em}\OR\opt{1cm}\OR\opt{17pt}, \ldots).
+% \end{valuelist}
+% \optitem[true]{marginpar}{\opt{true}\OR\opt{false}}
+% \begin{valuelist}
+% \item[true] Prints the marginal notes.
+% \item[false] Hide the marginal notes.
+% \end{valuelist}
+% \optitem[false]{partpage}{\opt{true}\OR\opt{false}}
% \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
% Active only with \opt{structure=article}.
-% \begin{valuelist}
-% \item[true] Prints the part title in a separate page as in
-% \opt{structure=book}
-% \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
-% \end{valuelist}
-% \optitem[false]{draftdate}{\opt{true}, \opt{false}}
+% \begin{valuelist}
+% \item[true] Prints the part title in a separate page as in
+% \opt{structure=book}
+% \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
+% \end{valuelist}
+% \optitem[false]{draftdate}{\opt{true}\OR\opt{false}}
% \changes{v1.0}{2012/10/14}{First stable release. Renamed option \opt{bozza} to \opt{draftdate}}
% If \opt{true} it prints the string ``Version of \meta{date}'' in the footer.
% It requires the \cmd{date}\ar{\meta{date}} command.
% \end{optionlist}
%
-% \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% These pre-defined styles are intended as shotrcuts to some groups of
+% These pre-defined styles are intended as shortcuts to some groups of
% class options. Combining them
% with \opt{chapnumstyle} options
% you can get up to 120 variants.
%
% \begin{optionlist}
-% \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)},
+% \optitem[roman1]{style}{\opt{roman(1-6)}\OR\opt{italic(1-12)}\OR
% \opt{smallcaps(1-6)}}
-% \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).
-% \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{\lsstyle spaced small caps} in styles 7-12.
-% There are three position for the title and two positions for the number as above.
-% \item[smallcaps(1-12)]
-% The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}.
-% The title of the section is in \emph{italic} in styles 1-6 and in
-% \textsc{\lsstyle spaced small caps} in styles 7-12.
-% There are three position for the title and two positions for the chapter as above.
-% \end{valuelist}
+% \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).
+% \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{\lsstyle spaced small caps} in styles 7-12.
+% There are three position for the title and two positions for the number as above.
+% \item[smallcaps(1-12)]
+% The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}.
+% The title of sections is in \emph{italic} in styles 1-6 and in
+% \textsc{\lsstyle spaced small caps} in styles 7-12.
+% There are three position for the title and two positions for the chapter as above.
+% \end{valuelist}
% \end{optionlist}
%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{New commands}\label{sec:commands}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% \section{New commands}\label{sec:commands}
-%
-% \subsection{Printing the cover page}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Composing and printing the cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{ltxsyntax}
% \cmditem{makecover}
% \cmditem{makecover}[tikz options]
%
% Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz}
-% and the optional arguments accepts the same options of the \cmd{draw}
+% and the optional argument accepts the same options of the \cmd{draw}
% command of that package (see the examples below). Commands available:
%
% \cmditem{Cauthor}{text}
@@ -1178,20 +1403,24 @@
%
% \end{ltxsyntax}
%
-% \subsubsection*{Some examples of cover pages}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsubsection*{Some examples of cover pages}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% First you have to declare the informations you want to put in the cover page. It is better to give these informations in the preamble:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-%
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage{tikz}
+%
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
+%\end{verbatim}
% \end{latexcode}
%
% Then you can print the cover page with:
@@ -1205,41 +1434,45 @@
% \begin{ttquote}
% \cmd{makecover}\oar{\meta{tikz options}}
% \end{ttquote}
-
+%
% You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-% \usetikzlibrary{shadows}
+%\begin{verbatim}
+%\usepackage{tikz}
+%\usetikzlibrary{shadows}
%...
-% \begin{document}
-% \makecover[circular drop shadow]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[circular drop shadow]
+%\end{document}
+%\end{verbatim}
% \end{latexcode}
%
% There are thousands of possibilities. Here is another (not necessarily good) example:
% \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
+%\begin{verbatim}
+%\usepackage{tikz}
%
-% \Cpagecolor{gray!30}
-% \Ctextcolor{blue!50}
-% \Cfootcolor{black}
+%\Cpagecolor{gray!30}
+%\Ctextcolor{blue!50}
+%\Cfootcolor{black}
%
-% \begin{document}
-% \makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
+%\end{document}
+%\end{verbatim}
% \end{latexcode}
%
%
-% \subsection{Printing the colophon}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Printing the colophon}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{ltxsyntax}
%
-% \cmditem{colophon}[OS]{name and surname}{additional info}
+% \cmditem{colophon}[OS]{name and surname}{additional infos}
%
% This command is provided only for Italian documents. It prints a page with
% a copyright notice and the colophon in the bottom of the page. For different languages
@@ -1247,19 +1480,21 @@
%
% If you don't need the copyright notice, leave the second argument of
% the command empty:
+%
% \begin{ttquote}
-% \cmd{colophon\oarm{OS}\ar{}\arm{additional info}}
+% \cmd{colophon\oarm{OS}\ar{}\arm{additional infos}}
% \end{ttquote}
+%
% With the \opt{article} document structure, you can use the \cmd{artcolophon} command
% (see below)
% as well as the \cmd{thanks} command:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \author{Name Surname
-% \thanks{This work has been typeset with \LaTeX, using the
-% \textsf{suftesi} class by Ivan Valbusa}.}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{Name Surname
+% \thanks{This work has been typeset with \LaTeX, using the
+% \textsf{suftesi} class by Ivan Valbusa}.}
+%\end{verbatim}
% \end{latexcode}
%
% \cmditem{bookcolophon}{copyright notice}{attribution notice and
@@ -1271,14 +1506,14 @@
% The second one prints its content at the bottom. For example:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \bookcolophon{%
-% Copyright © 2007 by Ivan Valbusa}{%
-% This work has been typeset with \LaTeX, using the \textsf{suftesi}
-% class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is
-% Cochineal by Michael Sharpe and the sans serif font is Linux
-% Biolinum O by Philipp H. Poll.}
-% \end{verbatim}
+%\begin{verbatim}
+%\bookcolophon{%
+% Copyright © 2007 by Ivan Valbusa}{%
+% This work has been typeset with \LaTeX, using the \textsf{suftesi}
+% class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is
+% Cochineal by Michael Sharpe and the sans serif font is Linux
+% Biolinum O by Philipp H. Poll.}
+%\end{verbatim}
% \end{latexcode}
%
% \cmditem{artcolophon}{copyright notice, attribution and other informations}
@@ -1289,21 +1524,21 @@
% Here is an example:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \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}
-% 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]
-%
-% Typeset with \LaTeX, using the \textsf{suftesi}
-% class by Ivan Valbusa.}
-% \end{verbatim}
+%\begin{verbatim}
+%\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}
+% 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]
+%
+% Typeset with \LaTeX, using the \textsf{suftesi}
+% class by Ivan Valbusa.}
+%\end{verbatim}
% \end{latexcode}
%
% \cmditem{finalcolophon}{colophon content}
@@ -1314,7 +1549,11 @@
%
% \end{ltxsyntax}
%
-% \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{ltxsyntax}
% \cmditem{headbreak}
@@ -1322,91 +1561,99 @@
% A manual break which is active for the table of contents but not in the text or in the headers.
%
% \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \headbreak{}
-% inside the table of contents}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \headbreak{} inside the table of contents}
+%\end{verbatim}
% \end{latexcode}
% \cmditem{xheadbreak}
%
% A manual break which is active in the text but not in the headers and in the table of contents.
%
% \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \xheadbreak{}
-% inside the text}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \xheadbreak{} inside the text}
+%\end{verbatim}
% \end{latexcode}
% \end{ltxsyntax}
%
% \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% \subsection{Customizing titles}\label{sec:secfont}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Customizing titles}\label{sec:secfont}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
% \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section titles and numbers.}
%
% The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on.
%
% \begin{ltxsyntax}
-% \cmditem*{\meta{level}font}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}font}{definition}\hfill default:\texttt{empty}
%
-% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
+% Changes the font of the \meta{level} title, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
-% \end{verbatim}
+%\begin{verbatim}
+%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
+%\end{verbatim}
% \end{latexcode}
-% \cmditem*{\meta{level}numfont}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}numfont}{definition}\hfill default:\texttt{empty}
%
-% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
+% Changes the font of the \meta{level} number, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-% \color{gray}\arabic{chapter}\hskip-15cm}
-% \end{verbatim}
+%\begin{verbatim}
+%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
+% \color{gray}\arabic{chapter}\hskip-15cm}
+%\end{verbatim}
% \end{latexcode}
% Combining these commands you can get something like this (or something worse/better):
% \begin{latexcode}
-% \begin{verbatim}
-% \documentclass[pagelayout=periodicalaureo,11pt,
-% version=cscreen,chapstyle=parright]{suftesi}
+%\begin{verbatim}
+%\documentclass[pagelayout=periodicalaureo,11pt,
+%version=cscreen,chapstyle=parright]{suftesi}
%
-% \usepackage{xcolor,lipsum}
+%\usepackage{xcolor,lipsum}
%
-% \chapfont{\bfseries\sffamily\scshape\LARGE}
-% \secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
+%\chapfont{\bfseries\sffamily\scshape\LARGE}
+%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
%
-% \chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
-% \color{gray}\arabic{chapter}}\hskip-1cm}
-% \secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%\chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}\hskip-1cm}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
%
-% \begin{document}
+%\begin{document}
%
-% \chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
+%\chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
%
-% \section{Dolor sit amet}
-% \lipsum[1-2]
+%\section{Dolor sit amet}
+%\lipsum[1-2]
%
-% \section{Lorem ipsum dolor sit amet}
-% \subsection{Dolor sit amet}
-% \lipsum[1]
+%\section{Lorem ipsum dolor sit amet}
+%\subsection{Dolor sit amet}
+%\lipsum[1]
%
-% \end{document}
-% \end{verbatim}
+%\end{document}
+%\end{verbatim}
% \end{latexcode}
% \end{ltxsyntax}
%
-% \subsection{Miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{ltxsyntax}
% \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 given in the optional argument (default=*).
+% symbols given in the optional argument (default:\texttt{*}).
% It does not increment the footnote counter.
+%
% \begin{ttquote}
-% \cmd{xfootnote}\oar{\em\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
% \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
% \end{ttquote}
%
@@ -1425,14 +1672,12 @@
% Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \toclabelwidth{chap}{1em}
-% \end{verbatim}
+%\begin{verbatim}
+%\toclabelwidth{chap}{1em}
+%\end{verbatim}
% \end{latexcode}
% \end{ltxsyntax}
%
-%
-%
% \begin{ltxsyntax}
%
% \cmditem{chapterintro}
@@ -1440,83 +1685,90 @@
% Prints an unnumbered introduction at the beginning of the chapter,
% with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
%
-% \cmditem{chapterintroname}{name}\hfill(default=\texttt{Introduzione})
+% \cmditem{chapterintroname}{name}\hfill default:\texttt{Introduzione}
%
% Changes in \meta{name} the title printed by the \cmd{chapterintro} command.
%
% \cmditem{appendixpage}
%
-% Prints a page with the title provided by \cmd{appendixpagename} (default=\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
+% Prints a page with the title provided by \cmd{appendixpagename} (default:\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
% \begin{latexcode}
-% \begin{verbatim}
-% \renewcommand{\appendixpagename}{Appendices}
-% \end{verbatim}
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\end{verbatim}
% \end{latexcode}%
-% ^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
+% ^^A \cmditem{appendicesname}{name}\hfill default:\texttt{Appendici}
% ^^A
% ^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
%
% \end{ltxsyntax}
%
-%
-% \section{Collections}\label{sec:collection}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Collections}\label{sec:collection}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% The \opt{collection} document structure is thought to create a collection of papers. Each paper has to be typeset in a separate \file{.tex} file inside the \env{article} environment:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \begin{article}
-% \author{Author}
-% \title{Title of the paper}
-% % The abstract is optional.
-% % \begin{abstract}
-% % The abstract
-% % \end{abstract}
-%
-% \maketitle
-%
-% Text of the paper
-% \end{article}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{article}
+%\author{Author}
+%\title{Title of the paper}
+% % The abstract is optional.
+% % \begin{abstract}
+% % The abstract
+% % \end{abstract}
+%
+%\maketitle
+%
+% Text of the paper
+%\end{article}
+%\end{verbatim}
% \end{latexcode}
% If the names of the papers are \file{article1.tex}, \file{article2.tex}, \file{article3.tex}, etc., then a minimal main file should be similar to this:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \documentclass[structure=collection]{suftesi}
-%
-% \begin{document}
-% \input{article1}
-% \input{article2}
-% \input{article3}
-% \end{document}
-% \end{verbatim}
+%\begin{verbatim}
+%\documentclass[structure=collection]{suftesi}
+%
+%\begin{document}
+% \input{article1}
+% \input{article2}
+% \input{article3}
+%\end{document}
+%\end{verbatim}
% \end{latexcode}
%
-% \subsection{Options}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Options}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
-% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as ``Table of Contents'', ``Index'', ``Bibliography'', etc.
+% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as \emph{Table of Contents}, \emph{Index}, \emph{Bibliography}, etc.
%
% \begin{optionlist}
-% \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \opt{right}}
+% \optitem[left]{papertitlestyle}{\opt{left}\OR\opt{center}\OR\opt{right}}
% \begin{valuelist}
% \item[left] Aligns the author-title block on the left.
% \item[center] Centers the author-title block.
% \item[right] Aligns the author-title block on the right.
% \end{valuelist}
-% \optitem[false]{revauthortitle}{\opt{true}, \opt{false}}
+% \optitem[false]{revauthortitle}{\opt{true}\OR\opt{false}}
% \begin{valuelist}
% \item[true] Prints the author’s name below the title.
% \item[false] Prints the author’s name above the title.
% \end{valuelist}
-% \optitem[italic]{titlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[italic]{titlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the title of the articles in roman.
% \item[italic] Prints the title of the articles in \emph{italic}.
% \item[smallcaps] Prints the title of the articles
% in \textsc{\lsstyle spaced small caps}.
% \end{valuelist}
-% \optitem[roman]{authorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{authorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the author's name in roman.
% \item[italic] Prints the author's name in \emph{italic}.
@@ -1526,28 +1778,33 @@
% to protect the \cmd{thanks} command:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \author{The Author\protect\thanks{...}}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{The Author\protect\thanks{...}}
+%\end{verbatim}
% \end{latexcode}
-% \end{valuelist}
-% \optitem[italic]{toctitlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \end{valuelist}
+% \optitem[italic]{toctitlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the title TOC entry in roman.
% \item[italic] Prints the title TOC entry in \emph{italic}.
% \item[smallcaps] Prints the title TOC entry
% in \textsc{\lsstyle spaced small caps}.
% \end{valuelist}
-% \optitem[roman]{tocauthorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{tocauthorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
% \begin{valuelist}
% \item[roman] Prints the author’s name TOC entry in roman.
% \item[italic] Prints the author’s name TOC entry in \emph{italic}.
% \item[smallcaps] Prints the author’s name TOC entry
% in \textsc{\lsstyle spaced small caps}.
-% \end{valuelist}
+% \end{valuelist}
% \end{optionlist}
%
-% \subsection{Commands}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \subsection{Commands}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
% \begin{ltxsyntax}
%
% \cmditem{frontispiece}
@@ -1564,66 +1821,70 @@
%
% Sets the editor(s) of the collection.
%
-% \cmditem{titlefont}{definition}\hfill(default=\texttt{empty})
+% \cmditem{titlefont}{definition}\hfill default:\texttt{empty}
%
% \changes{v2.9.4}{2020/001/29}{New commands to change the font of the title of the articles and of the author's name in the collections}
%
-% \cmditem{authorfont}{definition}\hfill(default=\texttt{empty})
+% \cmditem{authorfont}{definition}\hfill default:\texttt{empty}
%
% Changes the font of the title of the articles and of the author's name. For example:
%
% \begin{latexcode}
-% \begin{verbatim}
-% \titlefont{\bfseries\sffamily\scshape}
-% \authorfont{\itshape\sffamily}
-% \end{verbatim}
+%\begin{verbatim}
+%\titlefont{\bfseries\sffamily\scshape}
+%\authorfont{\itshape\sffamily}
+%\end{verbatim}
% \end{latexcode}
% \end{ltxsyntax}
%
-% \section{Known issues}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Known issues}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% A problem occurs with the article document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
% \begin{latexcode}
-% \begin{verbatim}
-% \markboth{Section title}{Section title}
-% \part{The title of the part}
-% %
-% \section{Section title}
-% \end{verbatim}
+%\begin{verbatim}
+%\markboth{Section title}{Section title}
+%\part{The title of the part}
+%
+%\section{Section title}
+%\end{verbatim}
% \end{latexcode}
-% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterapge} command:
+% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterpage} command:
% \begin{latexcode}
-% \begin{verbatim}
-% \afterpage{
-% \markboth{Section title}{Section title}
-% \part{The title of the part}
-% }
-% %
+%\begin{verbatim}
+%\afterpage{
+% \markboth{Section title}{Section title}
+% \part{The title of the part}
+% }
+%
% \section{Section title}
-% \end{verbatim}
+%\end{verbatim}
% \end{latexcode}
%
-%
-%
-% \section{Backward compatibility}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section{Backward compatibility}
+% ^^A
+% ^^A ----------------------------------------------------------------
%
% \begin{optionlist}
% \optitem{defaultfont}{\opt{compatibility}}
-% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (i.e. Artemisia) add the \opt{greekfont=artemisia} option.
-% \optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
+% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (GFS Artemisia) add the \opt{greekfont=artemisia} option.
+% \optitem[book]{documentstructure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
% An alias for \opt{structure}
-% \boolitem[true]{crop}
-% \begin{valuelist}
-% \item[true] An alias for \opt{version=draft} option.
-% \item[false] An alias for \opt{version=center} option.
-% \end{valuelist}
-%
-%
-% \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
-% \end{optionlist}
+% \optitem[true]{crop}{\opt{true}\OR\opt{false}}
+% \begin{valuelist}
+% \item[true] An alias for \opt{version=draft} option.
+% \item[false] An alias for \opt{version=center} option.
+% \end{valuelist}
+% \optitem{parindent}{\opt{1em}, \opt{1.5em}}
+% An alias fo \opt{parindent=compact} and \opt{parindent=wide} respectively.
+% \optitem{style}{\opt{FSPLa}\OR\opt{FSPLb}\OR\opt{FSPLc}}
% These styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the Verona University (Italy).
-%
-%
+% \end{optionlist}
%
% \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
% \noindent The \cmd{FSPLcolophon}\ar{\meta{Name Surname}} command is provided to typeset the colophon according to these styles:
@@ -1646,10 +1907,9 @@
% \bigskip
%
% \noindent Typeset with \LaTeX{} in collaboration with the Joint Project
-% \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona,
+% \emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
% Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
-% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M. Nowacki.
-%
+% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M.~ Nowacki.
%
% \noindent\rule{\textwidth}{.4pt}
%
@@ -1808,7 +2068,11 @@
%
% \StopEventually{\PrintChanges\PrintIndex}
%
-% \section*{The Code}
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \section*{The Code}
+% ^^A
+% ^^A ----------------------------------------------------------------
% \addcontentsline{toc}{section}{The Code}
% \iffalse
%<*class>
@@ -2264,34 +2528,28 @@
\ifcase\nr\relax
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection*{Chapter number style}
% \begin{macrocode}
\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+ dotarabic,dotroman,dotRoman}[arabic]{%
+ \ifcase\nr\relax
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
@@ -2321,13 +2579,13 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{.}
\def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \fi}
% \end{macrocode}
% \subsubsection*{Section number style}
% \begin{macrocode}
\define@choicekey{}{secnumstyle}[\val\nr]
- {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ \ifcase\nr\relax
\def\SUF@thesection{\SUF@chapswitch\arabic{section}}
\def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
@@ -2357,67 +2615,67 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{.}
\def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+ \fi}
% \end{macrocode}
% \subsubsection*{Subsection number style}
% \begin{macrocode}
\define@choicekey{}{subsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
- \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
- \def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
- \or
- \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
- \def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
- \or
- \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
- \def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \or
- \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
- \def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
- \or
- \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
- \def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
- \or
- \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
- \def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+ \ifcase\nr\relax
+ \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+ \def\SUF@dotsubsec{}
+ \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+ \def\SUF@dotsubsec{.}
+ \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \fi}
% \end{macrocode}
% \subsubsection*{Sub-subsection number style}
% \begin{macrocode}
\define@choicekey{}{subsubsecnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
- \ifcase\nr\relax
- \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
- \def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
- \or
- \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
- \def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
- \or
- \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
- \def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \or
- \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
- \def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
- \or
- \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
- \def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
- \or
- \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
- \def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
- \fi}
+ \ifcase\nr\relax
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+ \def\SUF@dotsubsubsec{}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+ \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+ \def\SUF@dotsubsubsec{.}
+ \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \fi}
% \end{macrocode}
% This option controls the style of small capitals used in the
% title of chapters and sections using \opt{\meta{level}font=smallcaps} option:
@@ -2449,12 +2707,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
-\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
-\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecfont}[1]{%
+ \def\SUF@tocSUBSUBSEC@font{#1}}
+\newcommand{\tocpartnumfont}[1]{%
+ \def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{%
+ \def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{%
+ \def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{%
+ \def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{%
+ \def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
% \end{macrocode}
% \subsection*{Headers}
%
@@ -2620,29 +2884,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\suftesi@pagelefttoctrue
\fi}
\define@choicekey{}{compacttoc}[\val\nr]{%
- sec,subsec,subsubsec}[sec]{%
- \ifcase\nr\relax
- \suftesi@toccompactsectrue
- \suftesi@toccompactsubsectrue
- \suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\hskip.5em}
- \def\suf@ssscorrect{\hskip.5em}
+ sec,subsec,subsubsec}[sec]{%
+ \ifcase\nr\relax
+ \suftesi@toccompactsectrue
+ \suftesi@toccompactsubsectrue
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\hskip.5em}
+ \def\suf@ssscorrect{\hskip.5em}
\def\suf@ctocdotsec{.}
\def\suf@ctocdotssec{}
\def\suf@ctocdotsssec{}
- \or
- \suftesi@toccompactsubsectrue
- \suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\relax}
- \def\suf@ssscorrect{\hskip.5em}
+\or
+ \suftesi@toccompactsubsectrue
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\hskip.5em}
\def\suf@ctocdotssec{.}
\def\suf@ctocdotsssec{}
- \or
- \suftesi@toccompactsubsubsectrue
- \def\suf@sscorrect{\relax}
- \def\suf@ssscorrect{\relax}
+\or
+ \suftesi@toccompactsubsubsectrue
+ \def\suf@sscorrect{\relax}
+ \def\suf@ssscorrect{\relax}
\def\suf@ctocdotsssec{.}
- \fi}
+ \fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -3246,7 +3510,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\ifsuftesi@mathextended
\RequirePackage{amsthm}
\RequirePackage[bigdelims,vvarbb]{newpxmath}
- \RequirePackage[cal=boondoxo]{mathalfa}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
\ifsuftesi@mathminimal
\RequirePackage[bigdelims,vvarbb]{newpxmath}
@@ -3283,18 +3547,18 @@ quotesize,footnotestyle,liststyle,captionstyle}
\else
\ifsuftesi@libertine
\RequirePackage{textcomp}
- \RequirePackage[sb]{libertine}
- \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
- \ifsuftesi@mathextended
- \RequirePackage{amsthm}
- \RequirePackage{libertinust1math}
- \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalfa}
- \else
- \ifsuftesi@mathminimal
- \RequirePackage{libertinust1math}
- \else
- \fi
- \fi
+ \RequirePackage[sb]{libertine}
+ \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+ \ifsuftesi@mathextended
+ \RequirePackage{amsthm}
+ \RequirePackage{libertinust1math}
+ \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalpha}
+ \else
+ \ifsuftesi@mathminimal
+ \RequirePackage{libertinust1math}
+ \else
+ \fi
+ \fi
\useosf
\ifsuftesi@bodoni
\gdef\SUFfntscale{0.9}
@@ -3317,7 +3581,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\ifsuftesi@mathextended
\RequirePackage{amsthm}
\RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
- \RequirePackage[cal=boondoxo]{mathalfa}
+ \RequirePackage[cal=boondoxo]{mathalpha}
\else
\ifsuftesi@mathminimal
\RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
@@ -3475,84 +3739,84 @@ quotesize,footnotestyle,liststyle,captionstyle}
\def\SUF@default@SECTIONS{
\ifsuftesi@numparsec
% \titleformat{\section}[display]
-% {\SUF@sectionsize\SUF@lr@SECSwitch}
-% {\ifsuftesi@article\SUF@thesection
-% \else\thesection\fi\SUF@dotsec}
-% {0ex}
-% {\SUF@SEC@StyleSwitch}
+% {\SUF@sectionsize\SUF@lr@SECSwitch}
+% {\ifsuftesi@article\SUF@thesection
+% \else\thesection\fi\SUF@dotsec}
+% {0ex}
+% {\SUF@SEC@StyleSwitch}
\titleformat{\section}[display]
{\SUF@sectionsize\SUF@lr@SECSwitch}
{\SUF@thesection\SUF@dotsec}
{0ex}
{\SUF@SEC@StyleSwitch}
- \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
% \titleformat{\section}[hang]
-% {\SUF@sectionsize\SUF@lr@SECSwitch}
-% {\ifsuftesi@article\SUF@thesection
-% \else\thesection\fi\SUF@dotsec}
-% {1em}
-% {\SUF@SEC@StyleSwitch}
+% {\SUF@sectionsize\SUF@lr@SECSwitch}
+% {\ifsuftesi@article\SUF@thesection
+% \else\thesection\fi\SUF@dotsec}
+% {1em}
+% {\SUF@SEC@StyleSwitch}
\titleformat{\section}[hang]
{\SUF@sectionsize\SUF@lr@SECSwitch}
{\SUF@thesection\SUF@dotsec}
{1em}
{\SUF@SEC@StyleSwitch}
- \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
% \end{macrocode}
% \begin{macrocode}
\ifsuftesi@numparsubsec
% \titleformat{\subsection}[display]
-% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-% {\textnormal\thesubsection}
-% {0ex}
-% {\SUF@SUBSEC@StyleSwitch}
+% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+% {\textnormal\thesubsection}
+% {0ex}
+% {\SUF@SUBSEC@StyleSwitch}
\titleformat{\subsection}[display]
{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{0ex}
{\SUF@SUBSEC@StyleSwitch}
- \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
% \titleformat{\subsection}[hang]
-% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-% {\textnormal\thesubsection}
-% {1em}
-% {\SUF@SUBSEC@StyleSwitch}
+% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+% {\textnormal\thesubsection}
+% {1em}
+% {\SUF@SUBSEC@StyleSwitch}
\titleformat{\subsection}[hang]
{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{1em}
{\SUF@SUBSEC@StyleSwitch}
- \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
% \end{macrocode}
% \begin{macrocode}
\ifsuftesi@numparsubsubsec
% \titleformat{\subsubsection}[display]
-% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-% {\textnormal\thesubsubsection}
-% {0ex}
-% {\SUF@SUBSUBSEC@StyleSwitch}
+% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+% {\textnormal\thesubsubsection}
+% {0ex}
+% {\SUF@SUBSUBSEC@StyleSwitch}
\titleformat{\subsubsection}[display]
{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{0ex}
{\SUF@SUBSUBSEC@StyleSwitch}
- \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
+ \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
% \titleformat{\subsubsection}[hang]
-% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-% {\textnormal\thesubsubsection}
-% {1em}
-% {\SUF@SUBSUBSEC@StyleSwitch}
+% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+% {\textnormal\thesubsubsection}
+% {1em}
+% {\SUF@SUBSUBSEC@StyleSwitch}
\titleformat{\subsubsection}[hang]
{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{1em}
{\SUF@SUBSUBSEC@StyleSwitch}
- \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+ \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
}
\SUF@default@CHAPTER
@@ -3582,7 +3846,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else%standard/standardaureo
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -3601,16 +3865,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
using 'structure=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}
+ \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.
@@ -3681,7 +3945,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
% so we must redefine them according to the styles of \sty{suftesi},
% which does not use uppercase letters in the headings.
% \begin{macrocode}
-\ifsuftesi@article
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -3713,7 +3977,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\subsection{#1}}}%
{\relax}%
}%
-\else
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -4144,7 +4408,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\fi
\else
\newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
+ \global\@topnum\z@ % Prevents figures from going at top of page.
\@maketitle
\fi
\thispagestyle{plain}\@thanks%
@@ -4303,25 +4567,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
% \end{macrocode}
% \begin{macrocode}
\renewenvironment{theindex}
- {\if@twocolumn
- \@restonecolfalse
- \else
- \@restonecoltrue
- \fi
- \ifsuftesi@article
- \twocolumn[\section*{\indexname}]%
- \else
- \twocolumn[\@makeschapterhead{\indexname}]%
- \fi
- \@mkboth{\indexname}{\indexname}%
- \thispagestyle{plain}%
- \raggedright%
- \parindent\z@
- \parskip\z@ \@plus .3\p@\relax
- \columnseprule \z@
- \columnsep 35\p@
- \let\item\@idxitem}
- {\if@restonecol\onecolumn\else\clearpage\fi}
+ {\if@twocolumn
+ \@restonecolfalse
+ \else
+ \@restonecoltrue
+ \fi
+ \ifsuftesi@article
+ \twocolumn[\section*{\indexname}]%
+ \else
+ \twocolumn[\@makeschapterhead{\indexname}]%
+ \fi
+ \@mkboth{\indexname}{\indexname}%
+ \thispagestyle{plain}%
+ \raggedright%
+ \parindent\z@
+ \parskip\z@ \@plus .3\p@\relax
+ \columnseprule \z@
+ \columnsep 35\p@
+ \let\item\@idxitem}
+ {\if@restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
% \subsection*{Appendix}
% \begin{macrocode}
@@ -4338,7 +4602,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
Redefine the \noexpand\appendixpagename command instead.
See the 'appendix' package documentation.\MessageBreak
\noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
- {Command \noexpand\appendicesname undefined\MessageBreak
+ {Command \noexpand\appendicesname undefined\MessageBreak
Redefine the \noexpand\appendixpagename command instead.
See the 'appendix' package documentation.\MessageBreak
\noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
@@ -4347,8 +4611,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
% \newcommand{\appendixpage}{\SUF@appendixpage}
% \def\SUF@appendixpage{%
% \@mainmattertrue
-% \titlecontents{part}
-% [0em]
+% \titlecontents{part}
+% [0em]
% {\addvspace{3ex}}
% {}
% {}
@@ -4365,73 +4629,151 @@ quotesize,footnotestyle,liststyle,captionstyle}
% \vfil
% \endgroup
% \cleardoublepage
-% \titlecontents{part}
-% [0em]
-% {\addvspace{3ex}\partname~}
+% \titlecontents{part}
+% [0em]
+% {\addvspace{3ex}\partname~}
% {\makebox[\SUF@label@part][l]{%
% \thecontentslabel}\hspace*{1em}}
-% {}
+% {}
% {}
% [\addvspace{1ex}]
% }
\renewcommand{\@chap@pppage}{%
- \clear@ppage
- \thispagestyle{plain}%
- \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
- \null\vfil
- \markboth{}{}%
- {\centering
- \interlinepenalty \@M
- \normalfont
- \SUF@chaptersize
+ \clear@ppage
+ \thispagestyle{plain}%
+ \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+ \null\vfil
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \SUF@chaptersize
\SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
- \if@dotoc@pp
- \addappheadtotoc
- \fi
- \vfil\newpage
- \if@twoside
- \if@openright
- \null
- \thispagestyle{empty}%
- \newpage
- \fi
- \fi
- \if@tempswa
- \twocolumn
- \fi
+ \if@dotoc@pp
+ \addappheadtotoc
+ \fi
+ \vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi
}
\renewcommand{\@sec@pppage}{%
- \par
- \addvspace{4ex}%
- \@afterindentfalse
- {\parindent \z@ \raggedright
- \interlinepenalty \@M
- \normalfont
- \SUF@chaptersize
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \SUF@chaptersize
\SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
- \markboth{}{}\par}%
- \if@dotoc@pp
- \addappheadtotoc
- \fi
- \nobreak
- \vskip 3ex
- \@afterheading
+ \markboth{}{}\par}%
+ \if@dotoc@pp
+ \addappheadtotoc
+ \fi
+ \nobreak
+ \vskip 3ex
+ \@afterheading
+}
+% \end{macrocode}
+% Within the appendices the chapter and section labels are literal.
+% Using the \opt{chapnumstyle=Roman} or \opt{chapnumstyle=roman} options,
+% this label is passed as an argument to \cmd{@Roman} or \cmd{@roman},
+% which however accepts only integers. For this reason we must redefine
+% all the occurrences of \cmd{titlecontents} in order to have \cmd{thecontentslabel}
+% in place of \cmd{SUF@CHAP@thecontentslabel} or \cmd{SUF@SEC@thecontentslabel}.
+% \begin{macrocode}
+\def\suf@appendixtoc{%
+ \ifsuftesi@pagelefttoc
+ \titlecontents{chapter}
+ [\SUF@tochang@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}%
+ \hskip\SUF@addto@tochang@chap%
+ \makebox[\SUF@label@chap][l]{%
+ \thecontentslabel}\hspace*{1em}%
+ \SUF@tocCHAP@font}
+ {\hskip-\SUF@tochang@chap%
+ \makebox[1em][l]{\thecontentspage}%
+ \hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
+ {}
+ [\addvspace{1ex}]
+ \ifsuftesi@toccompactsec
+ \titlecontents*{section}[\SUF@tochang@chap]{}{%
+ \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \else
+ \titlecontents{section}
+ [\SUF@tochang@sec]
+ {}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+% \makebox[\SUF@label@sec][l]{%
+% \ifsuftesi@article\SUF@toclabelnum%
+% \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSEC@font}
+ {\hskip-\SUF@tochang@sec%
+ \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+ \SUF@tocSEC@font}
+ {}
+ \fi
+ \else
+ \titlecontents{chapter}
+ [\SUF@tocindent@chap]
+ {\addvspace{2ex}}
+ {\hskip-\SUF@tocindent@chap%
+ \makebox[\SUF@label@chap][l]{\thecontentslabel}%
+ \hspace*{1em}%
+ \SUF@tocCHAP@font}
+ {\hskip-\SUF@tocindent@chap%
+ \SUF@tocCHAP@font}
+ {\SUF@chaptitlerule\contentspage}
+ [\addvspace{1ex}]
+ \ifsuftesi@toccompactsec
+ \titlecontents*{section}[\SUF@tocindent@chap]{}{%
+ \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \else
+ \titlecontents{section}
+ [\SUF@tocindent@sec]
+ {}
+ {\hskip-\dimexpr(\SUF@label@sec+1em)%
+% \makebox[\SUF@label@sec][l]{%
+% \ifsuftesi@article\SUF@toclabelnum%
+% \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+ \SUF@tocSEC@font}
+ {\hskip-\dimexpr(\SUF@label@sec+1em)%
+ \SUF@tocSEC@font}
+ {\ifsuftesi@article\SUF@chaptitlerule%
+ \else\SUF@titlerule\fi\contentspage}
+ \fi
}
\ifsuftesi@article
- \renewcommand\appendix{\par
- \setcounter{section}{0}%
- \setcounter{subsection}{0}%
- \gdef\SUF@thesection{\@Alph\c@section}%
- \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
- \renewcommand{\thesection}{\@Alph\c@section}}
+\renewcommand\appendix{\par
+ \suf@appendixtoc%
+ \setcounter{section}{0}%
+ \setcounter{subsection}{0}%
+ \gdef\SUF@thesection{\@Alph\c@section}%
+ \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+ \renewcommand{\thesection}{\@Alph\c@section}}
\else
- \renewcommand\appendix{\par
- \setcounter{chapter}{0}%
- \setcounter{section}{0}%
- \gdef\@chapapp{\appendixname}%
- \gdef\SUF@thechapter{\@Alph\c@chapter}%
- \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
- \renewcommand{\thechapter}{\@Alph\c@chapter}}
+\renewcommand\appendix{\par
+ \suf@appendixtoc%
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \gdef\@chapapp{\appendixname}%
+ \gdef\SUF@thechapter{\@Alph\c@chapter}%
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
% \end{macrocode}
% \subsection*{Headings}
@@ -4449,11 +4791,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
% \begin{macrocode}
\renewcommand{\chaptermark}[1]{%
\markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
- \ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
- \else
- \renewcommand{\sectionmark}[1]{}
- \fi
+ \ifsuftesi@article
+ \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
+ \else
+ \renewcommand{\sectionmark}[1]{}
+ \fi
% \end{macrocode}
% \paragraph{The \opt{plain} style}
% \begin{macrocode}
@@ -4492,11 +4834,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
}%
%
\ifsuftesi@article
- \ifsuftesi@authortitle
- \def\SUF@LR@MarkSwitch{\SUF@leftmark}
- \else
- \def\SUF@LR@MarkSwitch{\SUF@rightmark}
- \fi
+ \ifsuftesi@authortitle
+ \def\SUF@LR@MarkSwitch{\SUF@leftmark}
+ \else
+ \def\SUF@LR@MarkSwitch{\SUF@rightmark}
+ \fi
\else
\def\SUF@LR@MarkSwitch{\SUF@leftmark}
\fi
@@ -4517,31 +4859,31 @@ quotesize,footnotestyle,liststyle,captionstyle}
% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
% \begin{macrocode}
\renewenvironment{quotation}
- {\list{}{\listparindent\parindent%
- \itemindent \listparindent
- \leftmargin \parindent
- \SUF@quote@style
- \parsep \z@ \@plus\p@}%
- \item\relax%
- \SUF@quotation@size%
- \noindent\ignorespaces}
- {\endlist}
+ {\list{}{\listparindent\parindent%
+ \itemindent \listparindent
+ \leftmargin \parindent
+ \SUF@quote@style
+ \parsep \z@ \@plus\p@}%
+ \item\relax%
+ \SUF@quotation@size%
+ \noindent\ignorespaces}
+ {\endlist}
\renewenvironment{quote}
- {\list{}{\leftmargin \parindent
- \SUF@quote@style}%
- \item\relax%
- \SUF@quotation@size}% \ignorespaces?
- {\endlist}
+ {\list{}{\leftmargin \parindent
+ \SUF@quote@style}%
+ \item\relax%
+ \SUF@quotation@size}% \ignorespaces?
+ {\endlist}
\renewenvironment{verse}
- {\let\\\@centercr
- \list{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
- \advance\leftmargin 1.5em}%
- \item\relax
- \SUF@quotation@size}
- {\endlist}
+ {\let\\\@centercr
+ \list{}{\itemsep \z@
+ \itemindent -1.5em%
+ \listparindent\itemindent
+ \rightmargin \leftmargin
+ \advance\leftmargin 1.5em}%
+ \item\relax
+ \SUF@quotation@size}
+ {\endlist}
% \end{macrocode}
% \paragraph{The \opt{fewfootnotes} option}
% Enable only with three footnotes per page maximum.
@@ -4573,7 +4915,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
\def\SUF@mpsetup{%
\itshape
\footnotesize%
- \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+ \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
\tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
\doublehyphendemerits=100000%
\finalhyphendemerits=\doublehyphendemerits}
@@ -4716,10 +5058,10 @@ visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
\null\vspace{\stretch{1}}
\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
-\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona,
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
-Janusz M. Nowacki.
+Janusz M.~Nowacki.
\endgroup
@@ -4739,7 +5081,7 @@ Janusz M. Nowacki.
% \end{macrocode}
% All the lengths depend on |\SUF@label@chap|
% so we define this first.
-% \begin{macrocode}
+% \begin{macrocode}z
\newlength\SUF@label@chap
\setlength\SUF@label@chap{.5em}
% \end{macrocode}
@@ -4890,8 +5232,8 @@ Janusz M. Nowacki.
[\addvspace{1ex}]
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
- \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
\else
\titlecontents{section}
[\SUF@tochang@sec]
@@ -4910,8 +5252,8 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsec
\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
- \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+ \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
@@ -4927,8 +5269,9 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsubsec
\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
- \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
@@ -5039,8 +5382,8 @@ Janusz M. Nowacki.
[\addvspace{1ex}]
\ifsuftesi@toccompactsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
- \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+ \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
\else
\titlecontents{section}
[\SUF@tocindent@sec]
@@ -5058,8 +5401,8 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsec
\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
- \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+ \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
@@ -5073,8 +5416,9 @@ Janusz M. Nowacki.
\fi
\ifsuftesi@toccompactsubsubsec
\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
- \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
- \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+ \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
+ \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
@@ -5122,16 +5466,16 @@ Janusz M. Nowacki.
\ifsuftesi@article
\renewcommand\tableofcontents{%
\vspace{2ex}%
- \section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \section*{\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}%
\thispagestyle{empty}
\ifsuftesi@twocolumntoc
\begin{multicols}{2}
- \@starttoc{toc}%
- \end{multicols}
- \else
- \@starttoc{toc}%
- \fi
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoffigures{%
@@ -5141,11 +5485,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlof
\begin{multicols}{2}
- \@starttoc{lof}%
- \end{multicols}
- \else
- \@starttoc{lof}%
- \fi
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\vspace{2ex}%
}
\renewcommand\listoftables{%
@@ -5155,11 +5499,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlot
\begin{multicols}{2}
- \@starttoc{lot}%
- \end{multicols}
- \else
- \@starttoc{lot}%
- \fi
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\vspace{2ex}%
}
\else
@@ -5179,11 +5523,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumntoc
\begin{multicols}{2}
- \@starttoc{toc}%
- \end{multicols}
- \else
- \@starttoc{toc}%
- \fi
+ \@starttoc{toc}%
+ \end{multicols}
+ \else
+ \@starttoc{toc}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoffigures{%
@@ -5198,11 +5542,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlof
\begin{multicols}{2}
- \@starttoc{lof}%
- \end{multicols}
- \else
- \@starttoc{lof}%
- \fi
+ \@starttoc{lof}%
+ \end{multicols}
+ \else
+ \@starttoc{lof}%
+ \fi
\if@restonecol\twocolumn\fi
}
\renewcommand\listoftables{%
@@ -5218,11 +5562,11 @@ Janusz M. Nowacki.
\thispagestyle{empty}
\ifsuftesi@twocolumnlot
\begin{multicols}{2}
- \@starttoc{lot}%
- \end{multicols}
- \else
- \@starttoc{lot}%
- \fi
+ \@starttoc{lot}%
+ \end{multicols}
+ \else
+ \@starttoc{lot}%
+ \fi
\if@restonecol\twocolumn\fi
}
\fi
@@ -5301,7 +5645,7 @@ Janusz M. Nowacki.
% \end{macrocode}
%
% \subsection*{Final settings}
-% Renew |\frontmatter| to have arabic page numbering:
+% Renew \cmd{frontmatter} to have arabic page numbering.
%
% \begin{macrocode}
\ifsuftesi@article
@@ -5350,7 +5694,8 @@ Janusz M. Nowacki.
\relax
\fi
% \end{macrocode}
-% Just one touch of french typography:
+% Now we switch off extra space after punctuation, in accordance with the habits
+% of European typography, especially the Italian one. The user can restore standard behavior with the \cmd{nonfrenchspacing} command.
% \begin{macrocode}
\frenchspacing
% \end{macrocode}
@@ -5358,7 +5703,6 @@ Janusz M. Nowacki.
%</class>
% \fi
%
-%
% \iffalse
%<*bib>
@book{Morison:1111,
@@ -5435,6 +5779,21 @@ Janusz M. Nowacki.
Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf},
Year = {2010}}
+@online{wilson-robertson:appendix,
+ Author = {Peter R. Wilson and Will Robertson},
+ Note = {Version 1.2c},
+ Title = {The \textsf{appendix} package},
+ Url = {http://mirrors.ctan.org/macros/latex/contrib/appendix/appendix.pdf},
+ Year = {2020}}
+
+@online{Valbusa:fontsize,
+ Author = {Ivan Valbusa},
+ Note = {Versione 0.1},
+ Title = {User's Guide to \textsf{fontsize}},
+ Subtitle = {A small package to change the font size},
+ Url = {http://mirrors.ctan.org/macros/latex/contrib/fontsize/fontsize.pdf},
+ Year = {2020}}
+
@online{Miede:2011,
Author = {André Miede},
Title = {A Classic Thesis style},
@@ -5471,27 +5830,23 @@ Janusz M. Nowacki.
Year = {2008}}
@article{valbusa:20122,
- Author = {Ivan Valbusa},
- Date = {2012},
- Date-Added = {2013-08-23 10:45:16 +0200},
- Date-Modified = {2013-08-23 10:48:03 +0200},
- Journaltitle = {\Ars},
- Month = {10},
- Number = {14},
- Pages = {15-30},
- Subtitle = {La classe suftesi},
- Title = {La forma del testo umanistico},
- url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
+ Author = {Ivan Valbusa},
+ Date = {2012},
+ Journaltitle = {\Ars},
+ Month = {10},
+ Number = {14},
+ Pages = {15-30},
+ Subtitle = {La classe suftesi},
+ Title = {La forma del testo umanistico},
+ url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
@book{munari:arte-come-mestiere,
- Author = {Bruno Munari},
- Booktitle = {Arte come mestiere},
- Date-Added = {2016-03-12 16:39:37 +0000},
- Date-Modified = {2016-03-12 16:40:07 +0000},
- Location = {Roma-Bari},
- Publisher = {Laterza},
- Title = {Arte come mestiere},
- Year = {1966}}
+ Author = {Bruno Munari},
+ Booktitle = {Arte come mestiere},
+ Location = {Roma-Bari},
+ Publisher = {Laterza},
+ Title = {Arte come mestiere},
+ Year = {1966}}
%</bib>
% \fi
%
diff --git a/macros/latex/contrib/suftesi/suftesi.pdf b/macros/latex/contrib/suftesi/suftesi.pdf
index 02e73f34ab..9cbbbd4580 100644
--- a/macros/latex/contrib/suftesi/suftesi.pdf
+++ b/macros/latex/contrib/suftesi/suftesi.pdf
Binary files differ