diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-23 00:33:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-23 00:33:25 +0000 |
commit | 4275fd1f5f1c2cff545b6cb0d09b72312eef0d28 (patch) | |
tree | 2957c947cab3e808c9edf10c6701decdcf796020 /Master/texmf-dist/source/latex | |
parent | a8a5cd95f8579ad571b843b95df2eb434bb709c3 (diff) |
suftesi (22feb20)
git-svn-id: svn://tug.org/texlive/trunk@53876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/suftesi/suftesi.dtx | 581 |
1 files changed, 344 insertions, 237 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx index 618a3c3e47e..6f35771eab2 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx @@ -67,30 +67,58 @@ %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<class>\ProvidesClass{suftesi} %<*class> - [2020/02/11 v2.9.6a A class for typesetting theses, books and articles] + [2020/02/22 v2.9.7 A class for typesetting theses, books and articles] %</class> %<*driver> -\documentclass{ltxdoc} - +\documentclass[10pt]{ltxdoc} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage[greek.ancient,english]{babel} +% fonts and colors +\usepackage{cochineal} +\usepackage[varqu,varl,var0]{inconsolata} +\usepackage{biolinum} +\usepackage{amsthm} +\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} +\usepackage[cal=boondoxo]{mathalfa} +\usepackage[svgnames]{xcolor} +\definecolor{philA}{named}{DarkRed} +\definecolor{philB}{named}{NavyBlue} + \definecolor{sufred}{rgb}{0.5,0,0} +\definecolor{sufgray}{rgb}{0.5,0.5,0.5} +\usepackage{metalogo} +\usepackage{guit} \usepackage[final]{microtype} +% doc facilities +\let\cs\relax +\let\cmd\relax +\usepackage{ltxdockit} \usepackage{siunitx} % To use the cochineal inside the document we have to define the family % because the .fd files of the font refer to conditionals % defined in 'cochineal.sty’: \DeclareFontFamily{T1}{Cochineal-LF}{} \DeclareFontShape{T1}{Cochineal-LF}{m}{n}{ - <-> s*[1.0] Cochineal-Roman-osf-t1}{} -% Doc facilities -\let\cs\relax -\let\cmd\relax -\usepackage{ltxdockit} + <-> s*[1.0] Cochineal-Roman-osf-t1}{} +% layout +\setcounter{tocdepth}{3} +\usepackage{geometry} +\geometry{a4paper, + margin=3cm, + headheight=15pt, + ignoreall, + heightrounded} +\usepackage{sectsty} +\allsectionsfont{\sffamily} +\usepackage{fancyhdr} +\fancyhf{} +\fancyhead[L]{© 2009--\the\year\quad Ivan Valbusa} +\fancyfoot[L]{\textsf{suftesi} + \fileversion{} -- \filedate} +\renewcommand{\footrulewidth}{0.4pt} +\fancyhead[R]{\thepage} +\pagestyle{fancy} % Graphics -\usepackage[svgnames]{xcolor} - \definecolor{sufred}{rgb}{0.5,0,0} - \definecolor{sufgray}{rgb}{0.5,0.5,0.5} \usepackage[framemethod=TikZ]{mdframed} \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10} \usepackage{tikz} @@ -100,12 +128,6 @@ \usepackage{array} \usepackage{booktabs} \usepackage{multirow} -% -\usepackage{fancyhdr} -\fancyhf{} -\fancyfoot[C]{\iffloatpage{}{\thepage}} -\renewcommand\headrulewidth{0pt} -\pagestyle{fancy} % Bibliography \usepackage[autostyle]{csquotes} \usepackage[style=philosophy-classic,backend=biber]{biblatex} @@ -125,6 +147,7 @@ { \fontfamily{#2}\fontsize{#4}{13}\selectfont% \textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}} % New commands +\newcommand{\new}{\marginpar{\textcolor{red}{\textbf{NEW!}}}} \newcommand{\argstyle}{\itshape} \DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}} \DeclareRobustCommand*{\oar}[1]{\texttt{[}\textrm{\argstyle#1}\texttt{]}} @@ -136,11 +159,9 @@ \newenvironment{ttquote} {\begin{mdframed}[default] \ttfamily\microtypesetup{activate=false}} - {\end{mdframed} - } + {\end{mdframed}} \newenvironment{latexcode} - {\begin{mdframed}[default] - } + {\begin{mdframed}[default]} {\end{mdframed}} % Correct (?) \optitem to use \meta inside #2 \makeatletter @@ -149,20 +170,75 @@ {\ltd@option{}{#2}{#3}{}} {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}% \makeatother +\makeatletter + +\def\ltd@textverb#1{\,#1\,} + +\renewenvironment*{optionlist} +{\list{}{% + \setlength{\labelwidth}{2.5cm}% + \setlength{\labelsep}{\z@}% + \setlength{\leftmargin}{2.5cm}% + \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}% + \ltd@optionlist} +{\endlist} +\renewenvironment*{ltxsyntax}[1][3cm] +{\list{}{% + \setlength{\labelwidth}{3cm}% + \setlength{\labelsep}{0pt}% + \setlength{\leftmargin}{#1}% + \renewcommand*{\makelabel}[1]{% + \hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}% + \let\csitem\ltd@csitem + \let\cmditem\ltd@cmditem + \let\envitem\ltd@envitem + \let\lenitem\ltd@csitem + \let\boolitem\ltd@boolitem + \let\cntitem\ltd@item + \let\optitem\ltd@item} +{\endlist} +{\endlist} +\renewenvironment*{valuelist}[1][] +{\list{}{% + \ifblank{#1} + {\setlength{\labelwidth}{5em}} + {\setlength{\labelwidth}{#1}}% + \setlength{\labelsep}{1em}% + \setlength{\leftmargin}{\labelwidth}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{0pt}% + \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}} +{\endlist} +\newcommand*{\valuelistfont}{% + \color{olive}\sffamily\displayverbfont} +\renewcommand*{\optionlistfont}{% + \color{philA}\sffamily\displayverbfont} +\renewcommand*{\ltxsyntaxlabelfont}{% + \color{philA}\sffamily\displayverbfont} +\renewcommand*{\marglistfont}{% + \color{philA}\sffamily\displayverbfont} +% Table of contents +\renewcommand\tableofcontents{% + \setlength{\columnsep}{1cm} + {\centering + \section*{\contentsname}% + \@mkboth{\contentsname}{\contentsname}} + \thispagestyle{empty} + \begin{multicols}{2} + \@starttoc{toc}% +\end{multicols}} +\makeatother + % hyperref setup \usepackage{hyperref} \hypersetup{% + hidelinks, pdftitle={User's Guide to \textsf{suftesi}}, pdfsubject={A document class for typesetting theses, books and articles}, pdfauthor={Ivan Valbusa}, pdfkeywords={thesis, humanities, books}} -% Informations -\author{Ivan Valbusa\thanks{Dipartimento di Scienze Umane, Università degli Studi di Verona --- - \texttt{ivan dot valbusa at univr dot it}}} -\title{\vspace*{-\baselineskip}User's Guide to \textsf{suftesi}\\ - \large A document class for typesetting\\ theses, books and articles} -\date{\fileversion{} -- \filedate} + \EnableCrossrefs \CodelineIndex @@ -175,7 +251,7 @@ %</driver> % \fi % -% \CheckSum{5283} +% \CheckSum{5286} % % \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 @@ -193,6 +269,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v2.9.7}{2020/02/22}{New option \opt{fontisize}. The \opt{parindent} options now accepts arbitrary values. Updated documentation.} % \changes{v2.9.6a}{2020/02/11}{Maintenance release} % \changes{v2.9.6}{2020/02/10}{New option \opt{compacttoc}. The appendix page title is printed in the font of the chapters by default. Removed \cmd{apepndicesname} command.} % \changes{v2.9.5}{2020/02/04}{Restored \texttt{templates} folder. New template \texttt{book-customize}. New mechanism for the appendices through the \sty{appendix} package.} @@ -284,8 +361,19 @@ % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr} % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand} % -%\maketitle -% +% \begin{center} + % {\color{philA}\bfseries + % \Huge User's Guide to \textsf{suftesi}\\[3mm]} + % {\large\itshape A document class for typesetting theses, books and articles} + %\vspace{.8cm} + % + % \normalsize\fileversion{} -- \filedate + % \vspace{.7cm} + % + % Ivan Valbusa\\[2mm] + % \footnotesize\texttt{ivan dot valbusa at univr dot it} + % \vspace{1cm} + % \end{center} % \begin{abstract} % The standard document classes allow you to typeset beautiful % documents but their layout is quite far from the stylistic requests @@ -298,9 +386,8 @@ % \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and % \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}. % \end{abstract} -%\begin{multicols}{2} +% % \tableofcontents -%\end{multicols} % % \section*{Legalese} % @@ -320,7 +407,7 @@ % the layout redefinitions. % % -% \section*{A brief history}\thispagestyle{empty} +% \section*{A brief history} % % The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona. % @@ -344,27 +431,18 @@ % \cmd{documentclass}\oarm{options}\{suftesi\} % \end{ttquote} % All the options defined by the class are in the \meta{key}=\meta{value} format. -% ^^A \begin{verbatim} -% ^^A \cmd{documentclass}[\\ -% ^^A \opt{pagelayout=periodical},\\ -% ^^A \opt{chapfont=roman},\\ -% ^^A \opt{tocstyle=ragged},\\ -% ^^A \opt{marginpar=false},\\ -% ^^A ...\\ -% ^^A ]\ar{suftesi} -% ^^A \end{verbatim} +% % In addition to these you can also use the options defined by the standard \sty{book} class (on which \sty{suftesi} is based) except those modifying % the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper}, \opt{legalpaper}, \opt{executivepaper} and \opt{landscape}), which are automatically disabled. The class loads the packages listed in table \ref{tab:pkgloaded}. -% +% \subsection*{Using with Xe\LaTeX and Lua\LaTeX} % For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX) and to select a main font. % % %\begin{table}[h] %\centering -%\fontsize{9.5}{11.5}\selectfont -%\begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{7.6cm}} +%\begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}} %\toprule -%&\textrm{Global}& appendix, {caption}, {color}, {crop}, {enumitem}, {emptypage}, {extramarks}, +%&\textrm{Global}& appendix, {caption}, {color}, {crop}, {enumitem}, {emptypage}, %{fancyhdr}, {fixltxhyph}, {fontenc}, {geometry}, {iftex}, %{microtype}, {multicol}, {titlesec}, {titletoc}, {xkeyval}, (cclicenses)\\\midrule %&\textrm{pdf\LaTeX{} only}&fontenc, substitutefont\\\midrule @@ -396,8 +474,8 @@ % %\begin{ttquote} %\cmd{documentclass}[structure=\meta{value},\meta{options}]\{suftesi\} -%^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\ -%^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\} +% ^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\ +% ^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\} %\end{ttquote} % % \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. It is not compatible with \sty{crop}.} @@ -408,37 +486,56 @@ % % \begin{table}[h] %\centering -%\makebox[\textwidth][c]{\begin{tabular}{@{}lcccccccc@{}} +%\begin{tabular}{lcccccccl} %\toprule %&\multicolumn{4}{c}{Dimensions (mm)}&\multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){6-9} %&\multicolumn{2}{c}{Typeblock}&\multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}&\multicolumn{2}{c}{Stock}\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9} %Layout &w & h& w& h&t\,/\,b&i\,/\,o&Typeblock& Page\\\cmidrule(r){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}\cmidrule(r){1-1} -%\opt{standard} & 110& 220& 210& 297&$1:2$&$1:2$&$1:2$&$1:\kern-3pt\sqrt{2}$\\ -%\opt{standardaureo} & 136& 220& 210& 297&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\kern-3pt\sqrt{2}$\\ +%\opt{standard} & 110& 220& 210& 297&$1:2$&$1:2$&$1:2$&$1:\sqrt{2}$\\ +%\opt{standardaureo} & 136& 220& 210& 297&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\sqrt{2}$\\ %\opt{compact}& 110& 165& 160& 240&$2:3$&$2:3$&$2:3$&$2:3$\\ %\opt{compactaureo}& 118& 191& 160& 240&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$2:3$\\ %\opt{supercompact}& 100 &150& 140& 210&$2:3$&$2:3$&$2:3$&$2:3$\\ %\opt{supercompactaureo}& 108 &175& 140& 210&$1:1$&$1:1$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$2:3$\\ -%\opt{periodical} &110& 165& 170& 240&$2:3$&$2:3$&$2:3$&$1:\kern-3pt\sqrt{2}$\\ -%\opt{periodicalaureo}& 120& 194& 170& 240&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\kern-3pt\sqrt{2}$\\ +%\opt{periodical} &110& 165& 170& 240&$2:3$&$2:3$&$2:3$&$1:\sqrt{2}$\\ +%\opt{periodicalaureo}& 120& 194& 170& 240&$2:3$&$2:3$&$5:8$\makebox[0pt]{\ \textsuperscript{*}}&$1:\sqrt{2}$\\ % % \bottomrule\\[-2ex] % \multicolumn{9}{r}{\footnotesize\textsuperscript{*} $5:8\approx 1:1,618$} -%\end{tabular}}\\[-3ex] +%\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} +% +%You can define your own layouts through the \cmd{geometry} command and you can change the value of \cmd{baselineskip} too. For example you can resize the typeblock of the \texttt{supercompactaureo} layout to fit your particular needs. In this case remember to declare \cmd{normalsize} like in the following example: +%\begin{latexcode} +%\begin{verbatim} +%\linespread{0.95} +%\normalsize +%\geometry{ +%textheight= 162mm, +%textwidth= 100mm, +%paperwidth= 140mm, +%paperheight= 210mm, +%hmarginratio= 2:3, +%vmarginratio= 1:1, +%marginparwidth= 11mm, +%marginparsep= 7pt, +%ignoreall, +%heightrounded} +%\end{verbatim} +%\end{latexcode}% +% ^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}. +% +% ^^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} % % \subsection{Fonts} % @@ -449,7 +546,9 @@ %The \opt{defaultfont} option allows you to can change the default roman font to New PX (Palatino-like), Linux Libertine O, or Latin modern. %You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} option which turns off the default font settings (see section \ref{sec:options} for details). % -%Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at +%Today there are several Garamond-like fonts in TeX Live distribution. See, for example \textit{Garamond Libre} (Open Type only) and \textit{Cormorant Garamond}. The Bembo-like fonts \textit{Etbb} and \textit{fbb} should also be considered if you appreciate humanist fonts. In any case, before using a font, read the license carefully. + +%Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at %\url{http://tug.org/fonts/getnonfreefonts/}. % % @@ -458,56 +557,56 @@ % The class loads by default a ‘minimal’ mathematical support for Cochineal (default), Linux Libertine O or New PX via the \sty{newtxmath} or \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. These non-standard fonts have a very good mathematical support but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details. % % If some of the loaded packages conflict or if you simply want to change some of the default font settings you should first reset the font default with \opt{defaultfont=none} option and then load the packages in the right order and with your favorite options. -%^^AFor example, these are the codes loaded for the three non-standard fonts: -%^^A -%^^A\paragraph{defaultfont=cochineal} -%^^A -%^^A\begin{latexcode} -%^^A\begin{verbatim} -%^^A\documentclass[defaultfont=none]{suftesi} -%^^A... -%^^A\usepackage{textcomp} -%^^A\usepackage{cochineal} -%^^A\usepackage[varqu,varl,var0]{inconsolata} -%^^A\usepackage{biolinum} -%^^A\usepackage{cochineal} -%^^A\usepackage{amsthm} -%^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} -%^^A\usepackge[cal=boondoxo]{mathalfa} -%^^A\useosf -%^^A\useproportional -%^^A\end{verbatim} -%^^A\end{latexcode} -%^^A -%^^A\paragraph{defaultfont=palatino} -%^^A -%^^A\begin{latexcode} -%^^A\begin{verbatim} -%^^A\usepackage[full]{textcomp} -%^^A\usepackage{newpxtext} -%^^A\usepackage[scaled=1.06]{biolinum} -%^^A\usepackage[varqu,varl]{inconsolata} -%^^A\usepackage{amsthm} -%^^A\usepackage[bigdelims,vvarbb]{newpxmath} -%^^A\usepackage[cal=boondoxo]{mathalfa} -%^^A\useosf -%^^A\useproportional -%^^A\end{verbatim} -%^^A\end{latexcode} -%^^A -%^^A\paragraph{defaultfont=libertine} -%^^A -%^^A\begin{latexcode} -%^^A\begin{verbatim} -%^^A\usepackage{textcomp} -%^^A\usepackage[sb]{libertine} -%^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata} -%^^A\usepackage{amsthm} -%^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath} -%^^A\usepackage[cal=boondoxo]{mathalfa} -%^^A\useosf -%^^A\end{verbatim} -%^^A\end{latexcode} +% ^^AFor example, these are the codes loaded for the three non-standard fonts: +% ^^A +% ^^A\paragraph{defaultfont=cochineal} +% ^^A +% ^^A\begin{latexcode} +% ^^A\begin{verbatim} +% ^^A\documentclass[defaultfont=none]{suftesi} +% ^^A... +% ^^A\usepackage{textcomp} +% ^^A\usepackage{cochineal} +% ^^A\usepackage[varqu,varl,var0]{inconsolata} +% ^^A\usepackage{biolinum} +% ^^A\usepackage{cochineal} +% ^^A\usepackage{amsthm} +% ^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} +% ^^A\usepackge[cal=boondoxo]{mathalfa} +% ^^A\useosf +% ^^A\useproportional +% ^^A\end{verbatim} +% ^^A\end{latexcode} +% ^^A +% ^^A\paragraph{defaultfont=palatino} +% ^^A +% ^^A\begin{latexcode} +% ^^A\begin{verbatim} +% ^^A\usepackage[full]{textcomp} +% ^^A\usepackage{newpxtext} +% ^^A\usepackage[scaled=1.06]{biolinum} +% ^^A\usepackage[varqu,varl]{inconsolata} +% ^^A\usepackage{amsthm} +% ^^A\usepackage[bigdelims,vvarbb]{newpxmath} +% ^^A\usepackage[cal=boondoxo]{mathalfa} +% ^^A\useosf +% ^^A\useproportional +% ^^A\end{verbatim} +% ^^A\end{latexcode} +% ^^A +% ^^A\paragraph{defaultfont=libertine} +% ^^A +% ^^A\begin{latexcode} +% ^^A\begin{verbatim} +% ^^A\usepackage{textcomp} +% ^^A\usepackage[sb]{libertine} +% ^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata} +% ^^A\usepackage{amsthm} +% ^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath} +% ^^A\usepackage[cal=boondoxo]{mathalfa} +% ^^A\useosf +% ^^A\end{verbatim} +% ^^A\end{latexcode} % % % @@ -538,7 +637,7 @@ %\begin{figure} % \centering %\begin{tikzpicture} -% \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight); +% \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight); %\draw[line width=.5mm,fill=white,text=black,draw=black!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\ St. Anford\\ University\\[1mm] * * * }}; %\node[anchor=north west] at (-2.5cm,18cm) {% % \parbox{8cm}{% @@ -579,8 +678,8 @@ %\begin{figure} % \centering %\begin{tikzpicture} -% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,\textheight); -% \node at (0,.7\textheight) (c) {}; +% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight); +% \node at (0,.65\textheight) (c) {}; % \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm); % \node[anchor=center,text=white] at (c) {\parbox{6cm}{% % \centering @@ -601,19 +700,19 @@ % \subsection{The cover page} % Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code: %\begin{latexcode} - %\begin{verbatim} - %\Cauthor{Bruce Lee} - %\Ctitle{The Art of Kicking} - %\Csubtitle{How to survive in the modern societies} - %\Ceditor{edited by\\ Walker Texas Ranger} - %\Cfoot{Punch Press\\\fbox{\bfseries P\&P}} - %\Cpagecolor{white!90!black} - %\Ctextcolor{white} - %\Cfootcolor{black} - % - %\makecover[ball color=DarkBlue,draw=none] - %\end{verbatim} - %\end{latexcode} +%\begin{verbatim} +%\Cauthor{Bruce Lee} +%\Ctitle{The Art of Kicking} +%\Csubtitle{How to survive in the modern societies} +%\Ceditor{edited by\\ Walker Texas Ranger} +%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}} +%\Cpagecolor{white!90!black} +%\Ctextcolor{white} +%\Cfootcolor{black} +% +%\makecover[ball color=DarkBlue,draw=none] +%\end{verbatim} +%\end{latexcode} % %To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács. % @@ -652,9 +751,9 @@ % % % -%^^A\subsection{Title page} +% ^^A\subsection{Title page} % -%^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes. +% ^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes. % % \subsection{The appendices} % Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment. @@ -738,7 +837,17 @@ % %\subsection{Font}\label{sec:fonts} % -% The first three options are available only with \LaTeX. +%\begin{optionlist} +% \optitem[10]{fontsize}{10, 10.1, 10.2...,11, 11.1, 11.2...} +% Sets the main font sizes for the document, changing the \cmd{baselineskip} accordingly. It is based on the \sty{fontsize} package. Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default font size also with the option \opt{SizeFeatures} of \sty{fontspec}. For example: +%\begin{latexcode} +%\begin{verbatim} +%\setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre} +%\end{verbatim} +%\end{latexcode} +% +%\end{optionlist} +% The first three options below are available only with \LaTeX. % Using \XeLaTeX{} or \LuaLaTeX{} % the default font is the Computer Modern but you can change it through % the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family by Georg Duffner. @@ -751,7 +860,7 @@ % \item[cochineal] Loads the Cochineal serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. % \item[libertine] Loads the Linux Libertine O serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. % \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisa} option offers a very good solution. -%^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text. +% ^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text. % \item[standard] Loads the \sty{lmodern} package: Latin Modern font family and CB Greek. % \end{valuelist} % \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}} @@ -981,14 +1090,10 @@ % \subsection{Miscellaneous}\label{sec:miscellaneous} % %\begin{optionlist} -% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}} +% \optitem[\cmd{baselineskip}]{parindent}{\opt{1em}, \opt{1cm}, \opt{17pt}, \ldots} % \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} % \begin{valuelist} -% Sets the indentation of the first line of each paragraph except those following a section title. -% \item[compact] -% Sets indentation to 1\,em. -% \item[wide] -% Sets indentation to 1.5\,em. +% Sets the indentation of the first line of each paragraph except those following a section title. For backward compatibility you should use \opt{parindet=1em} or \opt{parindet=1.5} in place of \opt{parindet=compact} and \opt{parindet=wide} respectively. % \end{valuelist} %\boolitem[true]{marginpar} % \begin{valuelist} @@ -1216,7 +1321,7 @@ % % \end{ltxsyntax} % -% \subsection[Breaking titles]{Breaking titles} +% \subsection[Breaking titles]{Breaking titles in header and table of contents} % % \begin{ltxsyntax} % \cmditem{headbreak} @@ -1242,7 +1347,7 @@ % \end{ltxsyntax} % % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}} -% \subsection{Section titles}\label{sec:secfont} +% \subsection{Customizing titles}\label{sec:secfont} % \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section titles and numbers.} % % The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on. @@ -1278,9 +1383,6 @@ %\chapfont{\bfseries\sffamily\scshape\LARGE} %\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont} % -%\chapnumfont{\hskip1cm\bfseries\fontsize{100}{100}\selectfont% -%\color{gray}\arabic{chapter}} -%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}} %\chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont% %\color{gray}\arabic{chapter}}\hskip-1cm} %\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}} @@ -1357,9 +1459,9 @@ % \renewcommand{\appendixpagename}{Appendices} %\end{verbatim} %\end{latexcode}% -%^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici}) -%^^A -%^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command. +% ^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici}) +% ^^A +% ^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command. % %\end{ltxsyntax} % @@ -1796,13 +1898,17 @@ \ProcessOptions \relax \LoadClass{book} +\@ifpackageloaded{fontsize}{}{\RequirePackage{fontsize}} +\DeclareOptionX{parindent}{\setlength{\parindent}{#1}} +\ExecuteOptionsX{parindent=\baselineskip} +\ProcessOptionsX*\relax % \end{macrocode} % \subsection*{Document structure} % \begin{macrocode} \define@choicekey{}{structure}[\val\nr] {book,article,collection}[book]{% \ifcase\nr\relax -%^^A\disable@keys{}{secnumstyle} +% \disable@keys{}{secnumstyle} \def\SUF@chapswitch{\thechapter.} \or \suftesi@articletrue @@ -2110,14 +2216,14 @@ % \end{macrocode} % \subsection*{TOC font} % \begin{macrocode} -%^^A\define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{% -%^^A\ifcase\nr\relax -%^^A\def\SUF@tocPART@font{\relax} -%^^A\or -%^^A\def\SUF@tocPART@font{\itshape} -%^^A\or -%^^A\def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} -%^^A\fi} +% \define@choicekey{}{tocpartfont}[\val\nr]{roman,italic,smallcaps}[roman]{% +% \ifcase\nr\relax +% \def\SUF@tocPART@font{\relax} +% \or +% \def\SUF@tocPART@font{\itshape} +% \or +% \def\SUF@tocPART@font{\expandafter\SUF@TOCtitlesmallcaps} +% \fi} \define@choicekey{}{tocchapfont}[\val\nr]{roman,italic,smallcaps}[roman]{% \ifcase\nr\relax \def\SUF@tocCHAP@font{\relax} @@ -2175,27 +2281,27 @@ \ifcase\nr\relax \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{} -%^^A \def\SUF@PART@thecontentslabel{\thecontentslabel} +% \def\SUF@PART@thecontentslabel{\thecontentslabel} \or \def\SUF@thepart{\textsc{\roman{part}}} \def\SUF@dotpart{} -%^^A \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}} +% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}} \or \def\SUF@thepart{\Roman{part}} \def\SUF@dotpart{} -%^^A \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}} +% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}} \or \def\SUF@thepart{\arabic{part}} \def\SUF@dotpart{.} -%^^A \def\SUF@PART@thecontentslabel{\thecontentslabel} +% \def\SUF@PART@thecontentslabel{\thecontentslabel} \or \def\SUF@thepart{\textsc{\roman{part}}} \def\SUF@dotpart{.} -%^^A \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}} +% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}} \or \def\SUF@thepart{\Roman{part}} \def\SUF@dotpart{.} -%^^A \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}} +% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}} \fi} % \end{macrocode} % \subsubsection*{Chapter number style} @@ -2354,17 +2460,16 @@ dotarabic,dotroman,dotRoman}[arabic]{% \newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}} \newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}} \newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}} -% \newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}} \newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}} % -%^^A\newcommand{\tocpartfont}[1]{\def\SUF@tocPART@font{#1}} +% \newcommand{\tocpartfont}[1]{\def\SUF@tocPART@font{#1}} \newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}} \newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}} \newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}} \newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}} -%^^A\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}} +% \newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}} \newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}} \newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}} \newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}} @@ -2636,16 +2741,6 @@ dotarabic,dotroman,dotRoman}[arabic]{% \fi} % \end{macrocode} % \subsection*{Other options} -% \subsubsection*{Indentation} -% \begin{macrocode} -\define@choicekey{}{parindent}[\val\nr] - {compact,wide}[compact]{% -\ifcase\nr\relax -\setlength\parindent{1em} -\or -\setlength\parindent{1.5em} -\fi} -% \end{macrocode} % \subsubsection*{Part page} % \begin{macrocode} \define@choicekey{}{partpage}[\val\nr]{true,false}[true]{% @@ -2904,7 +2999,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% -quotesize,footnotestyle,liststyle,captionstyle,parindent} +quotesize,footnotestyle,liststyle,captionstyle} \or \suftesi@periodicalaureotrue \suftesi@FSPLtrue @@ -2922,7 +3017,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% -quotesize,footnotestyle,liststyle,captionstyle,parindent} +quotesize,footnotestyle,liststyle,captionstyle} \or \suftesi@periodicalaureotrue \suftesi@FSPLtrue @@ -2941,7 +3036,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% -quotesize,footnotestyle,liststyle,captionstyle,parindent} +quotesize,footnotestyle,liststyle,captionstyle} \fi} % \end{macrocode} % \subsubsection*{Options for \opt{collection} document structure} @@ -2985,7 +3080,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} structure=book, captionstyle=standard, marginpar=true, - parindent=compact, tocstyle=standard, defaultfont=cochineal, mathfont=minimal, @@ -3019,8 +3113,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} tocauthorfont=roman, revauthortitle=false, papertitlestyle=left, - authorfont=roman, - titlefont=italic, tocchapfont=roman, tocsecfont=roman, tocsubsecfont=roman, @@ -3052,12 +3144,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} % \end{macrocode} % \subsection*{Basic packages} % \begin{macrocode} -\RequirePackage{color} - \definecolor{sufred}{rgb}{0.5,0,0} - \definecolor{sufgray}{rgb}{0.5,0.5,0.5} \RequirePackage{multicol} \RequirePackage{emptypage} \RequirePackage{microtype} +\RequirePackage{color} +\definecolor{sufred}{rgb}{0.5,0,0} +\definecolor{sufgray}{rgb}{0.5,0.5,0.5} \RequirePackage{iftex} \ifLuaTeX \RequirePackage{luatex85} @@ -3071,8 +3163,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \else \fi % \end{macrocode} -% \subsection*{Page layout} -% The \cmd{geometry} command must be declare before the \sty{fontenc} package. If declared after it, the \opt{heightrounded} option becomes ineffective and many underfull vertical boxes may occur. +% \subsection*{Page layouts} % \begin{macrocode} \ifsuftesi@screen \newcommand*\crop[1][]{} @@ -4263,48 +4354,50 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \renewcommand{\appendixtocname}{Appendici} \renewcommand{\appendixname}{Appendice} \noappendicestocpagenum -%^^A Bug using defaultfont=none,libertine,standard,compatibility -%^^A \AtBeginEnvironment{appendices}{\appendix\mainmatter} +% Bug using defaultfont=none,libertine,standard,compatibility +% \AtBeginEnvironment{appendices}{\appendix\mainmatter} \def\appendicesname{% \ClassError{suftesi}% {Command \noexpand\appendicesname undefined\MessageBreak - Redefine the \noexpand\appendixpagename command instead. See the 'appendix' package documentation.\MessageBreak + Redefine the \noexpand\appendixpagename command instead. + See the 'appendix' package documentation.\MessageBreak \noexpand\renewcommand{\noexpand\appendixpagename{newname}}} {Command \noexpand\appendicesname undefined\MessageBreak - Redefine the \noexpand\appendixpagename command instead. See the 'appendix' package documentation.\MessageBreak + Redefine the \noexpand\appendixpagename command instead. + See the 'appendix' package documentation.\MessageBreak \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}} -%^^A\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}} -%^^A \appendicesname{Appendici} -%^^A \newcommand{\appendixpage}{\SUF@appendixpage} -%^^A\def\SUF@appendixpage{% -%^^A \@mainmattertrue -%^^A \titlecontents{part} -%^^A [0em] -%^^A {\addvspace{3ex}} -%^^A {} -%^^A {} -%^^A {} -%^^A [\addvspace{1ex}] -%^^A\let\contentspage\relax -%^^A \cleardoublepage -%^^A \thispagestyle{empty} -%^^A \addcontentsline{toc}{part}{\SUF@appendices} -%^^A \begingroup -%^^A \centering -%^^A \null\vfil -%^^A {\LARGE\SUF@appendices\par} -%^^A \vfil -%^^A \endgroup -%^^A \cleardoublepage -%^^A\titlecontents{part} -%^^A [0em] -%^^A {\addvspace{3ex}\partname~} -%^^A {\makebox[\SUF@label@part][l]{% -%^^A \thecontentslabel}\hspace*{1em}} -%^^A {} -%^^A {} -%^^A [\addvspace{1ex}] -%^^A} +% \newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}} +% \appendicesname{Appendici} +% \newcommand{\appendixpage}{\SUF@appendixpage} +% \def\SUF@appendixpage{% +% \@mainmattertrue +% \titlecontents{part} +% [0em] +% {\addvspace{3ex}} +% {} +% {} +% {} +% [\addvspace{1ex}] +% \let\contentspage\relax +% \cleardoublepage +% \thispagestyle{empty} +% \addcontentsline{toc}{part}{\SUF@appendices} +% \begingroup +% \centering +% \null\vfil +% {\LARGE\SUF@appendices\par} +% \vfil +% \endgroup +% \cleardoublepage +% \titlecontents{part} +% [0em] +% {\addvspace{3ex}\partname~} +% {\makebox[\SUF@label@part][l]{% +% \thecontentslabel}\hspace*{1em}} +% {} +% {} +% [\addvspace{1ex}] +% } \renewcommand{\@chap@pppage}{% \clear@ppage \thispagestyle{plain}% @@ -4683,6 +4776,14 @@ Janusz M. Nowacki. \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} +\newcommand{\adjtoclabelsep}{\hskip.2em plus 1pt minus 1pt} +\newcommand{\adjtocpagesep}{\hskip.5em plus 2pt minus 1pt} +% \end{macrocode} +% A class error if the obsolete \cmd{toclabelspace} is used: +% \begin{macrocode} \newcommand{\toclabelspace}{% \ClassError{suftesi} {\MessageBreak @@ -4813,16 +4914,17 @@ Janusz M. Nowacki. [\addvspace{1ex}] \ifsuftesi@toccompactsec \titlecontents*{section}[\SUF@tochang@chap]{}{% - \SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec] + \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec] \else \titlecontents{section} [\SUF@tochang@sec] {} {\hskip-\SUF@tochang@sec% \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec% -%^^A \makebox[\SUF@label@sec][l]{% -%^^A \ifsuftesi@article\SUF@toclabelnum% -%^^A \else\fi\thecontentslabel}\hspace*{1em}% +% \makebox[\SUF@label@sec][l]{% +% \ifsuftesi@article\SUF@toclabelnum% +% \else\fi\thecontentslabel}\hspace*{1em}% \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}% \SUF@tocSEC@font} {\hskip-\SUF@tochang@sec% @@ -4832,7 +4934,8 @@ Janusz M. Nowacki. \fi \ifsuftesi@toccompactsubsec \titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{% - \SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec] + \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec] \else \titlecontents{subsection} [\SUF@tochang@subsec] @@ -4848,7 +4951,8 @@ Janusz M. Nowacki. \fi \ifsuftesi@toccompactsubsubsec \titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{% - \SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec] + \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec] \else \titlecontents{subsubsection} [\SUF@tochang@subsubsec] @@ -4959,15 +5063,16 @@ Janusz M. Nowacki. [\addvspace{1ex}] \ifsuftesi@toccompactsec \titlecontents*{section}[\SUF@tocindent@chap]{}{% - \SUF@SEC@thecontentslabel\ \SUF@tocSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsec] + \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec] \else \titlecontents{section} [\SUF@tocindent@sec] {} {\hskip-\dimexpr(\SUF@label@sec+1em)% -%^^A \makebox[\SUF@label@sec][l]{% -%^^A \ifsuftesi@article\SUF@toclabelnum% -%^^A \else\fi\thecontentslabel}\hspace*{1em}% +% \makebox[\SUF@label@sec][l]{% +% \ifsuftesi@article\SUF@toclabelnum% +% \else\fi\thecontentslabel}\hspace*{1em}% \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}% \SUF@tocSEC@font} {\hskip-\dimexpr(\SUF@label@sec+1em)% @@ -4977,7 +5082,8 @@ Janusz M. Nowacki. \fi \ifsuftesi@toccompactsubsec \titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{% - \SUF@SUBSEC@thecontentslabel\ \SUF@tocSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotssec] + \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec] \else \titlecontents{subsection} [\SUF@tocindent@subsec] @@ -4991,7 +5097,8 @@ Janusz M. Nowacki. \fi \ifsuftesi@toccompactsubsubsec \titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{% - \SUF@SUBSUBSEC@thecontentslabel\ \SUF@tocSUBSUBSEC@font}{}{, \thecontentspage}[][.\hskip.5em][\suf@ctocdotsssec] + \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, + \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec] \else \titlecontents{subsubsection} [\SUF@tocindent@subsubsec] |