suftesi (17nov11)

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

1 files changed, 22 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 0c971346cfb..762451e4feb 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-		[2011/11/07 v. 0.6b
+		[2011/11/16 v. 0.6c
 		A class for typesetting theses, books and articles]
 %****************************************
 %  declare options
@@ -238,15 +238,27 @@
 %		SECTION TITLES
 %****************************************
 \RequirePackage{titlesec}
-\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
-   \ifxetex
-     \addfontfeature{LetterSpace=6}\MakeTextLowercase{\textsc{#1}}
-       \else
-         \textls{\MakeTextLowercase{\textsc{#1}}}
-       \fi
-       }%
+
 \DeclareRobustCommand{\sufchaptersize}{%
 	\ifsuftesi@supercompact\large\else\ifsuftesi@compact\Large\else\LARGE\fi\fi}
+\ifxetex
+	\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
+	     \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
+	\DeclareRobustCommand{\sectitle}[1]{%
+		\addfontfeature{LetterSpace=6}\scshape\MakeTextUppercase{#1}}%
+	\newcommand{\chapnumfont}[1]{%
+		  \def\@chapnumfont{\fontspec{#1}}}
+	\chapnumfont{Palatino}
+\else
+	\DeclareRobustCommand{\suftesi@smallcaps}[1]{%
+	         \scshape\lsstyle\MakeTextLowercase{#1}}%
+	\DeclareRobustCommand{\sectitle}[1]{%
+			\textls[110]{\MakeTextUppercase{#1}}}%
+	\newcommand{\chapnumfont}[1]{%
+	       \def\@chapnumfont{\fontfamily{#1}}}
+	\chapnumfont{pplj}
+\fi
+
 \ifsuftesi@article% article mode
 	\renewcommand \thesection {\@arabic\c@section}
 	\renewcommand\thesubsection   {\thesection.\@arabic\c@subsection} 
@@ -316,29 +328,13 @@
       \titlespacing*{\chapter}{0em}{6ex}{18ex}
    \fi
 \fi
-% Elements
-\newcommand{\chapnumfont}[1]{%
-	\ifxetex
-	  \def\@chapnumfont{#1}
-     \else
-       \def\@chapnumfont{\fontfamily{#1}}
-	  \fi}
-\newcommand{\xechapnumfont}{\chapnumfont}
-
-\xechapnumfont{Palatino}
-\chapnumfont{pplj}
-\DeclareRobustCommand{\sectitle}[1]{\textls{\MakeUppercase{#1}}}%
-
+% sufelements
 \ifsuftesi@sufelements
    \titleformat{\chapter}[block]
 		  {\vskip-22pt}%
 		  {\begin{picture}(0,0)
 	\setlength{\unitlength}{1pt}
-	\ifxetex
-	  \fontspec{\@chapnumfont}%
-	\else
 	  \@chapnumfont
-	  \fi
 		  \ifsuftesi@elements
 		    \fontsize{65}{65}\selectfont
 		  \else
@@ -354,6 +350,7 @@
 		  [\rule{\textwidth}{.4pt}]
   	\titlespacing*{\chapter}{0em}{10pt}{10pt}[0em] 
 \else\fi
+% elements
 \ifsuftesi@elements
 \titleformat{\section}[hang]
 	  {\raggedright}