summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-23 00:33:25 +0000
committerKarl Berry <karl@freefriends.org>2020-02-23 00:33:25 +0000
commit4275fd1f5f1c2cff545b6cb0d09b72312eef0d28 (patch)
tree2957c947cab3e808c9edf10c6701decdcf796020 /Master/texmf-dist/tex/latex/suftesi
parenta8a5cd95f8579ad571b843b95df2eb434bb709c3 (diff)
suftesi (22feb20)
git-svn-id: svn://tug.org/texlive/trunk@53876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/suftesi')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls65
1 files changed, 35 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 152ccc50507..3be898f6187 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,7 +19,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [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]
+
\ClassWarningNoLine{suftesi}{%
@@ -96,6 +97,10 @@
\ProcessOptions
\relax
\LoadClass{book}
+\@ifpackageloaded{fontsize}{}{\RequirePackage{fontsize}}
+\DeclareOptionX{parindent}{\setlength{\parindent}{#1}}
+\ExecuteOptionsX{parindent=\baselineskip}
+\ProcessOptionsX*\relax
\define@choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
@@ -841,13 +846,6 @@ sec,subsec,subsubsec}[sec]{%
\or
\suftesi@greekfonttrue\suftesi@cbgreektrue
\fi}
-\define@choicekey{}{parindent}[\val\nr]
- {compact,wide}[compact]{%
-\ifcase\nr\relax
-\setlength\parindent{1em}
-\or
-\setlength\parindent{1.5em}
-\fi}
\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\suftesi@partpagetrue
@@ -1080,7 +1078,7 @@ sec,subsec,subsubsec}[sec]{%
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
@@ -1098,7 +1096,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
@@ -1117,7 +1115,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}
\define@choicekey{}{papertitlestyle}[\val\nr]{%
left,center,right}[left]{%
@@ -1155,7 +1153,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
structure=book,
captionstyle=standard,
marginpar=true,
- parindent=compact,
tocstyle=standard,
defaultfont=cochineal,
mathfont=minimal,
@@ -1189,8 +1186,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
tocauthorfont=roman,
revauthortitle=false,
papertitlestyle=left,
- authorfont=roman,
- titlefont=italic,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
@@ -1207,12 +1202,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\XKV@useoption{legalpaper}\XKV@useoption{executivepaper}
\XKV@useoption{landscape}
\def\XKV@classoptionslist{}
-\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}
@@ -1521,14 +1516,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\SUF@thesection\SUF@dotsec}
{0ex}
{\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\section}[hang]
{\SUF@sectionsize\SUF@lr@SECSwitch}
{\SUF@thesection\SUF@dotsec}
{1em}
{\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsec
\titleformat{\subsection}[display]
@@ -1588,7 +1583,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else%standard/standardaureo
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -1663,7 +1658,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -1695,7 +1690,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\subsection{#1}}}%
{\relax}%
}%
-\else
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -2249,10 +2244,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\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}}}}
\renewcommand{\@chap@pppage}{%
\clear@ppage
@@ -2555,6 +2552,8 @@ Janusz M. Nowacki.
\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}{%
\ClassError{suftesi}
{\MessageBreak
@@ -2669,7 +2668,8 @@ 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]
@@ -2685,7 +2685,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]
@@ -2701,7 +2702,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]
@@ -2806,7 +2808,8 @@ 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]
@@ -2821,7 +2824,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]
@@ -2835,7 +2839,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]