summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/suftesi
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-06 09:24:40 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-06 09:24:40 +0000
commitc4c5fdad98c7f31bf86c4897dfb8065cc706226f (patch)
treead541170157fe01d81fb2da09167a7362ad87cf0 /Master/texmf-dist/source/latex/suftesi
parent853ebcc3f6ede559a9dffb9d9278446cddc7808b (diff)
suftesi update
git-svn-id: svn://tug.org/texlive/trunk@27894 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/suftesi')
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.dtx147
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.ins2
2 files changed, 107 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index fd2a6e67958..6cdb88542ec 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,7 +23,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [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]
%</class>
%<*driver>
\PassOptionsToClass{a4paper}{article}
@@ -109,7 +109,7 @@
%</driver>
% \fi
%
-% \CheckSum{2973}
+% \CheckSum{3016}
%
% \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
@@ -127,6 +127,7 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v0.9c}{2012/09/25}{Maintenance release, no changes}
% \changes{v0.9b}{2012/09/23}{Restored \opt{11pt} and \opt{12pt} option
% to default}
% \changes{v0.9a}{2012/08/31}{Added \option{inline} option to
@@ -940,7 +941,6 @@
\newif\ifsuftesi@porson
\newif\ifsuftesi@centerheader
\newif\ifsuftesi@sufplain
-\newif\ifsuftesi@bozza
\newif\ifsuftesi@article
\newif\ifsuftesi@authortitle
\newif\ifsuftesi@periodical
@@ -951,8 +951,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
@@ -965,6 +963,9 @@
\newif\ifsuftesi@elementsheader
\newif\ifsuftesi@elementsstructure
\newif\ifsuftesi@elementspagelayout
+\newif\ifsuftesi@bozza
+\newif\ifsuftesi@fewfootnotes
+\newif\ifsuftesi@partpage
% \end{macrocode}
% Execute options:
% \begin{macrocode}
@@ -1236,7 +1237,6 @@
% \begin{macrocode}
\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{}
@@ -1255,10 +1255,6 @@
\or
\def\SUF@thesection{\Roman{section}}
\def\SUF@dotsec{.}
-\fi
-\else
- \def\SUF@thesection{\arabic{section}}
- \def\SUF@dotsec{}
\fi}
% \end{macrocode}
% \subsection{Headers}
@@ -1530,56 +1526,56 @@
% \end{macrocode}
% The 'italic' styles:
% \begin{macrocode}
- \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
% \end{macrocode}
% The 'smallcaps' styles:
% \begin{macrocode}
- \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
% \end{macrocode}
% The 'elements' style:
@@ -1810,14 +1806,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]
@@ -1912,9 +1910,9 @@
% \begin{macrocode}
\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}
@@ -2157,7 +2155,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
@@ -2464,11 +2462,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
@@ -2977,6 +2975,14 @@
% \DescribeMacro{\chapterintro}
% A command to typeset an unnumbered section:
% \begin{macrocode}
+\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
@@ -2984,6 +2990,7 @@
\addcontentsline{toc}{section}{\SUF@fchapterintroname}}
\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
\chapterintroname{Introduzione}
+\fi
% \end{macrocode}
% \DescribeMacro{\headbreak}
%Active in the table of contents but not in the text.
@@ -3008,8 +3015,26 @@
% \end{macrocode}
% Renew |\frontmatter| to have arabic page numbering:
% \begin{macrocode}
+\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
% \end{macrocode}
% \subsection{Backward compatibility}
% \begin{environment}{bibliografia}
@@ -3735,6 +3760,42 @@ style=smallcaps12]{suftesi}
%</style-smallcaps12>
% \fi
% \iffalse
+%<*style-elements>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[style=elements,
+crop=false]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</style-elements>
+% \fi
+% \iffalse
+%<*style-sufelements>
+%% !TEX encoding = UTF-8 Unicode
+%% !TEX TS-program = XeLaTeX
+\documentclass[pagelayout=periodical,
+style=sufelements,crop=false]{suftesi}
+\usepackage{lipsum,fontspec}
+\setmainfont[Numbers=OldStyle]{Junicode}
+\setcounter{chapter}{2}
+\begin{document}
+\chapter{Titolo del capitolo}
+\section{Dolor sit amet}
+\lipsum[1]
+\subsection{Peniteitiagite}
+\lipsum[9]
+\end{document}
+%</style-sufelements>
+% \fi
+% \iffalse
%<*collect-examples>
%% !TEX encoding = UTF-8 Unicode
%% !TEX TS-program = pdfLaTeX
@@ -3783,6 +3844,8 @@ style=smallcaps12]{suftesi}
\inputex{style-smallcaps10}
\inputex{style-smallcaps11}
\inputex{style-smallcaps12}
+\inputex{style-elements}
+\inputex{style-sufelements}
\end{document}
%</collect-examples>
% \fi
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
index 7090720d439..d99933b08dc 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
@@ -76,6 +76,8 @@
\file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}}
\file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}}
\file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}}
+ \file{style-elements.tex}{\from{suftesi.dtx}{style-elements}}
+ \file{style-sufelements.tex}{\from{suftesi.dtx}{style-sufelements}}
\file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
}