From c4c5fdad98c7f31bf86c4897dfb8065cc706226f Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Sat, 6 Oct 2012 09:24:40 +0000 Subject: suftesi update git-svn-id: svn://tug.org/texlive/trunk@27894 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 106 +++++++++++++++--------- 1 file changed, 65 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/tex/latex/suftesi') diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 35cb7d84938..5cef494867c 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -19,14 +19,13 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2012/09/23 v0.9b A class for typesetting theses, books and articles] + [2012/09/25 v0.9c A class for typesetting theses, books and articles] \RequirePackage{xkeyval} \newif\ifsuftesi@cmfont \newif\ifsuftesi@porson \newif\ifsuftesi@centerheader \newif\ifsuftesi@sufplain -\newif\ifsuftesi@bozza \newif\ifsuftesi@article \newif\ifsuftesi@authortitle \newif\ifsuftesi@periodical @@ -37,8 +36,6 @@ \newif\ifsuftesi@dottedtoc \newif\ifsuftesi@raggedtoc \newif\ifsuftesi@pagelefttoc -\newif\ifsuftesi@fewfootnotes -\newif\ifsuftesi@partpage \newif\ifsuftesi@numparpart \newif\ifsuftesi@numparchap \newif\ifsuftesi@numparsec @@ -51,6 +48,9 @@ \newif\ifsuftesi@elementsheader \newif\ifsuftesi@elementsstructure \newif\ifsuftesi@elementspagelayout +\newif\ifsuftesi@bozza +\newif\ifsuftesi@fewfootnotes +\newif\ifsuftesi@partpage \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} \ProcessOptions \relax @@ -280,7 +280,6 @@ \fi} \define@choicekey{}{secnumstyle}[\val\nr] {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{% -\ifsuftesi@article \ifcase\nr\relax \def\SUF@thesection{\arabic{section}} \def\SUF@dotsec{} @@ -299,10 +298,6 @@ \or \def\SUF@thesection{\Roman{section}} \def\SUF@dotsec{.} -\fi -\else - \def\SUF@thesection{\arabic{section}} - \def\SUF@dotsec{} \fi} \define@choicekey{}{headerstyle}[\val\nr] {inner,center,plain,authortitleinner, @@ -510,53 +505,53 @@ \or \setkeys{}{chapstyle=parright} \or - \setkeys{}{chapstyle=left,chapfont=italic} + \setkeys{}{chapstyle=left,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=center,chapfont=italic} + \setkeys{}{chapstyle=center,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=right,chapfont=italic} + \setkeys{}{chapstyle=right,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=parleft,chapfont=italic} + \setkeys{}{chapstyle=parleft,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=parcenter,chapfont=italic} + \setkeys{}{chapstyle=parcenter,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=parright,chapfont=italic} + \setkeys{}{chapstyle=parright,chapfont=italic,headerfont=italic} \or - \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=left,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=center,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=right,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=parleft,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=parcenter,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps} + \setkeys{}{chapstyle=parright,chapfont=italic,secfont=smallcaps,headerfont=italic} \or - \setkeys{}{chapstyle=left,chapfont=smallcaps} + \setkeys{}{chapstyle=left,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=center,chapfont=smallcaps} + \setkeys{}{chapstyle=center,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=right,chapfont=smallcaps} + \setkeys{}{chapstyle=right,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parleft,chapfont=smallcaps} + \setkeys{}{chapstyle=parleft,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parcenter,chapfont=smallcaps} + \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parright,chapfont=smallcaps} + \setkeys{}{chapstyle=parright,chapfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=left,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=center,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=right,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=parleft,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=parcenter,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or - \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps} + \setkeys{}{chapstyle=parright,chapfont=smallcaps,secfont=smallcaps,headerfont=smallcaps} \or \setkeys{}{ pagelayout=elements, @@ -738,14 +733,16 @@ \ifsuftesi@numparsec \titleformat{\section}[display] {\SUF@lr@SECSwitch} - {\SUF@thesection\SUF@dotsec} + {\ifsuftesi@article\SUF@thesection + \else\thesection\fi\SUF@dotsec} {0ex} {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em] \else \titleformat{\section}[hang] {\SUF@lr@SECSwitch} - {\SUF@thesection\SUF@dotsec} + {\ifsuftesi@article\SUF@thesection + \else\thesection\fi\SUF@dotsec} {1em} {\SUF@SEC@StyleSwitch} \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex] @@ -831,9 +828,9 @@ \fi \ifsuftesi@article \def\chapter#1{\ClassError{suftesi} - {\noexpand\chapter level is not defined + {\noexpand\chapter level is undefined using 'documentstructure=article'} - {\noexpand\chapter level is not defined + {\noexpand\chapter level is undefined using 'documentstructure=article'}} \setcounter{tocdepth}{3} \setcounter{secnumdepth}{3} @@ -1037,7 +1034,7 @@ \fi \else \newpage - \global\@topnum\z@ % Prevents figures from going at top of page. + \global\@topnum\z@% Prevents figures from going at top of page. \@maketitle \fi \thispagestyle{plain}\@thanks @@ -1289,11 +1286,11 @@ \let\oldfootnote\footnote \ifsuftesi@fewfootnotes \def\@fnsymbol#1{\ensuremath{\ifcase#1 - \or * \or ** \or *** \ClassError{suftesi} + \or * \or ** \or *** \or\ClassError{suftesi} {Too many footnotes\MessageBreak - Use class option 'fewfootnote=false'} + Remove the class option 'fewfootnote'} {Too many footnotes\MessageBreak - Use class option 'fewfootnote=false'} + Remove the class option 'fewfootnote'} \else\@ctrerr\fi}} \renewcommand{\footnote}[1]{% \begingroup @@ -1709,6 +1706,14 @@ \if@restonecol\twocolumn\fi } \fi +\ifsuftesi@article +\def\chapterintro{% +\ClassError{suftesi} + {Command \noexpand\chapterintro is undefined\MessageBreak + using 'documentstructure=article'} + {Command \noexpand\chapterintro is undefined\MessageBreak + using 'documentstructure=article'}} +\else \def\chapterintro{ \@ifstar{\@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}} \def\@chapterintro{\phantomsection @@ -1716,6 +1721,7 @@ \addcontentsline{toc}{section}{\SUF@fchapterintroname}} \newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}} \chapterintroname{Introduzione} +\fi \newif\ifheadbreak\headbreakfalse \DeclareRobustCommand{\headbreak} {\ifheadbreak\\\else\fi} @@ -1726,8 +1732,26 @@ \renewcommand{\tableofcontents}{% \begingroup\headbreaktrue\xheadbreakfalse% \origtableofcontents\endgroup} +\ifsuftesi@article +\renewcommand\frontmatter{\ClassError{suftesi} + {Command \noexpand\frontmatter is undefined\MessageBreak + using 'documentstructure=article'} + {Command \noexpand\frontmatter is undefined\MessageBreak + using 'documentstructure=article'}} +\renewcommand\mainmatter{\ClassError{suftesi} + {Command \noexpand\mainmatter is undefined\MessageBreak + using 'documentstructure=article'} + {Command \noexpand\mainmatter is undefined\MessageBreak + using 'documentstructure=article'}} +\renewcommand\backmatter{\ClassError{suftesi} + {Command \noexpand\backmatter is undefined\MessageBreak + using 'documentstructure=article'} + {Command \noexpand\backmatter is undefined\MessageBreak + using 'documentstructure=article'}} +\else \renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse} \renewcommand\mainmatter{\cleardoublepage\@mainmattertrue} +\fi \newenvironment{bibliografia}{% \ifsuftesi@article \section*{\refname} -- cgit v1.2.3