texlive[57515] Master/texmf-dist: suftesi (24jan21)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 24 23:30:35 CET 2021
Revision: 57515
http://tug.org/svn/texlive?view=revision&revision=57515
Author: karl
Date: 2021-01-24 23:30:34 +0100 (Sun, 24 Jan 2021)
Log Message:
-----------
suftesi (24jan21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/suftesi/README
trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/suftesi/README 2021-01-24 22:30:07 UTC (rev 57514)
+++ trunk/Master/texmf-dist/doc/latex/suftesi/README 2021-01-24 22:30:34 UTC (rev 57515)
@@ -56,5 +56,4 @@
where `$' stands for the shell's prompt.
-2012/08/28
Ivan Valbusa
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/suftesi/templates.zip
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2021-01-24 22:30:07 UTC (rev 57514)
+++ trunk/Master/texmf-dist/source/latex/suftesi/suftesi.dtx 2021-01-24 22:30:34 UTC (rev 57515)
@@ -56,7 +56,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
+ [2021/01/24 v3.0 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass[12pt]{ltxdoc}
@@ -64,6 +64,7 @@
\usepackage[utf8]{inputenc}
\usepackage[fontsize=12pt]{fontsize}
\usepackage[greek.ancient,english]{babel}
+\usepackage{afterpage}
%--------------------------------------------------------
% GRAPHICS
%--------------------------------------------------------
@@ -73,9 +74,9 @@
\definecolor{sufred}{rgb}{0.5,0,0}
\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\usepackage{tikz}
-\usetikzlibrary{shadows}
+ \usetikzlibrary{shadows,patterns}
\usepackage[framemethod=TikZ]{mdframed}
-\mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
+ \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
%--------------------------------------------------------
% DOC FACILITIES
%--------------------------------------------------------
@@ -109,9 +110,6 @@
\geometry{
a4paper,
margin=3cm,
- %paperwidth=128mm,
- %paperheight=96mm,
- %margin=1cm,
headheight=15pt,
ignoreall,
heightrounded}
@@ -202,6 +200,48 @@
{\fontfamily{#2}\fontsize{#4}{13}\selectfont%
\textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
% --------------------------------------------------------
+% LAYOUTS THUMBNAILS
+% --------------------------------------------------------
+\usepackage{xfp}
+\NewExpandableDocumentCommand{\getlength}{O{pt}mm}{%
+ % #1 (optional, default pt), #2 = length
+ \fpeval{round((#3)/(1#1),#2)}}
+\newlength{\expaperwidth}
+\newlength{\expaperheight}
+\newlength{\extextwidth}
+\newlength{\extextheight}
+\newlength{\exxshift}
+\newlength{\exyshift}
+\newlength{\exzshift}
+\def\sufsetlengthsA{%marginratio: 2/3
+ \setlength{\exxshift}{\dimexpr(0.666\expaperwidth-0.666\extextwidth)}
+ \setlength{\exyshift}{\dimexpr(0.666\expaperheight-0.666\extextheight)}
+ \setlength{\exzshift}{\dimexpr(2\expaperwidth-\extextwidth-\exxshift)}}
+\def\sufsetlengthsB{%marginratio: 1/1
+ \setlength{\exxshift}{\dimexpr(0.5\expaperwidth-0.5\extextwidth)}
+ \setlength{\exyshift}{\dimexpr(0.5\expaperheight-0.5\extextheight)}
+ \setlength{\exzshift}{\dimexpr(2\expaperwidth-\extextwidth-\exxshift)}}
+\def\sufsetlengthsC{%hmarginratio: 1/1; vmarginratio:2/3
+ \setlength{\exxshift}{\dimexpr(0.5\expaperwidth-0.5\extextwidth)}
+ \setlength{\exyshift}{\dimexpr(0.666\expaperheight-0.666\extextheight)}
+ \setlength{\exzshift}{\dimexpr(2\expaperwidth-\extextwidth-\exxshift)}}
+\newcommand{\sufpagesetup}[6]{%
+ \setlength{\extextwidth}{#3cm}%
+ \setlength{\extextheight}{#4cm}%
+ \setlength{\expaperwidth}{#5cm}%
+ \setlength{\expaperheight}{#6cm}%
+ \sufsetlengths%
+ \tikzset{body/.style ={yshift=\exyshift,draw=none,pattern={horizontal lines light gray}}}%
+ \tikzset{page/.style ={fill=gray!5!yellow!2,draw=gray!50}}%
+ \begin{tikzpicture}[scale=#1]
+ \draw[page] (0,0) rectangle (\expaperwidth,\expaperheight);
+ \draw[page,xshift=\expaperwidth] (0,0) rectangle (\expaperwidth,\expaperheight);
+ \draw[draw=gray!10,thick] (\expaperwidth,0) -- (\expaperwidth,\expaperheight);
+ \draw[xshift=\exxshift,body] (0,0) rectangle (\extextwidth,\extextheight);
+ \draw[xshift=\exzshift,body] (0,0) rectangle (\extextwidth,\extextheight);
+ \node at (\expaperwidth,-4) (caption) {\parbox{2.5cm}{\centering\footnotesize\texttt{#2}\par (\getlength[cm]{2}{\expaperwidth} $\times$ \getlength[cm]{2}{\expaperheight})\par}};
+ \end{tikzpicture}}
+% --------------------------------------------------------
% HYPERREF SETUP
% --------------------------------------------------------
\usepackage{hyperref}
@@ -230,7 +270,7 @@
%</driver>
% \fi
%
-% \CheckSum{5398}
+% \CheckSum{5348}
%
% \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
@@ -248,8 +288,9 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \changes{v2.9.11}{2020/12/21}{New page layouts: \opt{pocketa}, \opt{pocketb}, \opt{pocketc}. New commands \cmd{breakinbody}, \cmd{breakinbodyleft}, \cmd{breakintoc} (old names: \cmd{headbreak} and \cmd{xheadbreak}). Changed definitions of \cmd{appendixpagename}, \cmd{appendixtocname} and \cmd{appendixname} commands (default: english). The \cmd{part} command has been completely redefined. Updated documentation.}
-% \changes{v2.9.10}{2020/06/26}{Corrected a bug using the \env{otherlanguage} environment with \opt{greekfont} option. Updated documentation.}
+% \changes{v3.0}{2021/01/24}{Improved \sty{biblatex} support. Updated documentation.}
+% \changes{v2.9.9b (2.9.11)}{2020/12/21}{New page layouts: \opt{pocketa}, \opt{pocketb}, \opt{pocketc}. New commands \cmd{breakinbody}, \cmd{breakinbodyleft}, \cmd{breakintoc} (old names: \cmd{headbreak} and \cmd{xheadbreak}). Changed definitions of \cmd{appendixpagename}, \cmd{appendixtocname} and \cmd{appendixname} commands (default: english). The \cmd{part} command has been completely redefined. Updated documentation.}
+% \changes{v2.9.9a (2.9.10)}{2020/06/26}{Corrected a bug using the \env{otherlanguage} environment with \opt{greekfont} option. Updated documentation.}
% \changes{v2.9.9}{2020/05/21}{Removed a bug with \cmd{appendix} and roman chapter numbers in table of contents. Updated documentation.}
% \changes{v2.9.8}{2020/02/24}{Removed license restrictions. Updated documentation.}
% \changes{v2.9.7}{2020/02/22}{New option \opt{fontsize}. The \opt{parindent} options now accepts arbitrary values. Updated documentation.}
@@ -266,7 +307,7 @@
% \changes{v2.7}{2016/03/22}{New value \opt{cscreen} for \opt{version} option. Updated documentation. Removed value \opt{elements} for options:\opt{pagelayout}, \opt{headerstyle}, \opt{captionstyle}, \opt{chapstyle}, \opt{style}; \opt{sufelements} for option: \opt{style}. The \cmd{chapnumfont} command is no longer available.}
% \changes{v2.6}{2016/03/13}{New \opt{mathfont} option for non-standard fonts. New command \cmd{makecover} for printing the cover page. Updated documentation.}
% \changes{v2.5}{2016/03/02}{Corrected a bug when loading CB Greek fonts. Renamed option \opt{documentstructure} to \opt{structure}. Updated documentation.}
-% \changes{v2.4}{2016/02/27}{Changed the default font to Cochineal with Linux Biolinum O sans serif and Inconsolata monospaced. The Palatino is now loaded with \sty{newpxtext} and \sty{newpxmath}. Bera Mono and Iwona have been substituted by Linux Biolinum O and Inconsolata. New values for font options: \opt{cochineal}, \opt{libertine}, \opt{bodoni} (greek only). Value \opt{compatibility} for \opt{defaultfont} option to get the fonts of suftesi v2.3 or previous. Updated documentation.}
+% \changes{v2.4}{2016/02/27}{Changed the default font to Cochineal with Linux Biolinum sans serif and Inconsolata monospaced. The Palatino is now loaded with \sty{newpxtext} and \sty{newpxmath}. Bera Mono and Iwona have been substituted by Linux Biolinum and Inconsolata. New values for font options: \opt{cochineal}, \opt{libertine}, \opt{bodoni} (greek only). Value \opt{compatibility} for \opt{defaultfont} option to get the fonts of suftesi v2.3 or previous. Updated documentation.}
% \changes{v2.3}{2015/09/19}{Maintenance release.}
% \changes{v2.2}{2015/09/10}{Maintenance release.}
% \changes{v2.1}{2015/06/13}{New option \opt{toc\meta{level}font}. Updated documentation. Removed \cmd{includeart} command}
@@ -558,7 +599,8 @@
% 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.
+% \ref{sec:page-styles} for details. In figure \ref{fig:layouts} you can see
+% the thumbnails of the eleven page layouts provided by \sty{suftesi}.
%
% You can define your own layouts through the \cmd{geometry} command
% and you can change the value of \cmd{baselineskip} too. For example
@@ -565,9 +607,11 @@
% you can resize the typeblock of the \texttt{supercompactaureo} layout
% to fit particular needs, or simply because the font used requires
% a smaller line width. Remember that if you change the line spacing with
-% the \cmd{linespread} command, you need to add \cmd{normalsize}. As you can see
+% the \cmd{linespread} command, you need to add \cmd{normalsize}.
+% As you can see
% in the following example, you can change many aspects of the layout,
-% using the parameters available for the \cmd{geometry} command. Here we have
+% using the parameters available for the \cmd{geometry} command.
+% Here we have
% modified also the margin ratio, the value of the upper margin and the
% distance between the head and the beginning of the text. For the other parameters
% sees the documentation of the \sty{geometry} package \parencite{geometry}.
@@ -649,18 +693,33 @@
%\end{tabular}\\[-3ex]
%\caption{The layouts of \sty{suftesi}}\label{tab:layouts}
%\end{table}
-% ^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
+^^A 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.
%
-% ^^A\begin{figure}[h!]\centering
-% ^^A\noindent\begin{tikzpicture}[scale=0.3]
-% ^^A\draw (0,0) rectangle (17,24);
-% ^^A\draw[draw=none,fill=gray!50,xshift=3cm,yshift=2.6cm] (0,0) rectangle (12,19.4);
-% ^^A\draw[xshift=17cm] (0,0) rectangle ++(17,24);
-% ^^A\draw[xshift=17cm,draw=none,fill=gray!50,xshift=2cm,yshift=2.6cm] (0,0) rectangle ++(12,19.4);
-% ^^A\end{tikzpicture}
-% ^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
-% ^^A\end{figure}
+%\begin{figure}
+% \vspace*{-1cm}
+%\def\sufsetlengths{\sufsetlengthsA}
%
+%\centerline{\sufpagesetup{0.18}{standard}{11}{22}{21}{29.7}\hspace{3mm}
+%\sufpagesetup{0.18}{standardaureo}{13.6}{22}{21}{29.7}}\vspace{3mm}
+%
+%\centerline{\sufpagesetup{0.18}{periodical}{11}{16.5}{17}{24}\hspace{3mm}
+%\sufpagesetup{0.18}{supercompact}{10}{15}{14}{21}\hspace{3mm}
+%\sufpagesetup{0.18}{compact}{11}{16.5}{16}{24}}\vspace{3mm}
+%
+%\centerline{\sufpagesetup{0.18}{periodicalaureo}{12}{19.4}{17}{24}\hspace{3mm}
+%\def\sufsetlengths{\sufsetlengthsB}%
+%\sufpagesetup{0.18}{supercompactaureo}{10.8}{17.5}{14}{21}\hspace{3mm}
+%\def\sufsetlengths{\sufsetlengthsA}%
+%\sufpagesetup{0.18}{compactaureo}{11.8}{19.1}{16}{24}\hspace{3mm}}\vspace{3mm}
+%
+%\def\sufsetlengths{\sufsetlengthsC}
+%
+%\centerline{\sufpagesetup{0.18}{pocketa}{10.2}{15.3}{13.5}{20.8}\hspace{3mm}
+%\sufpagesetup{0.18}{pocketc}{9}{15}{11.6}{19.3}\hspace{3mm}
+%\sufpagesetup{0.18}{pocketb}{9.9}{16.5}{14}{21}}
+% \caption{The eleven layouts of \sty{suftesi}}\label{fig:layouts}
+%\end{figure}
+%
% ^^A ----------------------------------------------------------------
% ^^A
% \subsection{Fonts}
@@ -668,7 +727,7 @@
% ^^A ----------------------------------------------------------------
%
% The default roman font is Cochineal by Michael Sharpe,
-% the sans serif font is Linux Biolinum O, designed by Philipp H.
+% the sans serif font is Linux Biolinum, 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
@@ -678,7 +737,7 @@
% 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.
+% font to New PX (Palatino-like), Linux Libertine, 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).
@@ -685,7 +744,7 @@
%
% Today there are several Garamond-like fonts in \TeX~Live distribution.
% See, for example Garamond Libre and Cormorant Garamond.
-% The Bembo-like fonts Etbb and fbb should also be considered if you
+% 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.
%
@@ -705,7 +764,7 @@
% ^^A ----------------------------------------------------------------
%
% The class loads by default a ‘minimal’ mathematical support for Cochineal
-% (default), Linux Libertine O or New PX via the \sty{newtxmath} or
+% (default), Linux Libertine 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
@@ -821,7 +880,7 @@
%\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}}
+%\Cfoot{Punch Press\\ \fbox{\bfseries P\&P}}
%\Cpagecolor{white!90!black}
%\Ctextcolor{white}
%\Cfootcolor{black}
@@ -1066,10 +1125,6 @@
% If the unit is not declared it defaults to \texttt{pt}.
% If you want to set a specific value for \cmd{baselineskip}
% you have to use the \cmd{changefontsize}\oarm{baselineskip}\arm{fontsize} command.
-% Lastly Remember that using \hologo{XeLaTeX} or \hologo{LuaLaTeX}
-% you can change the default font size also with the option
-% \opt{SizeFeatures} of \sty{fontspec}.
-% For example |\setmainfont[SizeFeatures={Size=11.5}]{EB Garamond}|.
%
% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
@@ -1077,9 +1132,9 @@
% \item[none] Does not load any font. Use this option
% if you want full control over the font selection. This is the default with
% \hologo{XeLaTeX} or \hologo{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=artemisia} option offers a very good solution.
+% \item[cochineal] Loads the Cochineal serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
+% \item[libertine] Loads the Linux Libertine serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
+% \item[palatino] Loads the New PX serif, the Linux Biolinum 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}
@@ -1101,7 +1156,7 @@
% \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}. This is the default with
% \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
-% \item[minimal] Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
+% \item[minimal] Loads \sty{newtxmath} (for Cochineal and Linux Libertine) or \sty{newpxmath} (for PX Fonts).
% \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages.
% \end{valuelist}
% \end{optionlist}
@@ -1449,7 +1504,7 @@
%\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}}
+%\Cfoot{Punch Press\\ \includegraphics[width=1cm]{logo}}
%\end{verbatim}
% \end{latexcode}
%
@@ -1532,10 +1587,10 @@
%\begin{verbatim}
%\bookcolophon{%
% Copyright © 2007 by Ivan Valbusa}{%
-% This work has been typeset with \LaTeX, using the \textsf{suftesi}
+% 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.}
+% Biolinum by Philipp H. Poll.}
%\end{verbatim}
% \end{latexcode}
%
@@ -1559,7 +1614,7 @@
% Castro Street, Suite 900, Mountain View,
% California, 94041, USA.\\[1ex]
%
-% Typeset with \LaTeX, using the \textsf{suftesi}
+% Typeset with \LaTeX, using the \textsf{suftesi}
% class by Ivan Valbusa.}
%\end{verbatim}
% \end{latexcode}
@@ -1704,7 +1759,7 @@
% 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.
%
@@ -1713,7 +1768,7 @@
% Prints a page with the title provided by \cmd{appendixpagename} (default:\texttt{Appendices}) at the center according to the \opt{partfont} option.
% To redefine the \cmd{appendixpagename} command see the \sty{appendix} package documentation.
%
-% \cmditem*{tocpartname}{definition}\hfill default:\cmd{partname}
+% \cmditem*{tocpartname}{definition}\hfill default: \cmd{partname}
%
% Changes the definition of ``Part'' name in ToC. For example:
% \begin{latexcode}
@@ -2065,8 +2120,8 @@
% \subsubsection{Fonts}
% \paragraph{Roman fonts}
% \begin{macrocode}
-\define at choicekey{}{defaultfont}[\val\nr]{%
-none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\define at choicekey{}{defaultfont}[\val\nr]
+ {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
\ifcase\nr\relax
\suftesi at nofonttrue
\or
@@ -2080,8 +2135,8 @@
\or
\suftesi at compatibilitytrue
\fi}
-\define at choicekey{}{mathfont}[\val\nr]{%
-none,minimal,extended}[minimal]{%
+\define at choicekey{}{mathfont}[\val\nr]
+ {none,minimal,extended}[minimal]{%
\ifcase\nr\relax
\suftesi at mathminimalfalse
\suftesi at mathextendedfalse
@@ -2093,10 +2148,10 @@
% \end{macrocode}
% \paragraph{Greek fonts}
% \begin{macrocode}
-\define at choicekey{}{greekfont}[\val\nr]{%
-none,artemisia,porson,bodoni,cbgreek}[none]{%
+\define at choicekey{}{greekfont}[\val\nr]
+ {none,artemisia,porson,bodoni,cbgreek}[none]{%
\ifcase\nr\relax
-\suftesi at greekfontfalse
+ \suftesi at greekfontfalse
\or
\suftesi at greekfonttrue\suftesi at artemisiatrue
\or
@@ -2111,8 +2166,8 @@
% \begin{macrocode}
\RequirePackage{geometry}
\define at choicekey{}{pagelayout}[\val\nr]
- {standard,standardaureo,periodical,compact,compactaureo,supercompact,
- supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
+ {standard,standardaureo,periodical,periodicalaureo,compact,compactaureo,
+ supercompact,supercompactaureo,pocketa,pocketb,pocketc}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
@@ -2161,6 +2216,23 @@
marginparwidth= 26mm,
marginparsep= 10pt}
\or
+\suftesi at periodicalaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=true,
+ textwidth= 120mm,
+ textheight= 194mm,
+ paperwidth= 17cm,
+ paperheight= 24cm,
+ marginratio= 2:3,
+ marginparwidth= 62pt,
+ marginparsep= 10pt}
+\or
\suftesi at compacttrue
\DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
@@ -2228,23 +2300,6 @@
marginratio= 1:1,
marginparwidth= 11mm,
marginparsep= 7pt}
-\or
-\suftesi at periodicalaureotrue
- \DeclareRobustCommand{\SUF at partsize}{\large}
- \DeclareRobustCommand{\SUF at chaptersize}{\large}
- \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
- \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
- \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
- \geometry{
- heightrounded,
- includeheadfoot=true,
- textwidth= 120mm,
- textheight= 194mm,
- paperwidth= 17cm,
- paperheight= 24cm,
- marginratio= 2:3,
- marginparwidth= 62pt,
- marginparsep= 10pt}
\or% pocketa
\suftesi at supercompactaureotrue
\DeclareRobustCommand{\SUF at partsize}{\large}
@@ -2271,16 +2326,16 @@
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
\geometry{
- heightrounded,
- includeheadfoot=false,
- textheight= 165mm,
- textwidth= 99mm,
- paperwidth= 140mm,
- paperheight= 210mm,
- hmarginratio= 1:1,
- vmarginratio= 2:3,
- marginparwidth= 15mm,
- marginparsep= 7pt}
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 165mm,
+ textwidth= 99mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 15mm,
+ marginparsep= 7pt}
\or% pocketc
\suftesi at supercompactaureotrue
\DeclareRobustCommand{\SUF at partsize}{\large}
@@ -2303,8 +2358,8 @@
% \end{macrocode}
% \subsubsection{Sections style}
% \begin{macrocode}
-\define at choicekey{}{partstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{partstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@PARTSwitch{\filright}
\or
@@ -2321,8 +2376,8 @@
\def\SUF at lr@PARTSwitch{\filleft}
\suftesi at numparparttrue
\fi}
-\define at choicekey{}{chapstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{chapstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@CHAPSwitch{\filright}
\or
@@ -2339,8 +2394,8 @@
\def\SUF at lr@CHAPSwitch{\filleft}
\suftesi at numparchaptrue
\fi}
-\define at choicekey{}{secstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{secstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SECSwitch{\filright}
\or
@@ -2357,7 +2412,8 @@
\def\SUF at lr@SECSwitch{\filleft}
\suftesi at numparsectrue
\fi}
-\define at choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
+\define at choicekey{}{subsecstyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSECSwitch{\filright}
\or
@@ -2365,7 +2421,8 @@
\or
\def\SUF at lr@SUBSECSwitch{\filleft}
\fi}
-\define at choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
+\define at choicekey{}{subsubsecstyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSUBSECSwitch{\filright}
\or
@@ -2376,7 +2433,8 @@
% \end{macrocode}
% \subsubsection{Sections font}
% \begin{macrocode}
-\define at choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{partfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at PART@StyleSwitch{\relax}
\or
@@ -2384,7 +2442,8 @@
\or
\def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{chapfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at CHAP@StyleSwitch{\relax}
\or
@@ -2392,7 +2451,8 @@
\or
\def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{secfont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at SEC@StyleSwitch{\relax}
\or
@@ -2400,7 +2460,8 @@
\or
\def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{subsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at SUBSEC@StyleSwitch{\relax}
\or
@@ -2408,7 +2469,8 @@
\or
\def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{subsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at SUBSUBSEC@StyleSwitch{\relax}
\or
@@ -2420,7 +2482,7 @@
% \paragraph{Small capitals style}
% \begin{macrocode}
\define at choicekey{}{smallcapsstyle}[\val\nr]
-{low,upper}[low]{%
+ {low,upper}[low]{%
\ifcase\nr\relax
\def\suftesi at MakeTextLowercase{\MakeLowercase}
\def\suftesi at MakeTextTOCLowercase{\lowercase}
@@ -2433,7 +2495,7 @@
% \paragraph{Part number style}
% \begin{macrocode}
\define at choicekey{}{partnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
@@ -2456,8 +2518,8 @@
% \end{macrocode}
% \paragraph{Chapter number style}
% \begin{macrocode}
-\define at choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
+\define at choicekey{}{chapnumstyle}[\val\nr]
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
@@ -2493,7 +2555,7 @@
% \paragraph{Section number style}
% \begin{macrocode}
\define at choicekey{}{secnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
@@ -2529,7 +2591,7 @@
% \paragraph{Subsection number style}
% \begin{macrocode}
\define at choicekey{}{subsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
@@ -2559,7 +2621,7 @@
% \paragraph{Sub-subsection number style}
% \begin{macrocode}
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
@@ -2589,8 +2651,8 @@
% \subsubsection{Table of contents}
% \paragraph{Table of contents style}
% \begin{macrocode}
-\define at choicekey{}{tocstyle}[\val\nr]{%
-standard,dotted,ragged,leftpage}[standard]{%
+\define at choicekey{}{tocstyle}[\val\nr]
+ {standard,dotted,ragged,leftpage}[standard]{%
\ifcase\nr\relax
\def\SUF at titlerule{\titlerule*{}}
\def\SUF at chaptitlerule{\titlerule*{}}
@@ -2605,8 +2667,8 @@
\or
\suftesi at pagelefttoctrue
\fi}
-\define at choicekey{}{compacttoc}[\val\nr]{%
-sec,subsec,subsubsec}[sec]{%
+\define at choicekey{}{compacttoc}[\val\nr]
+ {sec,subsec,subsubsec}[sec]{%
\ifcase\nr\relax
\suftesi at toccompactsectrue
\suftesi at toccompactsubsectrue
@@ -2629,8 +2691,8 @@
\def\suf at ssscorrect{\relax}
\def\suf at ctocdotsssec{.}
\fi}
-\define at choicekey{}{twocolcontents}[\val\nr]{%
-toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\define at choicekey{}{twocolcontents}[\val\nr]
+ {toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
\suftesi at twocolumntoctrue
\setkeys{}{tocstyle=ragged}
@@ -2657,20 +2719,21 @@
\suftesi at twocolumnloftrue
\suftesi at twocolumnlottrue
\setkeys{}{tocstyle=ragged}
-\fi
-}
+\fi}
% \end{macrocode}
% \paragraph{Table of contents font}
% \begin{macrocode}
-\define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocpartfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
- \def\SUF at tocPART@font{\relax}
+ \def\SUF at tocPART@font{\relax}
\or
- \def\SUF at tocPART@font{\itshape}
+ \def\SUF at tocPART@font{\itshape}
\or
- \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
+ \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocchapfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocCHAP@font{\relax}
\or
@@ -2678,7 +2741,8 @@
\or
\def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{tocsecfont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at tocSEC@font{\relax}
\or
@@ -2686,7 +2750,8 @@
\or
\def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocSUBSEC@font{\relax}
\or
@@ -2694,7 +2759,8 @@
\or
\def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocsubsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocSUBSUBSEC@font{\relax}
\or
@@ -2702,7 +2768,8 @@
\or
\def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocauthorfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocAUT@font{\relax}
\or
@@ -2710,7 +2777,8 @@
\or
\def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{toctitlefont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at tocTIT@font{\relax}
\or
@@ -2723,8 +2791,7 @@
% \paragraph{Header style}
% \begin{macrocode}
\define at choicekey{}{headerstyle}[\val\nr]
- {inner,center,plain,authortitleinner,
- authortitlecenter}[inner]{%
+ {inner,center,plain,authortitleinner,authortitlecenter}[inner]{%
\ifcase\nr\relax
\def\SUF at rightmark{\SUF at Rheadstyle{\rightmark}}
\def\SUF at leftmark{\SUF at Lheadstyle{\SUF at leftrightmark}}
@@ -2776,7 +2843,8 @@
\setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
\setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
\setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=0pt} \setlist[itemize,2]{leftmargin=1.3\parindent}
+ \setlist[itemize,1]{leftmargin=0pt}
+ \setlist[itemize,2]{leftmargin=1.3\parindent}
\setlist[itemize,3]{leftmargin=1.3\parindent}
\or
\setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
@@ -2816,15 +2884,15 @@
\define at choicekey{}{footnotestyle}[\val\nr]
{bulged,hung,dotted,superscript}[bulged]{%
\ifcase\nr\relax
- \renewcommand\@makefntext{%
- \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+ \renewcommand\@makefntext{%
+ \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
\or
- \renewcommand\@makefntext{%
- \leftskip=1em\hskip-1.5em%
- \makebox[1em][r]{\@thefnmark}\hskip.5em}
+ \renewcommand\@makefntext{%
+ \leftskip=1em\hskip-1.5em%
+ \makebox[1em][r]{\@thefnmark}\hskip.5em}
\or
- \renewcommand\@makefntext{%
- \@thefnmark.\hskip.5em}
+ \renewcommand\@makefntext{%
+ \@thefnmark.\hskip.5em}
\or
\renewcommand\@makefntext{%
\textsuperscript{\@thefnmark}\hskip.3em}
@@ -2845,13 +2913,12 @@
{standard,sanserif,italic,smallcaps}[standard]{%
\ifcase\nr\relax
\or
- \captionsetup{font+=sf}
+ \captionsetup{font+=sf}
\or
- \captionsetup{font+=it}
+ \captionsetup{font+=it}
\or
- \captionsetup{labelfont=sc}
-\fi
-}
+ \captionsetup{labelfont=sc}
+\fi}
% \end{macrocode}
% \paragraph{Marginal notes}
% \begin{macrocode}
@@ -2865,7 +2932,8 @@
% \subsubsection{Other options}
% \paragraph{Part page}
% \begin{macrocode}
-\define at choicekey{}{partpage}[\val\nr]{true,false}[true]{%
+\define at choicekey{}{partpage}[\val\nr]
+ {true,false}[true]{%
\ifcase\nr\relax
\suftesi at partpagetrue
\or
@@ -2898,9 +2966,9 @@
\fi}
\define at choicekey{}{crop}[\val\nr]
{true,false}[true]{%
-\ClassWarningNoLine{suftesi}{%
- 'crop' option is deprecated.\MessageBreak
- Use 'version' option instead}
+ \ClassWarningNoLine{suftesi}{%
+ 'crop' option is deprecated.\MessageBreak
+ Use 'version' option instead}
\ifcase\nr\relax
\setkeys{}{version=draft}
\or
@@ -3111,62 +3179,59 @@
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=roman5,
- chapnumstyle=roman,
- headerstyle=inner,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=roman5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+ secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+ quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=italic5,
- chapnumstyle=roman,
- headerstyle=inner,
- headerfont=italic,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=italic5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ headerfont=italic,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=smallcaps5,
- chapnumstyle=roman,
- headerstyle=inner,
- headerfont=smallcaps,
- secfont=smallcaps,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=smallcaps5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ headerfont=smallcaps,
+ secfont=smallcaps,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+ secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+ quotesize,footnotestyle,liststyle,captionstyle}
\fi}
% \end{macrocode}
% \paragraph{Options for the \opt{collection} document structure}
% \begin{macrocode}
-\define at choicekey{}{papertitlestyle}[\val\nr]{%
- left,center,right}[left]{%
+\define at choicekey{}{papertitlestyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@coll at titleSwitch{\filright}
\or
@@ -3181,7 +3246,8 @@
\or
\relax
\fi}
-\define at choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{titlefont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at titlefont@Switch{\relax}
\or
@@ -3189,7 +3255,8 @@
\or
\def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{authorfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at authorfont@Switch{\relax}
\or
@@ -3285,10 +3352,10 @@
\definecolor{sufred}{rgb}{0.5,0,0}
\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
- \ifLuaTeX
- \RequirePackage{luatex85}
- \else
- \fi
+\ifLuaTeX
+ \RequirePackage{luatex85}
+ \else
+\fi
% \end{macrocode}
% The FSPL style requires a verbose colophon which uses specific icons:
% \begin{macrocode}
@@ -3304,8 +3371,8 @@
\ifsuftesi at screencentered
\geometry{hmarginratio=1:1}
\fi
-\else
- \RequirePackage[a4,cam,center]{crop}
+ \else
+ \RequirePackage[a4,cam,center]{crop}
\fi
% \end{macrocode}
% \subsection{Fonts}
@@ -3329,9 +3396,8 @@
* load either 'fontspec' or 'mathspec'\MessageBreak
* For using suftesi with LuaLaTeX\MessageBreak
* load 'fontspec' \MessageBreak
- ************************************}}
- }
-\else% if pdftex
+ ************************************}}}
+\else
\RequirePackage[LGR,T1]{fontenc}
\RequirePackage{substitutefont}
\AtBeginDocument{\fontencoding{T1}\selectfont}
@@ -3342,11 +3408,11 @@
% A warning appears if the \opt{cbgreek} option is unused.
% \begin{macrocode}
\ifsuftesi at nofont
- \ifsuftesi at greekfont
- \ClassWarningNoLine{suftesi}{%
- Unused 'greekfont' option}%
- \suftesi at greekfontfalse
- \else\suftesi at greekfontfalse\fi
+\ifsuftesi at greekfont
+ \ClassWarningNoLine{suftesi}{%
+ Unused 'greekfont' option}%
+ \suftesi at greekfontfalse
+ \else\suftesi at greekfontfalse\fi
\else
\ifsuftesi at standard
\RequirePackage{lmodern}
@@ -3526,8 +3592,7 @@
\DeclareRobustCommand{\greektext}{%
\usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
\def\encodingdefault{LGR}}
- \DeclareTextFontCommand{\textgreek}{\greektext}
-}
+ \DeclareTextFontCommand{\textgreek}{\greektext}}
\ifsuftesi at cbgreek
\else
% \end{macrocode}
@@ -3585,9 +3650,9 @@
% \subsection{Section titles}
% \begin{macrocode}
\RequirePackage[newparttoc]{titlesec}
- \newlength{\sectionsep}
- \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\unless\ifPDFTeX% if xetex or luatex
+ \newlength{\sectionsep}
+ \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
+\unless\ifPDFTeX
\DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextTOCLowercase{#1}}
\DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
@@ -3594,7 +3659,7 @@
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
\DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
-\else% if pdftex
+\else
\DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
\scshape\suftesi at MakeTextTOCLowercase{\textls*{#1}}}%
\DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
@@ -3627,80 +3692,48 @@
\fi}
\def\SUF at default@SECTIONS{
\ifsuftesi at numparsec
-% \titleformat{\section}[display]
-% {\SUF at sectionsize\SUF at lr@SECSwitch}
-% {\ifsuftesi at article\SUF at thesection
-% \else\thesection\fi\SUF at dotsec}
-% {0ex}
-% {\SUF at SEC@StyleSwitch}
-\titleformat{\section}[display]
-{\SUF at sectionsize\SUF at lr@SECSwitch}
-{\SUF at thesection\SUF at dotsec}
-{0ex}
-{\SUF at SEC@StyleSwitch}
+ \titleformat{\section}[display]
+ {\SUF at sectionsize\SUF at lr@SECSwitch}
+ {\SUF at thesection\SUF at dotsec}
+ {0ex}
+ {\SUF at SEC@StyleSwitch}
\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-% \titleformat{\section}[hang]
-% {\SUF at sectionsize\SUF at lr@SECSwitch}
-% {\ifsuftesi at article\SUF at thesection
-% \else\thesection\fi\SUF at dotsec}
-% {1em}
-% {\SUF at SEC@StyleSwitch}
-\titleformat{\section}[hang]
-{\SUF at sectionsize\SUF at lr@SECSwitch}
-{\SUF at thesection\SUF at dotsec}
-{1em}
-{\SUF at SEC@StyleSwitch}
+ \titleformat{\section}[hang]
+ {\SUF at sectionsize\SUF at lr@SECSwitch}
+ {\SUF at thesection\SUF at dotsec}
+ {1em}
+ {\SUF at SEC@StyleSwitch}
\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi at numparsubsec
-% \titleformat{\subsection}[display]
-% {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-% {\textnormal\thesubsection}
-% {0ex}
-% {\SUF at SUBSEC@StyleSwitch}
-\titleformat{\subsection}[display]
-{\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-{\textnormal\SUF at thesubsection\SUF at dotsubsec}
-{0ex}
-{\SUF at SUBSEC@StyleSwitch}
+ \titleformat{\subsection}[display]
+ {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+ {\textnormal\SUF at thesubsection\SUF at dotsubsec}
+ {0ex}
+ {\SUF at SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-% \titleformat{\subsection}[hang]
-% {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-% {\textnormal\thesubsection}
-% {1em}
-% {\SUF at SUBSEC@StyleSwitch}
-\titleformat{\subsection}[hang]
-{\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-{\textnormal\SUF at thesubsection\SUF at dotsubsec}
-{1em}
-{\SUF at SUBSEC@StyleSwitch}
+ \titleformat{\subsection}[hang]
+ {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+ {\textnormal\SUF at thesubsection\SUF at dotsubsec}
+ {1em}
+ {\SUF at SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi at numparsubsubsec
-% \titleformat{\subsubsection}[display]
-% {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-% {\textnormal\thesubsubsection}
-% {0ex}
-% {\SUF at SUBSUBSEC@StyleSwitch}
-\titleformat{\subsubsection}[display]
-{\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-{\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
-{0ex}
-{\SUF at SUBSUBSEC@StyleSwitch}
+ \titleformat{\subsubsection}[display]
+ {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+ {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
+ {0ex}
+ {\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-% \titleformat{\subsubsection}[hang]
-% {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-% {\textnormal\thesubsubsection}
-% {1em}
-% {\SUF at SUBSUBSEC@StyleSwitch}
-\titleformat{\subsubsection}[hang]
-{\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-{\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
-{1em}
-{\SUF at SUBSUBSEC@StyleSwitch}
+ \titleformat{\subsubsection}[hang]
+ {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+ {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
+ {1em}
+ {\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi}
\SUF at default@CHAPTER
@@ -3746,103 +3779,103 @@
% \begin{macrocode}
\ifsuftesi at article
\def\chapter#1{\ClassError{suftesi}
- {\noexpand\chapter level is undefined
- using 'structure=article'}
- {\noexpand\chapter level is undefined
- using 'structure=article'}}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}}
\setcounter{tocdepth}{3}
\setcounter{secnumdepth}{3}
\renewcommand\thesection{%
- \@arabic\c at section}
+ \@arabic\c at section}
\renewcommand\thesubsection{%
- \thesection.\@arabic\c at subsection}
+ \thesection.\@arabic\c at subsection}
\renewcommand\thesubsubsection{%
- \thesubsection.\@arabic\c at subsubsection}
+ \thesubsection.\@arabic\c at subsubsection}
\renewcommand\theparagraph{%
- \thesubsubsection.\@arabic\c at paragraph}
+ \thesubsubsection.\@arabic\c at paragraph}
\renewcommand\thesubparagraph{%
- \theparagraph.\@arabic\c at subparagraph}
+ \theparagraph.\@arabic\c at subparagraph}
% \end{macrocode}
% \subsection*{The \cmd{part} command}
% \begin{macrocode}
\renewcommand\part{%
- \ifsuftesi at partpage
- \if at openright
- \cleardoublepage
- \else
- \clearpage
- \fi
- \thispagestyle{plain}%
- \fi
- \if at twocolumn
- \onecolumn
- \@tempswatrue
- \else
- \@tempswafalse
- \fi
- \ifsuftesi at partpage
- \null\vfil
- \fi
- \secdef\@part\@spart}
+ \ifsuftesi at partpage
+ \if at openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \fi
+ \if at twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \ifsuftesi at partpage
+ \null\vfil
+ \fi
+ \secdef\@part\@spart}
\fi
\def\@part[#1]#2{%
- \ifnum \c at secnumdepth >-2\relax
- \refstepcounter{part}%
- \addcontentsline{toc}{part}{\normalfont\normalsize
- \SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
- \SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
- \else
- \addcontentsline{toc}{part}{\normalfont\normalsize
- \SUF at tocPART@font#1}%
- \fi
- \markboth{}{}%
- {\SUF at lr@PARTSwitch\SUF at partsize
- \interlinepenalty \@M
- \ifnum \c at secnumdepth >-2\relax
- \noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
- \ifsuftesi at numparpart
- \par
- \vskip2ex
- \else
- \hspace{1em}
- \fi
- \noindent\SUF at PART@StyleSwitch#2\par}%
- \@endpart}
+ \ifnum \c at secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
+ \SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
+ \else
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocPART@font#1}%
+ \fi
+ \markboth{}{}%
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \ifnum \c at secnumdepth >-2\relax
+ \noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
+ \ifsuftesi at numparpart
+ \par
+ \vskip2ex
+ \else
+ \hspace{1em}
+ \fi
+ \noindent\SUF at PART@StyleSwitch#2\par}%
+ \@endpart}
\def\@spart#1{%
- {\SUF at lr@PARTSwitch\SUF at partsize
- \interlinepenalty \@M
- \noindent\SUF at PART@StyleSwitch#1\par}%
- \@endpart}
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \noindent\SUF at PART@StyleSwitch#1\par}%
+ \@endpart}
\ifsuftesi at article
\def\@endpart{%
- \ifsuftesi at partpage
- \vfil\newpage
- \if at twoside
- \if at openright
- \null
- \thispagestyle{empty}%
- \newpage
- \fi
- \fi
- \fi
- \if at tempswa
- \twocolumn
- \fi}
+ \ifsuftesi at partpage
+ \vfil\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\else
\def\@endpart{\vfil\newpage
- \if at twoside
- \if at openright
- \null
- \thispagestyle{empty}%
- \newpage
- \fi
- \fi
- \if at tempswa
- \twocolumn
- \fi}
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\fi
% \end{macrocode}
% Other sublevels:
@@ -3871,63 +3904,61 @@
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
- \section*{#1}%
- \@mkboth{#1}{#1}}
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblist}[\biblistname]{%
- \section*{#1}%
- \@mkboth{#1}{#1}}
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \@mkboth{#1}{#1}}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblistintoc}[\biblistname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \@mkboth{#1}{#1}}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
- \section{#1}}
+ \section{#1}}
\defbibheading{biblistnumbered}[\biblistname]{%
- \section{#1}}
+ \section{#1}}
\defbibheading{subbibliography}[\refname]{%
- \subsection*{#1}}
+ \subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
- \subsection*{#1}%
- \addcontentsline{toc}{subsection}{#1}}
+ \subsection*{#1}%
+ \addcontentsline{toc}{subsection}{#1}}
\defbibheading{subbibnumbered}[\refname]{%
- \subsection{#1}}
-}%
+ \subsection{#1}}}
{\relax}}
\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
- \chapter*{#1}%
- \@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblist}[\biblistname]{%
- \chapter*{#1}%
- \@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\bibname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblistintoc}[\biblistname]{%
- \chapter*{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
- \chapter{#1}}
+ \chapter{#1}}
\defbibheading{biblistnumbered}[\biblistname]{%
- \chapter{#1}}
+ \chapter{#1}}
\defbibheading{subbibliography}[\refname]{%
- \section*{#1}%
- \if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
- \section*{#1}%
- \addcontentsline{toc}{section}{#1}%
- \if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibnumbered}[\refname]{%
- \section{#1}}
-}%
+ \section{#1}}}
{\relax}}
\fi
% \end{macrocode}
@@ -4138,7 +4169,7 @@
\global\let\@date\@empty
\global\let\date\relax
\global\let\and\relax}
- \def\@maketitle{%
+\def\@maketitle{%
\newpage
\null
\vskip 2em%
@@ -4378,15 +4409,15 @@
% {\label{end:\thearticle}\endgroup
% }
\newenvironment{article}
- {\begingroup
- \setcounter{section}{0}
- \setcounter{footnote}{0}
- \setcounter{figure}{0}
- \setcounter{table}{0}}
- {\label{end:\thearticle}
- \cleardoublepage
- \global\let\@thanks\@empty
- \endgroup}
+ {\begingroup
+ \setcounter{section}{0}
+ \setcounter{footnote}{0}
+ \setcounter{figure}{0}
+ \setcounter{table}{0}}
+ {\label{end:\thearticle}
+ \cleardoublepage
+ \global\let\@thanks\@empty
+ \endgroup}
\newcommand{\frontispiece}{%
\thispagestyle{empty}%
\begingroup
@@ -4399,7 +4430,7 @@
\@collectioneditor
\vspace*{\stretch{3}}
- \endgroup
+ \endgroup
\clearpage}
% \end{macrocode}
% In the collection document structure the articles are treated as
@@ -4537,8 +4568,7 @@
\fi
\if at tempswa
\twocolumn
- \fi
-}
+ \fi}
\renewcommand{\@sec at pppage}{%
\par
\addvspace{4ex}%
@@ -4554,8 +4584,7 @@
\fi
\nobreak
\vskip 3ex
- \@afterheading
-}
+ \@afterheading}
% \end{macrocode}
% Within the appendices the chapter and section labels are literal.
% Using the \opt{chapnumstyle=Roman} or \opt{chapnumstyle=roman} options,
@@ -4630,8 +4659,7 @@
\SUF at tocSEC@font}
{\ifsuftesi at article\SUF at chaptitlerule%
\else\SUF at titlerule\fi\contentspage}
- \fi
-}
+ \fi}
\ifsuftesi at article
\renewcommand\appendix{\par
\suf at appendixtoc%
@@ -4693,8 +4721,7 @@
\fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
\fancyhead[CE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
- \fancyfoot[C]{\footnotesize\SUF at thepage}%
- }%
+ \fancyfoot[C]{\footnotesize\SUF at thepage}}
% \end{macrocode}
% \paragraph{The \opt{sufdefault} style}
% \begin{macrocode}
@@ -4705,20 +4732,18 @@
\fancyhead[LE,RO]{\footnotesize\SUF at thepage}
\fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
\fancyhead[RE]{\footnotesize\breakinbodyfalse%
- \SUF at LR@MarkSwitch}
- }%
-%
+ \SUF at LR@MarkSwitch}}
\ifsuftesi at article
- \ifsuftesi at authortitle
- \def\SUF at LR@MarkSwitch{\SUF at leftmark}
- \else
- \def\SUF at LR@MarkSwitch{\SUF at rightmark}
- \fi
+ \ifsuftesi at authortitle
+ \def\SUF at LR@MarkSwitch{\SUF at leftmark}
+ \else
+ \def\SUF at LR@MarkSwitch{\SUF at rightmark}
+ \fi
\else
- \def\SUF at LR@MarkSwitch{\SUF at leftmark}
+ \def\SUF at LR@MarkSwitch{\SUF at leftmark}
\fi
\def\SUF at leftrightmark{%
- \if at mainmatter\leftmark\else\rightmark\fi}
+ \if at mainmatter\leftmark\else\rightmark\fi}
\pagestyle{sufdefault}
\ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
\ifsuftesi at sufplain\pagestyle{sufplain}\else\fi}
@@ -4774,7 +4799,7 @@
% symbol give in the first argument.
% \begin{macrocode}
\newcommand*\xfootnote[1][*]{%
- \xdef\@thefnmark{#1}%
+ \xdef\@thefnmark{#1}%
\@footnotemark\@footnotetext}
% \end{macrocode}
% \paragraph{Marginal notes}
@@ -4801,19 +4826,19 @@
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{todonotes}{%
-\renewcommand{\@todonotes at drawMarginNoteWithLine}{%
-\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
- \node [coordinate] (inText) {};%
-\end{tikzpicture}%
-\oldmarginpar[{% Draw note in left margin
- \@todonotes at drawMarginNote%
- \@todonotes at drawLineToLeftMargin%
-}]{% Draw note in right margin
- \@todonotes at drawMarginNote%
- \@todonotes at drawLineToRightMargin%
-}%
-}%
-}
+ \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
+ \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+ \node [coordinate] (inText) {};%
+ \end{tikzpicture}%
+ \oldmarginpar[{% Draw note in left margin
+ \@todonotes at drawMarginNote%
+ \@todonotes at drawLineToLeftMargin%
+ }]{% Draw note in right margin
+ \@todonotes at drawMarginNote%
+ \@todonotes at drawLineToRightMargin%
+ }
+ }
+ }
{\relax}}
% \end{macrocode}
% \paragraph{Abstract}
@@ -4853,8 +4878,8 @@
\quotation
\fi}
{\if at twocolumn\else\endquotation\fi}
+ \fi
\fi
-\fi
\newcommand\abstractname{Abstract}
% \end{macrocode}
% \paragraph{Colophon or copyright notice}
@@ -4952,9 +4977,7 @@
\newcommand*{\toclabelwidth}[2]{%
\AtBeginDocument{
\addtolength{\csname SUF at label@#1\endcsname}{#2}%
- \addtolength{\csname SUF at tocindent@#1\endcsname}{#2}%
- }
-}
+ \addtolength{\csname SUF at tocindent@#1\endcsname}{#2}}}
% \end{macrocode}
% These commands control the space before and after the label of the sections in the table of contents, using the \opt{compactfont} option.
% \begin{macrocode}
@@ -4979,7 +5002,7 @@
% \begin{macrocode}
\newlength{\SUF at tochang}
\setlength{\SUF at tochang}{3em}
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at label@part
\newlength\SUF at label@sec
\newlength\SUF at label@subsec
@@ -5003,8 +5026,7 @@
\setlength\SUF at label@fig
{\SUF at label@sec}
\setlength\SUF at label@tab
- {\SUF at label@sec}
-}
+ {\SUF at label@sec}}
% \end{macrocode}
% \paragraph{Part etry}
% The style of the part ToC entry the same in all ToC types,
@@ -5027,7 +5049,7 @@
% \begin{macrocode}
\ifsuftesi at pagelefttoc
\contentsmargin{0pt}
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at tochang@chap
\newlength\SUF at tochang@sec
\newlength\SUF at tochang@subsec
@@ -5075,8 +5097,7 @@
\setlength\SUF at addto@tochang at fig
{\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}
\setlength\SUF at addto@tochang at tab
- {\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}
-}
+ {\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}}
% \end{macrocode}
% \paragraph{ToC entries}
% \begin{macrocode}
@@ -5187,7 +5208,7 @@
% \end{macrocode}
% \paragraph{Default ToC}
% \begin{macrocode}
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at tocindent@chap
\newlength\SUF at tocindent@sec
\newlength\SUF at tocindent@subsec
@@ -5228,8 +5249,7 @@
{\dimexpr(\SUF at tocindent@chap+\SUF at label@sec-\SUF at label@chap)}
\setlength\SUF at tocindent@tab
{\dimexpr(\SUF at tocindent@chap+\SUF at label@sec-\SUF at label@chap)}
-\fi
-}
+\fi}
% \end{macrocode}
% \paragraph{ToC entries}
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2021-01-24 22:30:07 UTC (rev 57514)
+++ trunk/Master/texmf-dist/tex/latex/suftesi/suftesi.cls 2021-01-24 22:30:34 UTC (rev 57515)
@@ -26,7 +26,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2020/12/21 v2.9.11 A class for typesetting theses, books and articles]
+ [2021/01/24 v3.0 A class for typesetting theses, books and articles]
+^^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.
\RequirePackage{xkeyval}
\newif\ifsuftesi at compatibility
\newif\ifsuftesi at nofont
@@ -121,8 +122,8 @@
\or
\setkeys{}{structure=collection}
\fi}
-\define at choicekey{}{defaultfont}[\val\nr]{%
-none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
+\define at choicekey{}{defaultfont}[\val\nr]
+ {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{%
\ifcase\nr\relax
\suftesi at nofonttrue
\or
@@ -136,8 +137,8 @@
\or
\suftesi at compatibilitytrue
\fi}
-\define at choicekey{}{mathfont}[\val\nr]{%
-none,minimal,extended}[minimal]{%
+\define at choicekey{}{mathfont}[\val\nr]
+ {none,minimal,extended}[minimal]{%
\ifcase\nr\relax
\suftesi at mathminimalfalse
\suftesi at mathextendedfalse
@@ -146,10 +147,10 @@
\or
\suftesi at mathextendedtrue
\fi}
-\define at choicekey{}{greekfont}[\val\nr]{%
-none,artemisia,porson,bodoni,cbgreek}[none]{%
+\define at choicekey{}{greekfont}[\val\nr]
+ {none,artemisia,porson,bodoni,cbgreek}[none]{%
\ifcase\nr\relax
-\suftesi at greekfontfalse
+ \suftesi at greekfontfalse
\or
\suftesi at greekfonttrue\suftesi at artemisiatrue
\or
@@ -161,8 +162,8 @@
\fi}
\RequirePackage{geometry}
\define at choicekey{}{pagelayout}[\val\nr]
- {standard,standardaureo,periodical,compact,compactaureo,supercompact,
- supercompactaureo,periodicalaureo,pocketa,pocketb,pocketc}[standard]{%
+ {standard,standardaureo,periodical,periodicalaureo,compact,compactaureo,
+ supercompact,supercompactaureo,pocketa,pocketb,pocketc}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF at partsize}{\Large}
\DeclareRobustCommand{\SUF at chaptersize}{\Large}
@@ -211,6 +212,23 @@
marginparwidth= 26mm,
marginparsep= 10pt}
\or
+\suftesi at periodicalaureotrue
+ \DeclareRobustCommand{\SUF at partsize}{\large}
+ \DeclareRobustCommand{\SUF at chaptersize}{\large}
+ \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
+ \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
+ \geometry{
+ heightrounded,
+ includeheadfoot=true,
+ textwidth= 120mm,
+ textheight= 194mm,
+ paperwidth= 17cm,
+ paperheight= 24cm,
+ marginratio= 2:3,
+ marginparwidth= 62pt,
+ marginparsep= 10pt}
+\or
\suftesi at compacttrue
\DeclareRobustCommand{\SUF at partsize}{\large}
\DeclareRobustCommand{\SUF at chaptersize}{\large}
@@ -278,23 +296,6 @@
marginratio= 1:1,
marginparwidth= 11mm,
marginparsep= 7pt}
-\or
-\suftesi at periodicalaureotrue
- \DeclareRobustCommand{\SUF at partsize}{\large}
- \DeclareRobustCommand{\SUF at chaptersize}{\large}
- \DeclareRobustCommand{\SUF at sectionsize}{\normalsize}
- \DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
- \DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
- \geometry{
- heightrounded,
- includeheadfoot=true,
- textwidth= 120mm,
- textheight= 194mm,
- paperwidth= 17cm,
- paperheight= 24cm,
- marginratio= 2:3,
- marginparwidth= 62pt,
- marginparsep= 10pt}
\or% pocketa
\suftesi at supercompactaureotrue
\DeclareRobustCommand{\SUF at partsize}{\large}
@@ -321,16 +322,16 @@
\DeclareRobustCommand{\SUF at subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF at subsubsectionsize}{\normalsize}
\geometry{
- heightrounded,
- includeheadfoot=false,
- textheight= 165mm,
- textwidth= 99mm,
- paperwidth= 140mm,
- paperheight= 210mm,
- hmarginratio= 1:1,
- vmarginratio= 2:3,
- marginparwidth= 15mm,
- marginparsep= 7pt}
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 165mm,
+ textwidth= 99mm,
+ paperwidth= 140mm,
+ paperheight= 210mm,
+ hmarginratio= 1:1,
+ vmarginratio= 2:3,
+ marginparwidth= 15mm,
+ marginparsep= 7pt}
\or% pocketc
\suftesi at supercompactaureotrue
\DeclareRobustCommand{\SUF at partsize}{\large}
@@ -350,8 +351,8 @@
marginparwidth= 8mm,
marginparsep= 7pt}
\fi}
-\define at choicekey{}{partstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{partstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@PARTSwitch{\filright}
\or
@@ -368,8 +369,8 @@
\def\SUF at lr@PARTSwitch{\filleft}
\suftesi at numparparttrue
\fi}
-\define at choicekey{}{chapstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{chapstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@CHAPSwitch{\filright}
\or
@@ -386,8 +387,8 @@
\def\SUF at lr@CHAPSwitch{\filleft}
\suftesi at numparchaptrue
\fi}
-\define at choicekey{}{secstyle}[\val\nr]{%
- left,center,right,parleft,parcenter,parright}[left]{%
+\define at choicekey{}{secstyle}[\val\nr]
+ {left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SECSwitch{\filright}
\or
@@ -404,7 +405,8 @@
\def\SUF at lr@SECSwitch{\filleft}
\suftesi at numparsectrue
\fi}
-\define at choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{%
+\define at choicekey{}{subsecstyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSECSwitch{\filright}
\or
@@ -412,7 +414,8 @@
\or
\def\SUF at lr@SUBSECSwitch{\filleft}
\fi}
-\define at choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{%
+\define at choicekey{}{subsubsecstyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@SUBSUBSECSwitch{\filright}
\or
@@ -420,7 +423,8 @@
\or
\def\SUF at lr@SUBSUBSECSwitch{\filleft}
\fi}
-\define at choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{partfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at PART@StyleSwitch{\relax}
\or
@@ -428,7 +432,8 @@
\or
\def\SUF at PART@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{chapfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at CHAP@StyleSwitch{\relax}
\or
@@ -436,7 +441,8 @@
\or
\def\SUF at CHAP@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{secfont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at SEC@StyleSwitch{\relax}
\or
@@ -444,7 +450,8 @@
\or
\def\SUF at SEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{subsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at SUBSEC@StyleSwitch{\relax}
\or
@@ -452,7 +459,8 @@
\or
\def\SUF at SUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{subsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at SUBSUBSEC@StyleSwitch{\relax}
\or
@@ -461,7 +469,7 @@
\def\SUF at SUBSUBSEC@StyleSwitch{\expandafter\SUF at titlesmallcaps}
\fi}
\define at choicekey{}{smallcapsstyle}[\val\nr]
-{low,upper}[low]{%
+ {low,upper}[low]{%
\ifcase\nr\relax
\def\suftesi at MakeTextLowercase{\MakeLowercase}
\def\suftesi at MakeTextTOCLowercase{\lowercase}
@@ -470,7 +478,7 @@
\def\suftesi at MakeTextTOCLowercase{\relax}
\fi}
\define at choicekey{}{partnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thepart{\arabic{part}}
\def\SUF at dotpart{}
@@ -490,8 +498,8 @@
\def\SUF at thepart{\Roman{part}}
\def\SUF at dotpart{.}
\fi}
-\define at choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
+\define at choicekey{}{chapnumstyle}[\val\nr]
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thechapter{\arabic{chapter}}
\def\SUF at HEAD@thechapter{\arabic{chapter}}
@@ -524,7 +532,7 @@
\def\SUF at CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{secnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesection{\SUF at chapswitch\arabic{section}}
\def\SUF at HEAD@thesection{\arabic{section}}
@@ -557,7 +565,7 @@
\def\SUF at SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{subsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesubsection{\SUF at thesection.\arabic{subsection}}
\def\SUF at dotsubsec{}
@@ -584,7 +592,7 @@
\def\SUF at SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define at choicekey{}{subsubsecnumstyle}[\val\nr]
-{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+ {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF at thesubsubsection{\SUF at thesubsection.\arabic{subsubsection}}
\def\SUF at dotsubsubsec{}
@@ -610,8 +618,8 @@
\def\SUF at dotsubsubsec{.}
\def\SUF at SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
-\define at choicekey{}{tocstyle}[\val\nr]{%
-standard,dotted,ragged,leftpage}[standard]{%
+\define at choicekey{}{tocstyle}[\val\nr]
+ {standard,dotted,ragged,leftpage}[standard]{%
\ifcase\nr\relax
\def\SUF at titlerule{\titlerule*{}}
\def\SUF at chaptitlerule{\titlerule*{}}
@@ -626,8 +634,8 @@
\or
\suftesi at pagelefttoctrue
\fi}
-\define at choicekey{}{compacttoc}[\val\nr]{%
-sec,subsec,subsubsec}[sec]{%
+\define at choicekey{}{compacttoc}[\val\nr]
+ {sec,subsec,subsubsec}[sec]{%
\ifcase\nr\relax
\suftesi at toccompactsectrue
\suftesi at toccompactsubsectrue
@@ -650,8 +658,8 @@
\def\suf at ssscorrect{\relax}
\def\suf at ctocdotsssec{.}
\fi}
-\define at choicekey{}{twocolcontents}[\val\nr]{%
-toc,lof,lot,toclof,toclot,loflot,all}[all]{%
+\define at choicekey{}{twocolcontents}[\val\nr]
+ {toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
\suftesi at twocolumntoctrue
\setkeys{}{tocstyle=ragged}
@@ -678,17 +686,18 @@
\suftesi at twocolumnloftrue
\suftesi at twocolumnlottrue
\setkeys{}{tocstyle=ragged}
-\fi
-}
-\define at choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\fi}
+\define at choicekey{}{tocpartfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
- \def\SUF at tocPART@font{\relax}
+ \def\SUF at tocPART@font{\relax}
\or
- \def\SUF at tocPART@font{\itshape}
+ \def\SUF at tocPART@font{\itshape}
\or
- \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
+ \def\SUF at tocPART@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocchapfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocCHAP@font{\relax}
\or
@@ -696,7 +705,8 @@
\or
\def\SUF at tocCHAP@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{tocsecfont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at tocSEC@font{\relax}
\or
@@ -704,7 +714,8 @@
\or
\def\SUF at tocSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocSUBSEC@font{\relax}
\or
@@ -712,7 +723,8 @@
\or
\def\SUF at tocSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocsubsubsecfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocSUBSUBSEC@font{\relax}
\or
@@ -720,7 +732,8 @@
\or
\def\SUF at tocSUBSUBSEC@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{tocauthorfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at tocAUT@font{\relax}
\or
@@ -728,7 +741,8 @@
\or
\def\SUF at tocAUT@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
-\define at choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{%
+\define at choicekey{}{toctitlefont}[\val\nr]
+ {roman,italic,smallcaps}[italic]{%
\ifcase\nr\relax
\def\SUF at tocTIT@font{\relax}
\or
@@ -737,8 +751,7 @@
\def\SUF at tocTIT@font{\expandafter\SUF at TOCtitlesmallcaps}
\fi}
\define at choicekey{}{headerstyle}[\val\nr]
- {inner,center,plain,authortitleinner,
- authortitlecenter}[inner]{%
+ {inner,center,plain,authortitleinner,authortitlecenter}[inner]{%
\ifcase\nr\relax
\def\SUF at rightmark{\SUF at Rheadstyle{\rightmark}}
\def\SUF at leftmark{\SUF at Lheadstyle{\SUF at leftrightmark}}
@@ -783,7 +796,8 @@
\setlist[enumerate,1]{leftmargin=0pt,label=\arabic*.}
\setlist[enumerate,2]{leftmargin= 1.3\parindent,label=\alph*.}
\setlist[enumerate,3]{leftmargin= 1.3\parindent,label=\roman*.}
- \setlist[itemize,1]{leftmargin=0pt} \setlist[itemize,2]{leftmargin=1.3\parindent}
+ \setlist[itemize,1]{leftmargin=0pt}
+ \setlist[itemize,2]{leftmargin=1.3\parindent}
\setlist[itemize,3]{leftmargin=1.3\parindent}
\or
\setlist[enumerate,1]{leftmargin=1\parindent,label=\arabic*.}
@@ -817,15 +831,15 @@
\define at choicekey{}{footnotestyle}[\val\nr]
{bulged,hung,dotted,superscript}[bulged]{%
\ifcase\nr\relax
- \renewcommand\@makefntext{%
- \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
+ \renewcommand\@makefntext{%
+ \hskip-2.5em\makebox[2em][r]{\@thefnmark}\hskip.5em}
\or
- \renewcommand\@makefntext{%
- \leftskip=1em\hskip-1.5em%
- \makebox[1em][r]{\@thefnmark}\hskip.5em}
+ \renewcommand\@makefntext{%
+ \leftskip=1em\hskip-1.5em%
+ \makebox[1em][r]{\@thefnmark}\hskip.5em}
\or
- \renewcommand\@makefntext{%
- \@thefnmark.\hskip.5em}
+ \renewcommand\@makefntext{%
+ \@thefnmark.\hskip.5em}
\or
\renewcommand\@makefntext{%
\textsuperscript{\@thefnmark}\hskip.3em}
@@ -843,13 +857,12 @@
{standard,sanserif,italic,smallcaps}[standard]{%
\ifcase\nr\relax
\or
- \captionsetup{font+=sf}
+ \captionsetup{font+=sf}
\or
- \captionsetup{font+=it}
+ \captionsetup{font+=it}
\or
- \captionsetup{labelfont=sc}
-\fi
-}
+ \captionsetup{labelfont=sc}
+\fi}
\define at choicekey{}{marginpar}[\val\nr]
{true,false}[true]{%
\ifcase\nr\relax
@@ -856,7 +869,8 @@
\or
\renewcommand\marginpar[2][]{}
\fi}
-\define at choicekey{}{partpage}[\val\nr]{true,false}[true]{%
+\define at choicekey{}{partpage}[\val\nr]
+ {true,false}[true]{%
\ifcase\nr\relax
\suftesi at partpagetrue
\or
@@ -883,9 +897,9 @@
\fi}
\define at choicekey{}{crop}[\val\nr]
{true,false}[true]{%
-\ClassWarningNoLine{suftesi}{%
- 'crop' option is deprecated.\MessageBreak
- Use 'version' option instead}
+ \ClassWarningNoLine{suftesi}{%
+ 'crop' option is deprecated.\MessageBreak
+ Use 'version' option instead}
\ifcase\nr\relax
\setkeys{}{version=draft}
\or
@@ -1078,59 +1092,56 @@
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=roman5,
- chapnumstyle=roman,
- headerstyle=inner,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=roman5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+ secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+ quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=italic5,
- chapnumstyle=roman,
- headerstyle=inner,
- headerfont=italic,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=italic5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ headerfont=italic,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi at periodicalaureotrue
\suftesi at FSPLtrue
\setkeys{}{%
- pagelayout=periodicalaureo,
- style=smallcaps5,
- chapnumstyle=roman,
- headerstyle=inner,
- headerfont=smallcaps,
- secfont=smallcaps,
- footnotestyle=hung,
- liststyle=indented,
- tocstyle=leftpage}
+ pagelayout=periodicalaureo,
+ style=smallcaps5,
+ chapnumstyle=roman,
+ headerstyle=inner,
+ headerfont=smallcaps,
+ secfont=smallcaps,
+ footnotestyle=hung,
+ liststyle=indented,
+ tocstyle=leftpage}
\disable at keys{}
-{structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
-subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
-subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
-secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle}
+ {structure,documentstructure,pagelayout,partfont,chapfont,secfont,%
+ subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
+ subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
+ secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
+ quotesize,footnotestyle,liststyle,captionstyle}
\fi}
-\define at choicekey{}{papertitlestyle}[\val\nr]{%
- left,center,right}[left]{%
+\define at choicekey{}{papertitlestyle}[\val\nr]
+ {left,center,right}[left]{%
\ifcase\nr\relax
\def\SUF at lr@coll at titleSwitch{\filright}
\or
@@ -1145,7 +1156,8 @@
\or
\relax
\fi}
-\define at choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{titlefont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at titlefont@Switch{\relax}
\or
@@ -1153,7 +1165,8 @@
\or
\def\SUF at titlefont@Switch{\expandafter\SUF at titlesmallcaps}
\fi}
-\define at choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
+\define at choicekey{}{authorfont}[\val\nr]
+ {roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF at authorfont@Switch{\relax}
\or
@@ -1231,10 +1244,10 @@
\definecolor{sufred}{rgb}{0.5,0,0}
\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
- \ifLuaTeX
- \RequirePackage{luatex85}
- \else
- \fi
+\ifLuaTeX
+ \RequirePackage{luatex85}
+ \else
+\fi
\ifsuftesi at FSPL
\RequirePackage{cclicenses}
\else
@@ -1244,8 +1257,8 @@
\ifsuftesi at screencentered
\geometry{hmarginratio=1:1}
\fi
-\else
- \RequirePackage[a4,cam,center]{crop}
+ \else
+ \RequirePackage[a4,cam,center]{crop}
\fi
\unless\ifPDFTeX
\AtBeginDocument{%
@@ -1263,18 +1276,17 @@
* load either 'fontspec' or 'mathspec'\MessageBreak
* For using suftesi with LuaLaTeX\MessageBreak
* load 'fontspec' \MessageBreak
- ************************************}}
- }
-\else% if pdftex
+ ************************************}}}
+\else
\RequirePackage[LGR,T1]{fontenc}
\RequirePackage{substitutefont}
\AtBeginDocument{\fontencoding{T1}\selectfont}
\ifsuftesi at nofont
- \ifsuftesi at greekfont
- \ClassWarningNoLine{suftesi}{%
- Unused 'greekfont' option}%
- \suftesi at greekfontfalse
- \else\suftesi at greekfontfalse\fi
+\ifsuftesi at greekfont
+ \ClassWarningNoLine{suftesi}{%
+ Unused 'greekfont' option}%
+ \suftesi at greekfontfalse
+ \else\suftesi at greekfontfalse\fi
\else
\ifsuftesi at standard
\RequirePackage{lmodern}
@@ -1445,8 +1457,7 @@
\DeclareRobustCommand{\greektext}{%
\usefont{LGR}{\SUF at greekfamily}{\f at series}{\f at shape}
\def\encodingdefault{LGR}}
- \DeclareTextFontCommand{\textgreek}{\greektext}
-}
+ \DeclareTextFontCommand{\textgreek}{\greektext}}
\ifsuftesi at cbgreek
\else
\DeclareFontFamily{LGR}{bodoni}{}
@@ -1494,9 +1505,9 @@
\fi
\fi
\RequirePackage[newparttoc]{titlesec}
- \newlength{\sectionsep}
- \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\unless\ifPDFTeX% if xetex or luatex
+ \newlength{\sectionsep}
+ \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
+\unless\ifPDFTeX
\DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextTOCLowercase{#1}}
\DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
@@ -1503,7 +1514,7 @@
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
\DeclareRobustCommand{\SUF at headingsmallcaps}[1]{%
\addfontfeature{LetterSpace=10}\scshape\suftesi at MakeTextLowercase{#1}}
-\else% if pdftex
+\else
\DeclareRobustCommand{\SUF at TOCtitlesmallcaps}[1]{%
\scshape\suftesi at MakeTextTOCLowercase{\textls*{#1}}}%
\DeclareRobustCommand{\SUF at titlesmallcaps}[1]{%
@@ -1533,48 +1544,48 @@
\fi}
\def\SUF at default@SECTIONS{
\ifsuftesi at numparsec
-\titleformat{\section}[display]
-{\SUF at sectionsize\SUF at lr@SECSwitch}
-{\SUF at thesection\SUF at dotsec}
-{0ex}
-{\SUF at SEC@StyleSwitch}
+ \titleformat{\section}[display]
+ {\SUF at sectionsize\SUF at lr@SECSwitch}
+ {\SUF at thesection\SUF at dotsec}
+ {0ex}
+ {\SUF at SEC@StyleSwitch}
\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-\titleformat{\section}[hang]
-{\SUF at sectionsize\SUF at lr@SECSwitch}
-{\SUF at thesection\SUF at dotsec}
-{1em}
-{\SUF at SEC@StyleSwitch}
+ \titleformat{\section}[hang]
+ {\SUF at sectionsize\SUF at lr@SECSwitch}
+ {\SUF at thesection\SUF at dotsec}
+ {1em}
+ {\SUF at SEC@StyleSwitch}
\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi at numparsubsec
-\titleformat{\subsection}[display]
-{\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-{\textnormal\SUF at thesubsection\SUF at dotsubsec}
-{0ex}
-{\SUF at SUBSEC@StyleSwitch}
+ \titleformat{\subsection}[display]
+ {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+ {\textnormal\SUF at thesubsection\SUF at dotsubsec}
+ {0ex}
+ {\SUF at SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-\titleformat{\subsection}[hang]
-{\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
-{\textnormal\SUF at thesubsection\SUF at dotsubsec}
-{1em}
-{\SUF at SUBSEC@StyleSwitch}
+ \titleformat{\subsection}[hang]
+ {\SUF at subsectionsize\SUF at lr@SUBSECSwitch}
+ {\textnormal\SUF at thesubsection\SUF at dotsubsec}
+ {1em}
+ {\SUF at SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi at numparsubsubsec
-\titleformat{\subsubsection}[display]
-{\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-{\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
-{0ex}
-{\SUF at SUBSUBSEC@StyleSwitch}
+ \titleformat{\subsubsection}[display]
+ {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+ {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
+ {0ex}
+ {\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
-\titleformat{\subsubsection}[hang]
-{\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
-{\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
-{1em}
-{\SUF at SUBSUBSEC@StyleSwitch}
+ \titleformat{\subsubsection}[hang]
+ {\SUF at subsectionsize\SUF at lr@SUBSUBSECSwitch}
+ {\textnormal\SUF at thesubsubsection\SUF at dotsubsubsec}
+ {1em}
+ {\SUF at SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi}
\SUF at default@CHAPTER
@@ -1614,101 +1625,101 @@
\fi
\ifsuftesi at article
\def\chapter#1{\ClassError{suftesi}
-{\noexpand\chapter level is undefined
-using 'structure=article'}
-{\noexpand\chapter level is undefined
-using 'structure=article'}}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}
+ {\noexpand\chapter level is undefined
+ using 'structure=article'}}
\setcounter{tocdepth}{3}
\setcounter{secnumdepth}{3}
\renewcommand\thesection{%
-\@arabic\c at section}
+ \@arabic\c at section}
\renewcommand\thesubsection{%
-\thesection.\@arabic\c at subsection}
+ \thesection.\@arabic\c at subsection}
\renewcommand\thesubsubsection{%
-\thesubsection.\@arabic\c at subsubsection}
+ \thesubsection.\@arabic\c at subsubsection}
\renewcommand\theparagraph{%
-\thesubsubsection.\@arabic\c at paragraph}
+ \thesubsubsection.\@arabic\c at paragraph}
\renewcommand\thesubparagraph{%
-\theparagraph.\@arabic\c at subparagraph}
+ \theparagraph.\@arabic\c at subparagraph}
\renewcommand\part{%
-\ifsuftesi at partpage
-\if at openright
-\cleardoublepage
-\else
-\clearpage
+ \ifsuftesi at partpage
+ \if at openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \fi
+ \if at twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \ifsuftesi at partpage
+ \null\vfil
+ \fi
+ \secdef\@part\@spart}
\fi
-\thispagestyle{plain}%
-\fi
-\if at twocolumn
-\onecolumn
-\@tempswatrue
-\else
-\@tempswafalse
-\fi
-\ifsuftesi at partpage
-\null\vfil
-\fi
-\secdef\@part\@spart}
-\fi
\def\@part[#1]#2{%
-\ifnum \c at secnumdepth >-2\relax
-\refstepcounter{part}%
-\addcontentsline{toc}{part}{\normalfont\normalsize
-\SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
-\SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
-\else
-\addcontentsline{toc}{part}{\normalfont\normalsize
-\SUF at tocPART@font#1}%
-\fi
-\markboth{}{}%
-{\SUF at lr@PARTSwitch\SUF at partsize
-\interlinepenalty \@M
-\ifnum \c at secnumdepth >-2\relax
-\noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
-\ifsuftesi at numparpart
-\par
-\vskip2ex
-\else
-\hspace{1em}
-\fi
-\noindent\SUF at PART@StyleSwitch#2\par}%
-\@endpart}
+ \ifnum \c at secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocpartname\hskip.5em{\SUF at tocPARTnum@font\SUF at thepart}%
+ \SUF at dotpart\hspace{1em}\SUF at tocPART@font#1}%
+ \else
+ \addcontentsline{toc}{part}{\normalfont\normalsize
+ \SUF at tocPART@font#1}%
+ \fi
+ \markboth{}{}%
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \ifnum \c at secnumdepth >-2\relax
+ \noindent\partname\hskip.5em{\SUF at PART@font\SUF at thepart}\SUF at dotpart
+ \ifsuftesi at numparpart
+ \par
+ \vskip2ex
+ \else
+ \hspace{1em}
+ \fi
+ \noindent\SUF at PART@StyleSwitch#2\par}%
+ \@endpart}
\def\@spart#1{%
-{\SUF at lr@PARTSwitch\SUF at partsize
-\interlinepenalty \@M
-\noindent\SUF at PART@StyleSwitch#1\par}%
-\@endpart}
+ {\SUF at lr@PARTSwitch\SUF at partsize
+ \interlinepenalty \@M
+ \noindent\SUF at PART@StyleSwitch#1\par}%
+ \@endpart}
\ifsuftesi at article
\def\@endpart{%
-\ifsuftesi at partpage
-\vfil\newpage
-\if at twoside
-\if at openright
-\null
-\thispagestyle{empty}%
-\newpage
-\fi
-\fi
-\fi
-\if at tempswa
-\twocolumn
-\fi}
+ \ifsuftesi at partpage
+ \vfil\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\else
\def\@endpart{\vfil\newpage
-\if at twoside
-\if at openright
-\null
-\thispagestyle{empty}%
-\newpage
+ \if at twoside
+ \if at openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if at tempswa
+ \twocolumn
+ \fi}
\fi
-\fi
-\if at tempswa
-\twocolumn
-\fi}
-\fi
\titleformat{\paragraph}[runin]
{}
{\theparagraph}
@@ -1727,63 +1738,61 @@
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
-\section*{#1}%
-\@mkboth{#1}{#1}}
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblist}[\biblistname]{%
-\section*{#1}%
-\@mkboth{#1}{#1}}
+ \section*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\refname]{%
-\section*{#1}%
-\addcontentsline{toc}{section}{#1}%
-\@mkboth{#1}{#1}}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblistintoc}[\biblistname]{%
-\section*{#1}%
-\addcontentsline{toc}{section}{#1}%
-\@mkboth{#1}{#1}}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
-\section{#1}}
+ \section{#1}}
\defbibheading{biblistnumbered}[\biblistname]{%
-\section{#1}}
+ \section{#1}}
\defbibheading{subbibliography}[\refname]{%
-\subsection*{#1}}
+ \subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
-\subsection*{#1}%
-\addcontentsline{toc}{subsection}{#1}}
+ \subsection*{#1}%
+ \addcontentsline{toc}{subsection}{#1}}
\defbibheading{subbibnumbered}[\refname]{%
-\subsection{#1}}
-}%
+ \subsection{#1}}}
{\relax}}
\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
-\chapter*{#1}%
-\@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblist}[\biblistname]{%
-\chapter*{#1}%
-\@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibintoc}[\bibname]{%
-\chapter*{#1}%
-\addcontentsline{toc}{chapter}{#1}%
-\@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{biblistintoc}[\biblistname]{%
-\chapter*{#1}%
-\addcontentsline{toc}{chapter}{#1}%
-\@mkboth{#1}{#1}}
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+ \@mkboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
-\chapter{#1}}
+ \chapter{#1}}
\defbibheading{biblistnumbered}[\biblistname]{%
-\chapter{#1}}
+ \chapter{#1}}
\defbibheading{subbibliography}[\refname]{%
-\section*{#1}%
-\if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
-\section*{#1}%
-\addcontentsline{toc}{section}{#1}%
-\if at twoside\markright{#1}\fi}
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \if at twoside\markright{#1}\fi}
\defbibheading{subbibnumbered}[\refname]{%
-\section{#1}}
-}%
+ \section{#1}}}
{\relax}}
\fi
\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
@@ -1977,7 +1986,7 @@
\global\let\@date\@empty
\global\let\date\relax
\global\let\and\relax}
- \def\@maketitle{%
+\def\@maketitle{%
\newpage
\null
\vskip 2em%
@@ -2191,15 +2200,15 @@
\fi\vskip1.5cm}}%
}
\newenvironment{article}
- {\begingroup
- \setcounter{section}{0}
- \setcounter{footnote}{0}
- \setcounter{figure}{0}
- \setcounter{table}{0}}
- {\label{end:\thearticle}
- \cleardoublepage
- \global\let\@thanks\@empty
- \endgroup}
+ {\begingroup
+ \setcounter{section}{0}
+ \setcounter{footnote}{0}
+ \setcounter{figure}{0}
+ \setcounter{table}{0}}
+ {\label{end:\thearticle}
+ \cleardoublepage
+ \global\let\@thanks\@empty
+ \endgroup}
\newcommand{\frontispiece}{%
\thispagestyle{empty}%
\begingroup
@@ -2212,7 +2221,7 @@
\@collectioneditor
\vspace*{\stretch{3}}
- \endgroup
+ \endgroup
\clearpage}
\setcounter{tocdepth}{0}
\renewcommand\thesection{%
@@ -2331,8 +2340,7 @@
\fi
\if at tempswa
\twocolumn
- \fi
-}
+ \fi}
\renewcommand{\@sec at pppage}{%
\par
\addvspace{4ex}%
@@ -2348,8 +2356,7 @@
\fi
\nobreak
\vskip 3ex
- \@afterheading
-}
+ \@afterheading}
\def\suf at appendixtoc{%
\ifsuftesi at pagelefttoc
\titlecontents{chapter}
@@ -2410,8 +2417,7 @@
\SUF at tocSEC@font}
{\ifsuftesi at article\SUF at chaptitlerule%
\else\SUF at titlerule\fi\contentspage}
- \fi
-}
+ \fi}
\ifsuftesi at article
\renewcommand\appendix{\par
\suf at appendixtoc%
@@ -2458,8 +2464,7 @@
\fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
\fancyhead[CE]{\footnotesize\breakinbodyfalse%
\SUF at LR@MarkSwitch}
- \fancyfoot[C]{\footnotesize\SUF at thepage}%
- }%
+ \fancyfoot[C]{\footnotesize\SUF at thepage}}
\fancypagestyle{sufdefault}{%
\fancyhf{}%
\fancyfoot[RE,LO]{%
@@ -2467,19 +2472,18 @@
\fancyhead[LE,RO]{\footnotesize\SUF at thepage}
\fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF at rightmark}
\fancyhead[RE]{\footnotesize\breakinbodyfalse%
- \SUF at LR@MarkSwitch}
- }%
+ \SUF at LR@MarkSwitch}}
\ifsuftesi at article
- \ifsuftesi at authortitle
- \def\SUF at LR@MarkSwitch{\SUF at leftmark}
- \else
- \def\SUF at LR@MarkSwitch{\SUF at rightmark}
- \fi
+ \ifsuftesi at authortitle
+ \def\SUF at LR@MarkSwitch{\SUF at leftmark}
+ \else
+ \def\SUF at LR@MarkSwitch{\SUF at rightmark}
+ \fi
\else
- \def\SUF at LR@MarkSwitch{\SUF at leftmark}
+ \def\SUF at LR@MarkSwitch{\SUF at leftmark}
\fi
\def\SUF at leftrightmark{%
- \if at mainmatter\leftmark\else\rightmark\fi}
+ \if at mainmatter\leftmark\else\rightmark\fi}
\pagestyle{sufdefault}
\ifsuftesi at centerheader\pagestyle{centerheader}\else\fi
\ifsuftesi at sufplain\pagestyle{sufplain}\else\fi}
@@ -2521,7 +2525,7 @@
\def\thefootnote{\@fnsymbol\c at footnote}%
\else\fi
\newcommand*\xfootnote[1][*]{%
- \xdef\@thefnmark{#1}%
+ \xdef\@thefnmark{#1}%
\@footnotemark\@footnotetext}
\def\SUF at mpsetup{%
\itshape
@@ -2536,19 +2540,19 @@
{\SUF at mpsetup\raggedright\hspace{0pt}{#1}}}
\AtBeginDocument{%
\@ifpackageloaded{todonotes}{%
-\renewcommand{\@todonotes at drawMarginNoteWithLine}{%
-\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
- \node [coordinate] (inText) {};%
-\end{tikzpicture}%
-\oldmarginpar[{% Draw note in left margin
- \@todonotes at drawMarginNote%
- \@todonotes at drawLineToLeftMargin%
-}]{% Draw note in right margin
- \@todonotes at drawMarginNote%
- \@todonotes at drawLineToRightMargin%
-}%
-}%
-}
+ \renewcommand{\@todonotes at drawMarginNoteWithLine}{%
+ \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+ \node [coordinate] (inText) {};%
+ \end{tikzpicture}%
+ \oldmarginpar[{% Draw note in left margin
+ \@todonotes at drawMarginNote%
+ \@todonotes at drawLineToLeftMargin%
+ }]{% Draw note in right margin
+ \@todonotes at drawMarginNote%
+ \@todonotes at drawLineToRightMargin%
+ }
+ }
+ }
{\relax}}
\ifsuftesi at collection
\newenvironment{abstract}{%
@@ -2585,8 +2589,8 @@
\quotation
\fi}
{\if at twocolumn\else\endquotation\fi}
+ \fi
\fi
-\fi
\newcommand\abstractname{Abstract}
\newcommand{\colophon}[3][]{%
\thispagestyle{empty}
@@ -2669,9 +2673,7 @@
\newcommand*{\toclabelwidth}[2]{%
\AtBeginDocument{
\addtolength{\csname SUF at label@#1\endcsname}{#2}%
- \addtolength{\csname SUF at tocindent@#1\endcsname}{#2}%
- }
-}
+ \addtolength{\csname SUF at tocindent@#1\endcsname}{#2}}}
\newcommand{\adjtoclabelsep}{\hskip.2em plus 1pt minus 1pt}
\newcommand{\adjtocpagesep}{\hskip.5em plus 2pt minus 1pt}
\newcommand{\toclabelspace}{%
@@ -2686,7 +2688,7 @@
See package documentation for details}}
\newlength{\SUF at tochang}
\setlength{\SUF at tochang}{3em}
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at label@part
\newlength\SUF at label@sec
\newlength\SUF at label@subsec
@@ -2710,11 +2712,10 @@
\setlength\SUF at label@fig
{\SUF at label@sec}
\setlength\SUF at label@tab
- {\SUF at label@sec}
-}
+ {\SUF at label@sec}}
\ifsuftesi at pagelefttoc
\contentsmargin{0pt}
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at tochang@chap
\newlength\SUF at tochang@sec
\newlength\SUF at tochang@subsec
@@ -2762,8 +2763,7 @@
\setlength\SUF at addto@tochang at fig
{\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}
\setlength\SUF at addto@tochang at tab
- {\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}
-}
+ {\dimexpr(\SUF at addto@tochang at chap-\SUF at label@sec+\SUF at label@chap)}}
\titlecontents{chapter}
[\SUF at tochang@chap]
{\addvspace{2ex}}
@@ -2865,7 +2865,7 @@
{}
{}
\else
-\AtBeginDocument{
+\AtBeginDocument{%
\newlength\SUF at tocindent@chap
\newlength\SUF at tocindent@sec
\newlength\SUF at tocindent@subsec
@@ -2906,8 +2906,7 @@
{\dimexpr(\SUF at tocindent@chap+\SUF at label@sec-\SUF at label@chap)}
\setlength\SUF at tocindent@tab
{\dimexpr(\SUF at tocindent@chap+\SUF at label@sec-\SUF at label@chap)}
-\fi
-}
+\fi}
\titlecontents{chapter}
[\SUF at tocindent@chap]
{\addvspace{2ex}}
More information about the tex-live-commits
mailing list.