suftesi (5may12)

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

1 files changed, 25 insertions, 8 deletions

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}