suftesi (5may12)

git-svn-id: svn://tug.org/texlive/trunk@26217 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 59 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index bf7bc1a9035..f06c75503ec 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/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 1a2afe0ef90..c299e599486 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -90,7 +90,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1730}
+% \CheckSum{1747}
 %
 % \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
@@ -108,6 +108,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v0.9a}{2012/05/05}{Changed code for toc, lot and lof elements}
 % \changes{v0.9}{2012/04/22}{Added \opt{dottedtoc} and \opt{raggedtoc} options. Improved compatibility with \sty{mathspec}}
 % \changes{v0.8}{2012/03/19}{Added macro for using \sty{frontespizio} package with \opt{compact} and \opt{supercompact} options. Added option \opt{periodical}. Renewed \cmd{title} command}
 % \changes{v0.7}{2011/02/05}{Maintenance release, no changes. Provided a thesis template}
@@ -146,7 +147,7 @@
 % \DoNotIndex{\eTeXversion,\hbox,\hsize,\includegraphics,\newlinechar}
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
-% 
+%
 % \title{\bfseries User's Guide to \textsf{suftesi}\thanks{This
 % document corresponds to \textsf{suftesi}~\fileversion{} dated \filedate}\\
 % \large A document class for typesetting theses, books and articles}
@@ -864,19 +865,19 @@
 	\titlespacing*{\subsubsection}{\parindent}{\baselineskip}{\baselineskip}[0ex]  
 \fi
 \titleformat{\paragraph}[runin]
-	  {}
-	  {}
-	  {}
-	  {\itshape}
-	  [.\hspace*{1em}]
-	\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
+  {}
+  {\theparagraph}
+  {.5em}
+  {\itshape}
+  [{.}\hspace*{1em}]
+\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \titleformat{\subparagraph}[runin]
-	  {}
-	  {}
-	  {}
-	  {}
-	  [.\hspace*{1em}]
-	\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
+  {}
+  {\thesubparagraph}
+  {.5em}
+  {}
+  [{.}\hspace*{1em}]
+\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 %    \end{macrocode}
 % \paragraph{\sty{biblatex} settings}
 %    \begin{macrocode}
@@ -1041,18 +1042,35 @@
   {\thecontentslabel\hspace*{1em}}
   {} 
   {\suftesi@titlerule\contentspage}
+\titlecontents{paragraph}
+  [6em]
+  {}
+  {\thecontentslabel\hspace*{1em}}
+  {}
+  {\suftesi@titlerule\contentspage}
+\titlecontents{subparagraph}
+  [7.5em]
+  {}
+  {\thecontentslabel\hspace*{1em}}
+  {}
+  {\suftesi@titlerule\contentspage}
 \titlecontents{figure}
-  [1.5em]
+  [0em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
   {\suftesi@titlerule\contentspage}
 \titlecontents{table}
-  [1.5em]
+  [0em]
   {} 
   {\thecontentslabel\hspace*{1em}}
   {} 
   {\suftesi@titlerule\contentspage}
+\ifsuftesi@article
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\else
+\fi
 %    \end{macrocode}
 % \subsubsection{Title page}
 % \DescribeMacro{\title}
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index add538521fd..36aa0fc4a3e 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -358,17 +358,17 @@
 \fi
 \titleformat{\paragraph}[runin]
   {}
-  {}
-  {}
+  {\theparagraph}
+  {.5em}
   {\itshape}
-  [.\hspace*{1em}]
+  [{.}\hspace*{1em}]
 \titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \titleformat{\subparagraph}[runin]
   {}
+  {\thesubparagraph}
+  {.5em}
   {}
-  {}
-  {}
-  [.\hspace*{1em}]
+  [{.}\hspace*{1em}]
 \titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
 \ifsuftesi@article %ARTICLE
 \AtBeginDocument{%
@@ -519,18 +519,35 @@
   {\thecontentslabel\hspace*{1em}}
   {}
   {\suftesi@titlerule\contentspage}
+\titlecontents{paragraph}
+  [6em]
+  {}
+  {\thecontentslabel\hspace*{1em}}
+  {}
+  {\suftesi@titlerule\contentspage}
+\titlecontents{subparagraph}
+  [7.5em]
+  {}
+  {\thecontentslabel\hspace*{1em}}
+  {}
+  {\suftesi@titlerule\contentspage}
 \titlecontents{figure}
-  [1.5em]
+  [0em]
   {}
   {\thecontentslabel\hspace*{1em}}
   {}
   {\suftesi@titlerule\contentspage}
 \titlecontents{table}
-  [1.5em]
+  [0em]
   {}
   {\thecontentslabel\hspace*{1em}}
   {}
   {\suftesi@titlerule\contentspage}
+\ifsuftesi@article
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\else
+\fi
     \renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
     \edef\title{\noexpand\@dblarg
   \expandafter\noexpand\csname\string\title\endcsname}