diff options
| author | Karl Berry <karl@freefriends.org> | 2021-01-24 22:30:34 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-01-24 22:30:34 +0000 |
| commit | d367788b5abcd18cb9830d29873b62c53e282fae (patch) | |
| tree | 0e25d43215600f1d2106d5580f5871eaff0ca9f0 /Master | |
| parent | c52f027c13ec66d348548a8fc0508a69f3e6d86e (diff) | |
suftesi (24jan21)
git-svn-id: svn://tug.org/texlive/trunk@57515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/suftesi/README | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/suftesi/suftesi.pdf | bin | 793785 -> 795320 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/suftesi/templates.zip | bin | 681686 -> 681686 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/suftesi/suftesi.dtx | 878 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 707 |
5 files changed, 802 insertions, 784 deletions
diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README index 1f7ccb4df57..a4211d840e5 100644 --- a/Master/texmf-dist/doc/latex/suftesi/README +++ b/Master/texmf-dist/doc/latex/suftesi/README @@ -56,5 +56,4 @@ from a shell (or in the preferred method for you system), where `$' stands for the shell's prompt. -2012/08/28 Ivan Valbusa diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf Binary files differindex 12699ac52ac..5957367bace 100644 --- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf +++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf diff --git a/Master/texmf-dist/doc/latex/suftesi/templates.zip b/Master/texmf-dist/doc/latex/suftesi/templates.zip Binary files differindex 2b290f41624..8d274fc983c 100644 --- a/Master/texmf-dist/doc/latex/suftesi/templates.zip +++ b/Master/texmf-dist/doc/latex/suftesi/templates.zip diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx index 470dc9efdbc..db024137147 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx @@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained". %<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 @@ This work has the LPPL maintenance status "author-maintained". \usepackage[utf8]{inputenc} \usepackage[fontsize=12pt]{fontsize} \usepackage[greek.ancient,english]{babel} +\usepackage{afterpage} %-------------------------------------------------------- % GRAPHICS %-------------------------------------------------------- @@ -73,9 +74,9 @@ This work has the LPPL maintenance status "author-maintained". \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 @@ This work has the LPPL maintenance status "author-maintained". \geometry{ a4paper, margin=3cm, - %paperwidth=128mm, - %paperheight=96mm, - %margin=1cm, headheight=15pt, ignoreall, heightrounded} @@ -202,6 +200,48 @@ cochineal,mathpazo,bera,amsthm} {\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 @@ cochineal,mathpazo,bera,amsthm} %</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 @@ cochineal,mathpazo,bera,amsthm} % 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 @@ cochineal,mathpazo,bera,amsthm} % \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,16 +599,19 @@ cochineal,mathpazo,bera,amsthm} % 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 % 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,17 +693,32 @@ cochineal,mathpazo,bera,amsthm} %\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\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} +^^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. +% +%\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 @@ -668,7 +727,7 @@ cochineal,mathpazo,bera,amsthm} % ^^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,14 +737,14 @@ cochineal,mathpazo,bera,amsthm} % 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). % % 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 @@ cochineal,mathpazo,bera,amsthm} % ^^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 @@ cochineal,mathpazo,bera,amsthm} %\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 @@ cochineal,mathpazo,bera,amsthm} % 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 @@ cochineal,mathpazo,bera,amsthm} % \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 @@ cochineal,mathpazo,bera,amsthm} % \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 @@ cochineal,mathpazo,bera,amsthm} %\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 @@ cochineal,mathpazo,bera,amsthm} %\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 @@ cochineal,mathpazo,bera,amsthm} % 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 @@ cochineal,mathpazo,bera,amsthm} % 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 @@ cochineal,mathpazo,bera,amsthm} % 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 @@ cochineal,mathpazo,bera,amsthm} % \subsubsection{Fonts} % \paragraph{Roman fonts} % \begin{macrocode} -\define@choicekey{}{defaultfont}[\val\nr]{% -none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% +\define@choicekey{}{defaultfont}[\val\nr] + {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% \ifcase\nr\relax \suftesi@nofonttrue \or @@ -2080,8 +2135,8 @@ none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% \or \suftesi@compatibilitytrue \fi} -\define@choicekey{}{mathfont}[\val\nr]{% -none,minimal,extended}[minimal]{% +\define@choicekey{}{mathfont}[\val\nr] + {none,minimal,extended}[minimal]{% \ifcase\nr\relax \suftesi@mathminimalfalse \suftesi@mathextendedfalse @@ -2093,10 +2148,10 @@ none,minimal,extended}[minimal]{% % \end{macrocode} % \paragraph{Greek fonts} % \begin{macrocode} -\define@choicekey{}{greekfont}[\val\nr]{% -none,artemisia,porson,bodoni,cbgreek}[none]{% +\define@choicekey{}{greekfont}[\val\nr] + {none,artemisia,porson,bodoni,cbgreek}[none]{% \ifcase\nr\relax -\suftesi@greekfontfalse + \suftesi@greekfontfalse \or \suftesi@greekfonttrue\suftesi@artemisiatrue \or @@ -2111,8 +2166,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \begin{macrocode} \RequirePackage{geometry} \define@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@partsize}{\Large} \DeclareRobustCommand{\SUF@chaptersize}{\Large} @@ -2161,6 +2216,23 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% marginparwidth= 26mm, marginparsep= 10pt} \or +\suftesi@periodicalaureotrue + \DeclareRobustCommand{\SUF@partsize}{\large} + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \DeclareRobustCommand{\SUF@sectionsize}{\normalsize} + \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} + \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize} + \geometry{ + heightrounded, + includeheadfoot=true, + textwidth= 120mm, + textheight= 194mm, + paperwidth= 17cm, + paperheight= 24cm, + marginratio= 2:3, + marginparwidth= 62pt, + marginparsep= 10pt} +\or \suftesi@compacttrue \DeclareRobustCommand{\SUF@partsize}{\large} \DeclareRobustCommand{\SUF@chaptersize}{\large} @@ -2228,23 +2300,6 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% marginratio= 1:1, marginparwidth= 11mm, marginparsep= 7pt} -\or -\suftesi@periodicalaureotrue - \DeclareRobustCommand{\SUF@partsize}{\large} - \DeclareRobustCommand{\SUF@chaptersize}{\large} - \DeclareRobustCommand{\SUF@sectionsize}{\normalsize} - \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} - \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize} - \geometry{ - heightrounded, - includeheadfoot=true, - textwidth= 120mm, - textheight= 194mm, - paperwidth= 17cm, - paperheight= 24cm, - marginratio= 2:3, - marginparwidth= 62pt, - marginparsep= 10pt} \or% pocketa \suftesi@supercompactaureotrue \DeclareRobustCommand{\SUF@partsize}{\large} @@ -2271,16 +2326,16 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} \DeclareRobustCommand{\SUF@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@supercompactaureotrue \DeclareRobustCommand{\SUF@partsize}{\large} @@ -2303,8 +2358,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \end{macrocode} % \subsubsection{Sections style} % \begin{macrocode} -\define@choicekey{}{partstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{partstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@PARTSwitch{\filright} \or @@ -2321,8 +2376,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@PARTSwitch{\filleft} \suftesi@numparparttrue \fi} -\define@choicekey{}{chapstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{chapstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@CHAPSwitch{\filright} \or @@ -2339,8 +2394,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@CHAPSwitch{\filleft} \suftesi@numparchaptrue \fi} -\define@choicekey{}{secstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{secstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@SECSwitch{\filright} \or @@ -2357,7 +2412,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@SECSwitch{\filleft} \suftesi@numparsectrue \fi} -\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{% +\define@choicekey{}{subsecstyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@SUBSECSwitch{\filright} \or @@ -2365,7 +2421,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@lr@SUBSECSwitch{\filleft} \fi} -\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{% +\define@choicekey{}{subsubsecstyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@SUBSUBSECSwitch{\filright} \or @@ -2376,7 +2433,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \end{macrocode} % \subsubsection{Sections font} % \begin{macrocode} -\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{partfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@PART@StyleSwitch{\relax} \or @@ -2384,7 +2442,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{chapfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@CHAP@StyleSwitch{\relax} \or @@ -2392,7 +2451,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{secfont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@SEC@StyleSwitch{\relax} \or @@ -2400,7 +2460,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{subsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@SUBSEC@StyleSwitch{\relax} \or @@ -2408,7 +2469,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{subsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@SUBSUBSEC@StyleSwitch{\relax} \or @@ -2420,7 +2482,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \paragraph{Small capitals style} % \begin{macrocode} \define@choicekey{}{smallcapsstyle}[\val\nr] -{low,upper}[low]{% + {low,upper}[low]{% \ifcase\nr\relax \def\suftesi@MakeTextLowercase{\MakeLowercase} \def\suftesi@MakeTextTOCLowercase{\lowercase} @@ -2433,7 +2495,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \paragraph{Part number style} % \begin{macrocode} \define@choicekey{}{partnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{} @@ -2456,8 +2518,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% % \end{macrocode} % \paragraph{Chapter number style} % \begin{macrocode} -\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman, -dotarabic,dotroman,dotRoman}[arabic]{% +\define@choicekey{}{chapnumstyle}[\val\nr] + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thechapter{\arabic{chapter}} \def\SUF@HEAD@thechapter{\arabic{chapter}} @@ -2493,7 +2555,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% % \paragraph{Section number style} % \begin{macrocode} \define@choicekey{}{secnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesection{\SUF@chapswitch\arabic{section}} \def\SUF@HEAD@thesection{\arabic{section}} @@ -2529,7 +2591,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% % \paragraph{Subsection number style} % \begin{macrocode} \define@choicekey{}{subsecnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}} \def\SUF@dotsubsec{} @@ -2559,7 +2621,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% % \paragraph{Sub-subsection number style} % \begin{macrocode} \define@choicekey{}{subsubsecnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}} \def\SUF@dotsubsubsec{} @@ -2589,8 +2651,8 @@ dotarabic,dotroman,dotRoman}[arabic]{% % \subsubsection{Table of contents} % \paragraph{Table of contents style} % \begin{macrocode} -\define@choicekey{}{tocstyle}[\val\nr]{% -standard,dotted,ragged,leftpage}[standard]{% +\define@choicekey{}{tocstyle}[\val\nr] + {standard,dotted,ragged,leftpage}[standard]{% \ifcase\nr\relax \def\SUF@titlerule{\titlerule*{}} \def\SUF@chaptitlerule{\titlerule*{}} @@ -2605,8 +2667,8 @@ standard,dotted,ragged,leftpage}[standard]{% \or \suftesi@pagelefttoctrue \fi} -\define@choicekey{}{compacttoc}[\val\nr]{% -sec,subsec,subsubsec}[sec]{% +\define@choicekey{}{compacttoc}[\val\nr] + {sec,subsec,subsubsec}[sec]{% \ifcase\nr\relax \suftesi@toccompactsectrue \suftesi@toccompactsubsectrue @@ -2629,8 +2691,8 @@ sec,subsec,subsubsec}[sec]{% \def\suf@ssscorrect{\relax} \def\suf@ctocdotsssec{.} \fi} -\define@choicekey{}{twocolcontents}[\val\nr]{% -toc,lof,lot,toclof,toclot,loflot,all}[all]{% +\define@choicekey{}{twocolcontents}[\val\nr] + {toc,lof,lot,toclof,toclot,loflot,all}[all]{% \ifcase\nr\relax \suftesi@twocolumntoctrue \setkeys{}{tocstyle=ragged} @@ -2657,20 +2719,21 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \suftesi@twocolumnloftrue \suftesi@twocolumnlottrue \setkeys{}{tocstyle=ragged} -\fi -} +\fi} % \end{macrocode} % \paragraph{Table of contents font} % \begin{macrocode} -\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocpartfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax - \def\SUF@tocPART@font{\relax} + \def\SUF@tocPART@font{\relax} \or - \def\SUF@tocPART@font{\itshape} + \def\SUF@tocPART@font{\itshape} \or - \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} + \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocchapfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocCHAP@font{\relax} \or @@ -2678,7 +2741,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{tocsecfont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@tocSEC@font{\relax} \or @@ -2686,7 +2750,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocSUBSEC@font{\relax} \or @@ -2694,7 +2759,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocsubsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocSUBSUBSEC@font{\relax} \or @@ -2702,7 +2768,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocauthorfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocAUT@font{\relax} \or @@ -2710,7 +2777,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{toctitlefont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@tocTIT@font{\relax} \or @@ -2723,8 +2791,7 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% % \paragraph{Header style} % \begin{macrocode} \define@choicekey{}{headerstyle}[\val\nr] - {inner,center,plain,authortitleinner, - authortitlecenter}[inner]{% + {inner,center,plain,authortitleinner,authortitlecenter}[inner]{% \ifcase\nr\relax \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} @@ -2776,7 +2843,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \define@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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% {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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% % \subsubsection{Other options} % \paragraph{Part page} % \begin{macrocode} -\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{% +\define@choicekey{}{partpage}[\val\nr] + {true,false}[true]{% \ifcase\nr\relax \suftesi@partpagetrue \or @@ -2898,9 +2966,9 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \fi} \define@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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \suftesi@periodicalaureotrue \suftesi@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@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@periodicalaureotrue \suftesi@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@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@periodicalaureotrue \suftesi@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@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@choicekey{}{papertitlestyle}[\val\nr]{% - left,center,right}[left]{% +\define@choicekey{}{papertitlestyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@coll@titleSwitch{\filright} \or @@ -3181,7 +3246,8 @@ quotesize,footnotestyle,liststyle,captionstyle} \or \relax \fi} -\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{titlefont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@titlefont@Switch{\relax} \or @@ -3189,7 +3255,8 @@ quotesize,footnotestyle,liststyle,captionstyle} \or \def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{authorfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@authorfont@Switch{\relax} \or @@ -3285,10 +3352,10 @@ quotesize,footnotestyle,liststyle,captionstyle} \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 @@ quotesize,footnotestyle,liststyle,captionstyle} \ifsuftesi@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 @@ quotesize,footnotestyle,liststyle,captionstyle} * 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 @@ quotesize,footnotestyle,liststyle,captionstyle} % A warning appears if the \opt{cbgreek} option is unused. % \begin{macrocode} \ifsuftesi@nofont - \ifsuftesi@greekfont - \ClassWarningNoLine{suftesi}{% - Unused 'greekfont' option}% - \suftesi@greekfontfalse - \else\suftesi@greekfontfalse\fi +\ifsuftesi@greekfont + \ClassWarningNoLine{suftesi}{% + Unused 'greekfont' option}% + \suftesi@greekfontfalse + \else\suftesi@greekfontfalse\fi \else \ifsuftesi@standard \RequirePackage{lmodern} @@ -3526,8 +3592,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \DeclareRobustCommand{\greektext}{% \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape} \def\encodingdefault{LGR}} - \DeclareTextFontCommand{\textgreek}{\greektext} -} + \DeclareTextFontCommand{\textgreek}{\greektext}} \ifsuftesi@cbgreek \else % \end{macrocode} @@ -3585,16 +3650,16 @@ quotesize,footnotestyle,liststyle,captionstyle} % \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@TOCtitlesmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextTOCLowercase{#1}} \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}} \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}} -\else% if pdftex +\else \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{% \scshape\suftesi@MakeTextTOCLowercase{\textls*{#1}}}% \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% @@ -3627,80 +3692,48 @@ quotesize,footnotestyle,liststyle,captionstyle} \fi} \def\SUF@default@SECTIONS{ \ifsuftesi@numparsec -% \titleformat{\section}[display] -% {\SUF@sectionsize\SUF@lr@SECSwitch} -% {\ifsuftesi@article\SUF@thesection -% \else\thesection\fi\SUF@dotsec} -% {0ex} -% {\SUF@SEC@StyleSwitch} -\titleformat{\section}[display] -{\SUF@sectionsize\SUF@lr@SECSwitch} -{\SUF@thesection\SUF@dotsec} -{0ex} -{\SUF@SEC@StyleSwitch} + \titleformat{\section}[display] + {\SUF@sectionsize\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} + {0ex} + {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else -% \titleformat{\section}[hang] -% {\SUF@sectionsize\SUF@lr@SECSwitch} -% {\ifsuftesi@article\SUF@thesection -% \else\thesection\fi\SUF@dotsec} -% {1em} -% {\SUF@SEC@StyleSwitch} -\titleformat{\section}[hang] -{\SUF@sectionsize\SUF@lr@SECSwitch} -{\SUF@thesection\SUF@dotsec} -{1em} -{\SUF@SEC@StyleSwitch} + \titleformat{\section}[hang] + {\SUF@sectionsize\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} + {1em} + {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsec -% \titleformat{\subsection}[display] -% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -% {\textnormal\thesubsection} -% {0ex} -% {\SUF@SUBSEC@StyleSwitch} -\titleformat{\subsection}[display] -{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -{\textnormal\SUF@thesubsection\SUF@dotsubsec} -{0ex} -{\SUF@SUBSEC@StyleSwitch} + \titleformat{\subsection}[display] + {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} + {\textnormal\SUF@thesubsection\SUF@dotsubsec} + {0ex} + {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] \else -% \titleformat{\subsection}[hang] -% {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -% {\textnormal\thesubsection} -% {1em} -% {\SUF@SUBSEC@StyleSwitch} -\titleformat{\subsection}[hang] -{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -{\textnormal\SUF@thesubsection\SUF@dotsubsec} -{1em} -{\SUF@SUBSEC@StyleSwitch} + \titleformat{\subsection}[hang] + {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} + {\textnormal\SUF@thesubsection\SUF@dotsubsec} + {1em} + {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsubsec -% \titleformat{\subsubsection}[display] -% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -% {\textnormal\thesubsubsection} -% {0ex} -% {\SUF@SUBSUBSEC@StyleSwitch} -\titleformat{\subsubsection}[display] -{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} -{0ex} -{\SUF@SUBSUBSEC@StyleSwitch} + \titleformat{\subsubsection}[display] + {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} + {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} + {0ex} + {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] \else -% \titleformat{\subsubsection}[hang] -% {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -% {\textnormal\thesubsubsection} -% {1em} -% {\SUF@SUBSUBSEC@StyleSwitch} -\titleformat{\subsubsection}[hang] -{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} -{1em} -{\SUF@SUBSUBSEC@StyleSwitch} + \titleformat{\subsubsection}[hang] + {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} + {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} + {1em} + {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi} \SUF@default@CHAPTER @@ -3746,103 +3779,103 @@ quotesize,footnotestyle,liststyle,captionstyle} % \begin{macrocode} \ifsuftesi@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@section} + \@arabic\c@section} \renewcommand\thesubsection{% - \thesection.\@arabic\c@subsection} + \thesection.\@arabic\c@subsection} \renewcommand\thesubsubsection{% - \thesubsection.\@arabic\c@subsubsection} + \thesubsection.\@arabic\c@subsubsection} \renewcommand\theparagraph{% - \thesubsubsection.\@arabic\c@paragraph} + \thesubsubsection.\@arabic\c@paragraph} \renewcommand\thesubparagraph{% - \theparagraph.\@arabic\c@subparagraph} + \theparagraph.\@arabic\c@subparagraph} % \end{macrocode} % \subsection*{The \cmd{part} command} % \begin{macrocode} \renewcommand\part{% - \ifsuftesi@partpage - \if@openright - \cleardoublepage - \else - \clearpage - \fi - \thispagestyle{plain}% - \fi - \if@twocolumn - \onecolumn - \@tempswatrue - \else - \@tempswafalse - \fi - \ifsuftesi@partpage - \null\vfil - \fi - \secdef\@part\@spart} + \ifsuftesi@partpage + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \thispagestyle{plain}% + \fi + \if@twocolumn + \onecolumn + \@tempswatrue + \else + \@tempswafalse + \fi + \ifsuftesi@partpage + \null\vfil + \fi + \secdef\@part\@spart} \fi \def\@part[#1]#2{% - \ifnum \c@secnumdepth >-2\relax - \refstepcounter{part}% - \addcontentsline{toc}{part}{\normalfont\normalsize - \SUF@tocpartname\hskip.5em{\SUF@tocPARTnum@font\SUF@thepart}% - \SUF@dotpart\hspace{1em}\SUF@tocPART@font#1}% - \else - \addcontentsline{toc}{part}{\normalfont\normalsize - \SUF@tocPART@font#1}% - \fi - \markboth{}{}% - {\SUF@lr@PARTSwitch\SUF@partsize - \interlinepenalty \@M - \ifnum \c@secnumdepth >-2\relax - \noindent\partname\hskip.5em{\SUF@PART@font\SUF@thepart}\SUF@dotpart - \ifsuftesi@numparpart - \par - \vskip2ex - \else - \hspace{1em} - \fi - \noindent\SUF@PART@StyleSwitch#2\par}% - \@endpart} + \ifnum \c@secnumdepth >-2\relax + \refstepcounter{part}% + \addcontentsline{toc}{part}{\normalfont\normalsize + \SUF@tocpartname\hskip.5em{\SUF@tocPARTnum@font\SUF@thepart}% + \SUF@dotpart\hspace{1em}\SUF@tocPART@font#1}% + \else + \addcontentsline{toc}{part}{\normalfont\normalsize + \SUF@tocPART@font#1}% + \fi + \markboth{}{}% + {\SUF@lr@PARTSwitch\SUF@partsize + \interlinepenalty \@M + \ifnum \c@secnumdepth >-2\relax + \noindent\partname\hskip.5em{\SUF@PART@font\SUF@thepart}\SUF@dotpart + \ifsuftesi@numparpart + \par + \vskip2ex + \else + \hspace{1em} + \fi + \noindent\SUF@PART@StyleSwitch#2\par}% + \@endpart} \def\@spart#1{% - {\SUF@lr@PARTSwitch\SUF@partsize - \interlinepenalty \@M - \noindent\SUF@PART@StyleSwitch#1\par}% - \@endpart} + {\SUF@lr@PARTSwitch\SUF@partsize + \interlinepenalty \@M + \noindent\SUF@PART@StyleSwitch#1\par}% + \@endpart} \ifsuftesi@article \def\@endpart{% - \ifsuftesi@partpage - \vfil\newpage - \if@twoside - \if@openright - \null - \thispagestyle{empty}% - \newpage - \fi - \fi - \fi - \if@tempswa - \twocolumn - \fi} + \ifsuftesi@partpage + \vfil\newpage + \if@twoside + \if@openright + \null + \thispagestyle{empty}% + \newpage + \fi + \fi + \fi + \if@tempswa + \twocolumn + \fi} \else \def\@endpart{\vfil\newpage - \if@twoside - \if@openright - \null - \thispagestyle{empty}% - \newpage - \fi - \fi - \if@tempswa - \twocolumn - \fi} + \if@twoside + \if@openright + \null + \thispagestyle{empty}% + \newpage + \fi + \fi + \if@tempswa + \twocolumn + \fi} \fi % \end{macrocode} % Other sublevels: @@ -3871,63 +3904,61 @@ quotesize,footnotestyle,liststyle,captionstyle} \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@twoside\markright{#1}\fi} + \section*{#1}% + \if@twoside\markright{#1}\fi} \defbibheading{subbibintoc}[\refname]{% - \section*{#1}% - \addcontentsline{toc}{section}{#1}% - \if@twoside\markright{#1}\fi} + \section*{#1}% + \addcontentsline{toc}{section}{#1}% + \if@twoside\markright{#1}\fi} \defbibheading{subbibnumbered}[\refname]{% - \section{#1}} -}% + \section{#1}}} {\relax}} \fi % \end{macrocode} @@ -4138,7 +4169,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \global\let\@date\@empty \global\let\date\relax \global\let\and\relax} - \def\@maketitle{% +\def\@maketitle{% \newpage \null \vskip 2em% @@ -4378,15 +4409,15 @@ quotesize,footnotestyle,liststyle,captionstyle} % {\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 @@ quotesize,footnotestyle,liststyle,captionstyle} \@collectioneditor \vspace*{\stretch{3}} - \endgroup + \endgroup \clearpage} % \end{macrocode} % In the collection document structure the articles are treated as @@ -4537,8 +4568,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \fi \if@tempswa \twocolumn - \fi -} + \fi} \renewcommand{\@sec@pppage}{% \par \addvspace{4ex}% @@ -4554,8 +4584,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \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 @@ quotesize,footnotestyle,liststyle,captionstyle} \SUF@tocSEC@font} {\ifsuftesi@article\SUF@chaptitlerule% \else\SUF@titlerule\fi\contentspage} - \fi -} + \fi} \ifsuftesi@article \renewcommand\appendix{\par \suf@appendixtoc% @@ -4693,8 +4721,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark} \fancyhead[CE]{\footnotesize\breakinbodyfalse% \SUF@LR@MarkSwitch} - \fancyfoot[C]{\footnotesize\SUF@thepage}% - }% + \fancyfoot[C]{\footnotesize\SUF@thepage}} % \end{macrocode} % \paragraph{The \opt{sufdefault} style} % \begin{macrocode} @@ -4705,20 +4732,18 @@ quotesize,footnotestyle,liststyle,captionstyle} \fancyhead[LE,RO]{\footnotesize\SUF@thepage} \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark} \fancyhead[RE]{\footnotesize\breakinbodyfalse% - \SUF@LR@MarkSwitch} - }% -% + \SUF@LR@MarkSwitch}} \ifsuftesi@article - \ifsuftesi@authortitle - \def\SUF@LR@MarkSwitch{\SUF@leftmark} - \else - \def\SUF@LR@MarkSwitch{\SUF@rightmark} - \fi + \ifsuftesi@authortitle + \def\SUF@LR@MarkSwitch{\SUF@leftmark} + \else + \def\SUF@LR@MarkSwitch{\SUF@rightmark} + \fi \else - \def\SUF@LR@MarkSwitch{\SUF@leftmark} + \def\SUF@LR@MarkSwitch{\SUF@leftmark} \fi \def\SUF@leftrightmark{% - \if@mainmatter\leftmark\else\rightmark\fi} + \if@mainmatter\leftmark\else\rightmark\fi} \pagestyle{sufdefault} \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi} @@ -4774,7 +4799,7 @@ quotesize,footnotestyle,liststyle,captionstyle} % 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 @@ quotesize,footnotestyle,liststyle,captionstyle} % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{todonotes}{% -\renewcommand{\@todonotes@drawMarginNoteWithLine}{% -\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]% - \node [coordinate] (inText) {};% -\end{tikzpicture}% -\oldmarginpar[{% Draw note in left margin - \@todonotes@drawMarginNote% - \@todonotes@drawLineToLeftMargin% -}]{% Draw note in right margin - \@todonotes@drawMarginNote% - \@todonotes@drawLineToRightMargin% -}% -}% -} + \renewcommand{\@todonotes@drawMarginNoteWithLine}{% + \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]% + \node [coordinate] (inText) {};% + \end{tikzpicture}% + \oldmarginpar[{% Draw note in left margin + \@todonotes@drawMarginNote% + \@todonotes@drawLineToLeftMargin% + }]{% Draw note in right margin + \@todonotes@drawMarginNote% + \@todonotes@drawLineToRightMargin% + } + } + } {\relax}} % \end{macrocode} % \paragraph{Abstract} @@ -4853,7 +4878,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \quotation \fi} {\if@twocolumn\else\endquotation\fi} -\fi + \fi \fi \newcommand\abstractname{Abstract} % \end{macrocode} @@ -4952,9 +4977,7 @@ Janusz M.~Nowacki. \newcommand*{\toclabelwidth}[2]{% \AtBeginDocument{ \addtolength{\csname SUF@label@#1\endcsname}{#2}% - \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}% - } -} + \addtolength{\csname SUF@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 @@ Janusz M.~Nowacki. % \begin{macrocode} \newlength{\SUF@tochang} \setlength{\SUF@tochang}{3em} -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@label@part \newlength\SUF@label@sec \newlength\SUF@label@subsec @@ -5003,8 +5026,7 @@ Janusz M.~Nowacki. \setlength\SUF@label@fig {\SUF@label@sec} \setlength\SUF@label@tab - {\SUF@label@sec} -} + {\SUF@label@sec}} % \end{macrocode} % \paragraph{Part etry} % The style of the part ToC entry the same in all ToC types, @@ -5027,7 +5049,7 @@ Janusz M.~Nowacki. % \begin{macrocode} \ifsuftesi@pagelefttoc \contentsmargin{0pt} -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@tochang@chap \newlength\SUF@tochang@sec \newlength\SUF@tochang@subsec @@ -5075,8 +5097,7 @@ Janusz M.~Nowacki. \setlength\SUF@addto@tochang@fig {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)} \setlength\SUF@addto@tochang@tab - {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)} -} + {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}} % \end{macrocode} % \paragraph{ToC entries} % \begin{macrocode} @@ -5187,7 +5208,7 @@ Janusz M.~Nowacki. % \end{macrocode} % \paragraph{Default ToC} % \begin{macrocode} -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@tocindent@chap \newlength\SUF@tocindent@sec \newlength\SUF@tocindent@subsec @@ -5228,8 +5249,7 @@ Janusz M.~Nowacki. {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)} \setlength\SUF@tocindent@tab {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)} -\fi -} +\fi} % \end{macrocode} % \paragraph{ToC entries} % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 4cf27c69715..2c74099654f 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -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@compatibility \newif\ifsuftesi@nofont @@ -121,8 +122,8 @@ \or \setkeys{}{structure=collection} \fi} -\define@choicekey{}{defaultfont}[\val\nr]{% -none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% +\define@choicekey{}{defaultfont}[\val\nr] + {none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% \ifcase\nr\relax \suftesi@nofonttrue \or @@ -136,8 +137,8 @@ none,cochineal,libertine,palatino,standard,compatibility}[cochineal]{% \or \suftesi@compatibilitytrue \fi} -\define@choicekey{}{mathfont}[\val\nr]{% -none,minimal,extended}[minimal]{% +\define@choicekey{}{mathfont}[\val\nr] + {none,minimal,extended}[minimal]{% \ifcase\nr\relax \suftesi@mathminimalfalse \suftesi@mathextendedfalse @@ -146,10 +147,10 @@ none,minimal,extended}[minimal]{% \or \suftesi@mathextendedtrue \fi} -\define@choicekey{}{greekfont}[\val\nr]{% -none,artemisia,porson,bodoni,cbgreek}[none]{% +\define@choicekey{}{greekfont}[\val\nr] + {none,artemisia,porson,bodoni,cbgreek}[none]{% \ifcase\nr\relax -\suftesi@greekfontfalse + \suftesi@greekfontfalse \or \suftesi@greekfonttrue\suftesi@artemisiatrue \or @@ -161,8 +162,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \fi} \RequirePackage{geometry} \define@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@partsize}{\Large} \DeclareRobustCommand{\SUF@chaptersize}{\Large} @@ -211,6 +212,23 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% marginparwidth= 26mm, marginparsep= 10pt} \or +\suftesi@periodicalaureotrue + \DeclareRobustCommand{\SUF@partsize}{\large} + \DeclareRobustCommand{\SUF@chaptersize}{\large} + \DeclareRobustCommand{\SUF@sectionsize}{\normalsize} + \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} + \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize} + \geometry{ + heightrounded, + includeheadfoot=true, + textwidth= 120mm, + textheight= 194mm, + paperwidth= 17cm, + paperheight= 24cm, + marginratio= 2:3, + marginparwidth= 62pt, + marginparsep= 10pt} +\or \suftesi@compacttrue \DeclareRobustCommand{\SUF@partsize}{\large} \DeclareRobustCommand{\SUF@chaptersize}{\large} @@ -278,23 +296,6 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% marginratio= 1:1, marginparwidth= 11mm, marginparsep= 7pt} -\or -\suftesi@periodicalaureotrue - \DeclareRobustCommand{\SUF@partsize}{\large} - \DeclareRobustCommand{\SUF@chaptersize}{\large} - \DeclareRobustCommand{\SUF@sectionsize}{\normalsize} - \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} - \DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize} - \geometry{ - heightrounded, - includeheadfoot=true, - textwidth= 120mm, - textheight= 194mm, - paperwidth= 17cm, - paperheight= 24cm, - marginratio= 2:3, - marginparwidth= 62pt, - marginparsep= 10pt} \or% pocketa \suftesi@supercompactaureotrue \DeclareRobustCommand{\SUF@partsize}{\large} @@ -321,16 +322,16 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \DeclareRobustCommand{\SUF@subsectionsize}{\normalsize} \DeclareRobustCommand{\SUF@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@supercompactaureotrue \DeclareRobustCommand{\SUF@partsize}{\large} @@ -350,8 +351,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% marginparwidth= 8mm, marginparsep= 7pt} \fi} -\define@choicekey{}{partstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{partstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@PARTSwitch{\filright} \or @@ -368,8 +369,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@PARTSwitch{\filleft} \suftesi@numparparttrue \fi} -\define@choicekey{}{chapstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{chapstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@CHAPSwitch{\filright} \or @@ -386,8 +387,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@CHAPSwitch{\filleft} \suftesi@numparchaptrue \fi} -\define@choicekey{}{secstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright}[left]{% +\define@choicekey{}{secstyle}[\val\nr] + {left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@SECSwitch{\filright} \or @@ -404,7 +405,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@lr@SECSwitch{\filleft} \suftesi@numparsectrue \fi} -\define@choicekey{}{subsecstyle}[\val\nr]{left,center,right}[left]{% +\define@choicekey{}{subsecstyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@SUBSECSwitch{\filright} \or @@ -412,7 +414,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@lr@SUBSECSwitch{\filleft} \fi} -\define@choicekey{}{subsubsecstyle}[\val\nr]{left,center,right}[left]{% +\define@choicekey{}{subsubsecstyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@SUBSUBSECSwitch{\filright} \or @@ -420,7 +423,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@lr@SUBSUBSECSwitch{\filleft} \fi} -\define@choicekey{}{partfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{partfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@PART@StyleSwitch{\relax} \or @@ -428,7 +432,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{chapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{chapfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@CHAP@StyleSwitch{\relax} \or @@ -436,7 +441,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{secfont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{secfont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@SEC@StyleSwitch{\relax} \or @@ -444,7 +450,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{subsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{subsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@SUBSEC@StyleSwitch{\relax} \or @@ -452,7 +459,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \or \def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{subsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{subsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@SUBSUBSEC@StyleSwitch{\relax} \or @@ -461,7 +469,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps} \fi} \define@choicekey{}{smallcapsstyle}[\val\nr] -{low,upper}[low]{% + {low,upper}[low]{% \ifcase\nr\relax \def\suftesi@MakeTextLowercase{\MakeLowercase} \def\suftesi@MakeTextTOCLowercase{\lowercase} @@ -470,7 +478,7 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\suftesi@MakeTextTOCLowercase{\relax} \fi} \define@choicekey{}{partnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{} @@ -490,8 +498,8 @@ none,artemisia,porson,bodoni,cbgreek}[none]{% \def\SUF@thepart{\Roman{part}} \def\SUF@dotpart{.} \fi} -\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman, -dotarabic,dotroman,dotRoman}[arabic]{% +\define@choicekey{}{chapnumstyle}[\val\nr] + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thechapter{\arabic{chapter}} \def\SUF@HEAD@thechapter{\arabic{chapter}} @@ -524,7 +532,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{secnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesection{\SUF@chapswitch\arabic{section}} \def\SUF@HEAD@thesection{\arabic{section}} @@ -557,7 +565,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{subsecnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}} \def\SUF@dotsubsec{} @@ -584,7 +592,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}} \fi} \define@choicekey{}{subsubsecnumstyle}[\val\nr] -{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% + {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% \ifcase\nr\relax \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}} \def\SUF@dotsubsubsec{} @@ -610,8 +618,8 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@dotsubsubsec{.} \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}} \fi} -\define@choicekey{}{tocstyle}[\val\nr]{% -standard,dotted,ragged,leftpage}[standard]{% +\define@choicekey{}{tocstyle}[\val\nr] + {standard,dotted,ragged,leftpage}[standard]{% \ifcase\nr\relax \def\SUF@titlerule{\titlerule*{}} \def\SUF@chaptitlerule{\titlerule*{}} @@ -626,8 +634,8 @@ standard,dotted,ragged,leftpage}[standard]{% \or \suftesi@pagelefttoctrue \fi} -\define@choicekey{}{compacttoc}[\val\nr]{% -sec,subsec,subsubsec}[sec]{% +\define@choicekey{}{compacttoc}[\val\nr] + {sec,subsec,subsubsec}[sec]{% \ifcase\nr\relax \suftesi@toccompactsectrue \suftesi@toccompactsubsectrue @@ -650,8 +658,8 @@ sec,subsec,subsubsec}[sec]{% \def\suf@ssscorrect{\relax} \def\suf@ctocdotsssec{.} \fi} -\define@choicekey{}{twocolcontents}[\val\nr]{% -toc,lof,lot,toclof,toclot,loflot,all}[all]{% +\define@choicekey{}{twocolcontents}[\val\nr] + {toc,lof,lot,toclof,toclot,loflot,all}[all]{% \ifcase\nr\relax \suftesi@twocolumntoctrue \setkeys{}{tocstyle=ragged} @@ -678,17 +686,18 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \suftesi@twocolumnloftrue \suftesi@twocolumnlottrue \setkeys{}{tocstyle=ragged} -\fi -} -\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\fi} +\define@choicekey{}{tocpartfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax - \def\SUF@tocPART@font{\relax} + \def\SUF@tocPART@font{\relax} \or - \def\SUF@tocPART@font{\itshape} + \def\SUF@tocPART@font{\itshape} \or - \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} + \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocchapfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocCHAP@font{\relax} \or @@ -696,7 +705,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocCHAP@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{tocsecfont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@tocSEC@font{\relax} \or @@ -704,7 +714,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocSUBSEC@font{\relax} \or @@ -712,7 +723,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocsubsubsecfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocSUBSUBSEC@font{\relax} \or @@ -720,7 +732,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{tocauthorfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{tocauthorfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocAUT@font{\relax} \or @@ -728,7 +741,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \or \def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} -\define@choicekey{}{toctitlefont}[\val\nr]{roman,italic,smallcaps}[italic]{% +\define@choicekey{}{toctitlefont}[\val\nr] + {roman,italic,smallcaps}[italic]{% \ifcase\nr\relax \def\SUF@tocTIT@font{\relax} \or @@ -737,8 +751,7 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \def\SUF@tocTIT@font{\expandafter\SUF@TOCtitlesmallcaps} \fi} \define@choicekey{}{headerstyle}[\val\nr] - {inner,center,plain,authortitleinner, - authortitlecenter}[inner]{% + {inner,center,plain,authortitleinner,authortitlecenter}[inner]{% \ifcase\nr\relax \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} @@ -783,7 +796,8 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \define@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,20 +857,20 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% {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@choicekey{}{marginpar}[\val\nr] {true,false}[true]{% \ifcase\nr\relax \or \renewcommand\marginpar[2][]{} \fi} -\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{% +\define@choicekey{}{partpage}[\val\nr] + {true,false}[true]{% \ifcase\nr\relax \suftesi@partpagetrue \or @@ -883,9 +897,9 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \fi} \define@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 @@ toc,lof,lot,toclof,toclot,loflot,all}[all]{% \suftesi@periodicalaureotrue \suftesi@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@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@periodicalaureotrue \suftesi@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@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@periodicalaureotrue \suftesi@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@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@choicekey{}{papertitlestyle}[\val\nr]{% - left,center,right}[left]{% +\define@choicekey{}{papertitlestyle}[\val\nr] + {left,center,right}[left]{% \ifcase\nr\relax \def\SUF@lr@coll@titleSwitch{\filright} \or @@ -1145,7 +1156,8 @@ quotesize,footnotestyle,liststyle,captionstyle} \or \relax \fi} -\define@choicekey{}{titlefont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{titlefont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@titlefont@Switch{\relax} \or @@ -1153,7 +1165,8 @@ quotesize,footnotestyle,liststyle,captionstyle} \or \def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps} \fi} -\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +\define@choicekey{}{authorfont}[\val\nr] + {roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@authorfont@Switch{\relax} \or @@ -1231,10 +1244,10 @@ quotesize,footnotestyle,liststyle,captionstyle} \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@FSPL \RequirePackage{cclicenses} \else @@ -1244,8 +1257,8 @@ quotesize,footnotestyle,liststyle,captionstyle} \ifsuftesi@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 @@ quotesize,footnotestyle,liststyle,captionstyle} * 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@nofont - \ifsuftesi@greekfont - \ClassWarningNoLine{suftesi}{% - Unused 'greekfont' option}% - \suftesi@greekfontfalse - \else\suftesi@greekfontfalse\fi +\ifsuftesi@greekfont + \ClassWarningNoLine{suftesi}{% + Unused 'greekfont' option}% + \suftesi@greekfontfalse + \else\suftesi@greekfontfalse\fi \else \ifsuftesi@standard \RequirePackage{lmodern} @@ -1445,8 +1457,7 @@ quotesize,footnotestyle,liststyle,captionstyle} \DeclareRobustCommand{\greektext}{% \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape} \def\encodingdefault{LGR}} - \DeclareTextFontCommand{\textgreek}{\greektext} -} + \DeclareTextFontCommand{\textgreek}{\greektext}} \ifsuftesi@cbgreek \else \DeclareFontFamily{LGR}{bodoni}{} @@ -1494,16 +1505,16 @@ quotesize,footnotestyle,liststyle,captionstyle} \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@TOCtitlesmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextTOCLowercase{#1}} \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}} \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}} -\else% if pdftex +\else \DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{% \scshape\suftesi@MakeTextTOCLowercase{\textls*{#1}}}% \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% @@ -1533,48 +1544,48 @@ quotesize,footnotestyle,liststyle,captionstyle} \fi} \def\SUF@default@SECTIONS{ \ifsuftesi@numparsec -\titleformat{\section}[display] -{\SUF@sectionsize\SUF@lr@SECSwitch} -{\SUF@thesection\SUF@dotsec} -{0ex} -{\SUF@SEC@StyleSwitch} + \titleformat{\section}[display] + {\SUF@sectionsize\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} + {0ex} + {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else -\titleformat{\section}[hang] -{\SUF@sectionsize\SUF@lr@SECSwitch} -{\SUF@thesection\SUF@dotsec} -{1em} -{\SUF@SEC@StyleSwitch} + \titleformat{\section}[hang] + {\SUF@sectionsize\SUF@lr@SECSwitch} + {\SUF@thesection\SUF@dotsec} + {1em} + {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsec -\titleformat{\subsection}[display] -{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -{\textnormal\SUF@thesubsection\SUF@dotsubsec} -{0ex} -{\SUF@SUBSEC@StyleSwitch} + \titleformat{\subsection}[display] + {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} + {\textnormal\SUF@thesubsection\SUF@dotsubsec} + {0ex} + {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em] \else -\titleformat{\subsection}[hang] -{\SUF@subsectionsize\SUF@lr@SUBSECSwitch} -{\textnormal\SUF@thesubsection\SUF@dotsubsec} -{1em} -{\SUF@SUBSEC@StyleSwitch} + \titleformat{\subsection}[hang] + {\SUF@subsectionsize\SUF@lr@SUBSECSwitch} + {\textnormal\SUF@thesubsection\SUF@dotsubsec} + {1em} + {\SUF@SUBSEC@StyleSwitch} \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi \ifsuftesi@numparsubsubsec -\titleformat{\subsubsection}[display] -{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} -{0ex} -{\SUF@SUBSUBSEC@StyleSwitch} + \titleformat{\subsubsection}[display] + {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} + {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} + {0ex} + {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em] \else -\titleformat{\subsubsection}[hang] -{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} -{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} -{1em} -{\SUF@SUBSUBSEC@StyleSwitch} + \titleformat{\subsubsection}[hang] + {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch} + {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec} + {1em} + {\SUF@SUBSUBSEC@StyleSwitch} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi} \SUF@default@CHAPTER @@ -1614,100 +1625,100 @@ quotesize,footnotestyle,liststyle,captionstyle} \fi \ifsuftesi@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@section} + \@arabic\c@section} \renewcommand\thesubsection{% -\thesection.\@arabic\c@subsection} + \thesection.\@arabic\c@subsection} \renewcommand\thesubsubsection{% -\thesubsection.\@arabic\c@subsubsection} + \thesubsection.\@arabic\c@subsubsection} \renewcommand\theparagraph{% -\thesubsubsection.\@arabic\c@paragraph} + \thesubsubsection.\@arabic\c@paragraph} \renewcommand\thesubparagraph{% -\theparagraph.\@arabic\c@subparagraph} + \theparagraph.\@arabic\c@subparagraph} \renewcommand\part{% -\ifsuftesi@partpage -\if@openright -\cleardoublepage -\else -\clearpage -\fi -\thispagestyle{plain}% -\fi -\if@twocolumn -\onecolumn -\@tempswatrue -\else -\@tempswafalse -\fi -\ifsuftesi@partpage -\null\vfil -\fi -\secdef\@part\@spart} + \ifsuftesi@partpage + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \thispagestyle{plain}% + \fi + \if@twocolumn + \onecolumn + \@tempswatrue + \else + \@tempswafalse + \fi + \ifsuftesi@partpage + \null\vfil + \fi + \secdef\@part\@spart} \fi \def\@part[#1]#2{% -\ifnum \c@secnumdepth >-2\relax -\refstepcounter{part}% -\addcontentsline{toc}{part}{\normalfont\normalsize -\SUF@tocpartname\hskip.5em{\SUF@tocPARTnum@font\SUF@thepart}% -\SUF@dotpart\hspace{1em}\SUF@tocPART@font#1}% -\else -\addcontentsline{toc}{part}{\normalfont\normalsize -\SUF@tocPART@font#1}% -\fi -\markboth{}{}% -{\SUF@lr@PARTSwitch\SUF@partsize -\interlinepenalty \@M -\ifnum \c@secnumdepth >-2\relax -\noindent\partname\hskip.5em{\SUF@PART@font\SUF@thepart}\SUF@dotpart -\ifsuftesi@numparpart -\par -\vskip2ex -\else -\hspace{1em} -\fi -\noindent\SUF@PART@StyleSwitch#2\par}% -\@endpart} + \ifnum \c@secnumdepth >-2\relax + \refstepcounter{part}% + \addcontentsline{toc}{part}{\normalfont\normalsize + \SUF@tocpartname\hskip.5em{\SUF@tocPARTnum@font\SUF@thepart}% + \SUF@dotpart\hspace{1em}\SUF@tocPART@font#1}% + \else + \addcontentsline{toc}{part}{\normalfont\normalsize + \SUF@tocPART@font#1}% + \fi + \markboth{}{}% + {\SUF@lr@PARTSwitch\SUF@partsize + \interlinepenalty \@M + \ifnum \c@secnumdepth >-2\relax + \noindent\partname\hskip.5em{\SUF@PART@font\SUF@thepart}\SUF@dotpart + \ifsuftesi@numparpart + \par + \vskip2ex + \else + \hspace{1em} + \fi + \noindent\SUF@PART@StyleSwitch#2\par}% + \@endpart} \def\@spart#1{% -{\SUF@lr@PARTSwitch\SUF@partsize -\interlinepenalty \@M -\noindent\SUF@PART@StyleSwitch#1\par}% -\@endpart} + {\SUF@lr@PARTSwitch\SUF@partsize + \interlinepenalty \@M + \noindent\SUF@PART@StyleSwitch#1\par}% + \@endpart} \ifsuftesi@article \def\@endpart{% -\ifsuftesi@partpage -\vfil\newpage -\if@twoside -\if@openright -\null -\thispagestyle{empty}% -\newpage -\fi -\fi -\fi -\if@tempswa -\twocolumn -\fi} + \ifsuftesi@partpage + \vfil\newpage + \if@twoside + \if@openright + \null + \thispagestyle{empty}% + \newpage + \fi + \fi + \fi + \if@tempswa + \twocolumn + \fi} \else \def\@endpart{\vfil\newpage -\if@twoside -\if@openright -\null -\thispagestyle{empty}% -\newpage -\fi -\fi -\if@tempswa -\twocolumn -\fi} + \if@twoside + \if@openright + \null + \thispagestyle{empty}% + \newpage + \fi + \fi + \if@tempswa + \twocolumn + \fi} \fi \titleformat{\paragraph}[runin] {} @@ -1727,63 +1738,61 @@ using 'structure=article'}} \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@twoside\markright{#1}\fi} + \section*{#1}% + \if@twoside\markright{#1}\fi} \defbibheading{subbibintoc}[\refname]{% -\section*{#1}% -\addcontentsline{toc}{section}{#1}% -\if@twoside\markright{#1}\fi} + \section*{#1}% + \addcontentsline{toc}{section}{#1}% + \if@twoside\markright{#1}\fi} \defbibheading{subbibnumbered}[\refname]{% -\section{#1}} -}% + \section{#1}}} {\relax}} \fi \newcommand{\Ctitle}[1]{\def\@Ctitle{#1}} @@ -1977,7 +1986,7 @@ using 'structure=article'}} \global\let\@date\@empty \global\let\date\relax \global\let\and\relax} - \def\@maketitle{% +\def\@maketitle{% \newpage \null \vskip 2em% @@ -2191,15 +2200,15 @@ using 'structure=article'}} \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 @@ using 'structure=article'}} \@collectioneditor \vspace*{\stretch{3}} - \endgroup + \endgroup \clearpage} \setcounter{tocdepth}{0} \renewcommand\thesection{% @@ -2331,8 +2340,7 @@ using 'structure=article'}} \fi \if@tempswa \twocolumn - \fi -} + \fi} \renewcommand{\@sec@pppage}{% \par \addvspace{4ex}% @@ -2348,8 +2356,7 @@ using 'structure=article'}} \fi \nobreak \vskip 3ex - \@afterheading -} + \@afterheading} \def\suf@appendixtoc{% \ifsuftesi@pagelefttoc \titlecontents{chapter} @@ -2410,8 +2417,7 @@ using 'structure=article'}} \SUF@tocSEC@font} {\ifsuftesi@article\SUF@chaptitlerule% \else\SUF@titlerule\fi\contentspage} - \fi -} + \fi} \ifsuftesi@article \renewcommand\appendix{\par \suf@appendixtoc% @@ -2458,8 +2464,7 @@ using 'structure=article'}} \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark} \fancyhead[CE]{\footnotesize\breakinbodyfalse% \SUF@LR@MarkSwitch} - \fancyfoot[C]{\footnotesize\SUF@thepage}% - }% + \fancyfoot[C]{\footnotesize\SUF@thepage}} \fancypagestyle{sufdefault}{% \fancyhf{}% \fancyfoot[RE,LO]{% @@ -2467,19 +2472,18 @@ using 'structure=article'}} \fancyhead[LE,RO]{\footnotesize\SUF@thepage} \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark} \fancyhead[RE]{\footnotesize\breakinbodyfalse% - \SUF@LR@MarkSwitch} - }% + \SUF@LR@MarkSwitch}} \ifsuftesi@article - \ifsuftesi@authortitle - \def\SUF@LR@MarkSwitch{\SUF@leftmark} - \else - \def\SUF@LR@MarkSwitch{\SUF@rightmark} - \fi + \ifsuftesi@authortitle + \def\SUF@LR@MarkSwitch{\SUF@leftmark} + \else + \def\SUF@LR@MarkSwitch{\SUF@rightmark} + \fi \else - \def\SUF@LR@MarkSwitch{\SUF@leftmark} + \def\SUF@LR@MarkSwitch{\SUF@leftmark} \fi \def\SUF@leftrightmark{% - \if@mainmatter\leftmark\else\rightmark\fi} + \if@mainmatter\leftmark\else\rightmark\fi} \pagestyle{sufdefault} \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi} @@ -2521,7 +2525,7 @@ using 'structure=article'}} \def\thefootnote{\@fnsymbol\c@footnote}% \else\fi \newcommand*\xfootnote[1][*]{% - \xdef\@thefnmark{#1}% + \xdef\@thefnmark{#1}% \@footnotemark\@footnotetext} \def\SUF@mpsetup{% \itshape @@ -2536,19 +2540,19 @@ using 'structure=article'}} {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}} \AtBeginDocument{% \@ifpackageloaded{todonotes}{% -\renewcommand{\@todonotes@drawMarginNoteWithLine}{% -\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]% - \node [coordinate] (inText) {};% -\end{tikzpicture}% -\oldmarginpar[{% Draw note in left margin - \@todonotes@drawMarginNote% - \@todonotes@drawLineToLeftMargin% -}]{% Draw note in right margin - \@todonotes@drawMarginNote% - \@todonotes@drawLineToRightMargin% -}% -}% -} + \renewcommand{\@todonotes@drawMarginNoteWithLine}{% + \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]% + \node [coordinate] (inText) {};% + \end{tikzpicture}% + \oldmarginpar[{% Draw note in left margin + \@todonotes@drawMarginNote% + \@todonotes@drawLineToLeftMargin% + }]{% Draw note in right margin + \@todonotes@drawMarginNote% + \@todonotes@drawLineToRightMargin% + } + } + } {\relax}} \ifsuftesi@collection \newenvironment{abstract}{% @@ -2585,7 +2589,7 @@ using 'structure=article'}} \quotation \fi} {\if@twocolumn\else\endquotation\fi} -\fi + \fi \fi \newcommand\abstractname{Abstract} \newcommand{\colophon}[3][]{% @@ -2669,9 +2673,7 @@ Janusz M.~Nowacki. \newcommand*{\toclabelwidth}[2]{% \AtBeginDocument{ \addtolength{\csname SUF@label@#1\endcsname}{#2}% - \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}% - } -} + \addtolength{\csname SUF@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 @@ Janusz M.~Nowacki. See package documentation for details}} \newlength{\SUF@tochang} \setlength{\SUF@tochang}{3em} -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@label@part \newlength\SUF@label@sec \newlength\SUF@label@subsec @@ -2710,11 +2712,10 @@ Janusz M.~Nowacki. \setlength\SUF@label@fig {\SUF@label@sec} \setlength\SUF@label@tab - {\SUF@label@sec} -} + {\SUF@label@sec}} \ifsuftesi@pagelefttoc \contentsmargin{0pt} -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@tochang@chap \newlength\SUF@tochang@sec \newlength\SUF@tochang@subsec @@ -2762,8 +2763,7 @@ Janusz M.~Nowacki. \setlength\SUF@addto@tochang@fig {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)} \setlength\SUF@addto@tochang@tab - {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)} -} + {\dimexpr(\SUF@addto@tochang@chap-\SUF@label@sec+\SUF@label@chap)}} \titlecontents{chapter} [\SUF@tochang@chap] {\addvspace{2ex}} @@ -2865,7 +2865,7 @@ Janusz M.~Nowacki. {} {} \else -\AtBeginDocument{ +\AtBeginDocument{% \newlength\SUF@tocindent@chap \newlength\SUF@tocindent@sec \newlength\SUF@tocindent@subsec @@ -2906,8 +2906,7 @@ Janusz M.~Nowacki. {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)} \setlength\SUF@tocindent@tab {\dimexpr(\SUF@tocindent@chap+\SUF@label@sec-\SUF@label@chap)} -\fi -} +\fi} \titlecontents{chapter} [\SUF@tocindent@chap] {\addvspace{2ex}} |