suftesi (10mar13)

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

3 files changed, 302 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index 2754c89b814..c0e2feecdc2 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 7211c38f38f..1d9d3dc1ff7 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/10/24 v1.2 A class for typesetting theses, books and articles]
+    [2013/03/05 v1.3 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -73,7 +73,6 @@
 \usepackage{xcolor}
 \usepackage{geometry}
  \geometry{margin=1cm,bottom=1.5cm,paperwidth=8in,paperheight=6.25in}
- % \newgeometry{margin=1cm,bottom=1.5cm}
 \usepackage{fourier}
 \renewcommand{\sfdefault}{lmss}
 \usepackage{sectsty}
@@ -121,6 +120,7 @@
  {\Huge\bfseries\color{spot}\section{#1}}
  \thispagestyle{empty}
  \vspace{\stretch{2}}\egroup\clearpage}
+\newcommand{\experimental}{\textcolor{red}{\texttt{~(beta code)~}}}  
   
 \EnableCrossrefs         
 \CodelineIndex
@@ -133,7 +133,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3238}
+% \CheckSum{3291}
 %
 % \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
@@ -150,7 +150,7 @@
 %   Right bracket \]     Circumflex    \^     Underscore    \_
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
-%
+% \changes{v1.3}{2013/03/05}{Updated documentation. Added \opt{FSPLa}, \opt{FSPLb} and \opt{FSPLc} styles.}
 % \changes{v1.2}{2012/10/24}{Maintenance release. Added the \cmd{toclabelspace} command.}
 % \changes{v1.1}{2012/10/20}{Added the \sty{fixltxhyph} package. Documentation updated.}
 % \changes{v0.9c}{2012/09/25}{Maintenance release, no changes}
@@ -241,7 +241,7 @@
 % \emph{This work has been typeset with \LaTeX{}, using the
 % \textsf{suftesi} class by Ivan Valbusa.}
 % \end{center}
-% \noindent You can use the \cmd{\meta{}colophon} commands explained 
+% \noindent You can use the \cmd{*colophon} commands explained 
 % in section \ref{sec:commands}.}
 %
 % \vskip6ex
@@ -680,14 +680,47 @@
 % \item[sufelements] Loads \opt{headerstyle=smallcaps}, 
 % \opt{chapfont=smallcaps},\\ \opt{secfont=smallcaps}, 
 % \opt{subsecfont=italic} and \opt{chaptstyle=elements} options.
-% \end{valuelist}% \end{optionlist}
-%
+% \end{valuelist}
+% \end{optionlist}
+% 
+% \section{The FSPL styles\experimental}\label{sec:FSPL}
+% \textbf{These styles are experimental and may change in the next versions of the class}. They are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona (Italy).
+% \begin{optionlist}
+% \optitem[FSPLa]{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
+%   \begin{valuelist}
+%     \item[FSPLa] Equal to: 
+%   \opt{pagelayout=periodical},
+%    \opt{style=roman1},
+%    \opt{footnotestyle=superscript},
+%    \opt{liststyle=indented}.
+%    \opt{tocstyle=ragged}.
+%     \item[FSPLb] Equal to:
+%    \opt{pagelayout=periodical},
+%    \opt{style=italic5},
+%    \opt{headerstyle=center},
+%    \opt{chapnumstyle=roman},
+%    \opt{secstyle=center},
+%    \opt{quotestyle=right},
+%    \opt{footnotestyle=hung},
+%    \opt{liststyle=indented}.
+%    \opt{tocstyle=dotted}.
+%     \item[FSPLc] Equal to:
+%    \opt{pagelayout=periodical},
+%    \opt{style=smallcaps5},
+%    \opt{secfont=smallcaps},
+%    \opt{headerstyle=center},
+%    \opt{footnotestyle=dotted},
+%    \opt{liststyle=indented}.
+%    \opt{tocstyle=leftpage}.
+%   \end{valuelist}
+% \end{optionlist}
+
 % \section{New commands}\label{sec:commands}
-%
+% 
 % The class defines the following new commands.
-%
+% 
 % \begin{ltxsyntax}
-%
+% 
 % \cmditem{title}[short title for headers]{complete title for titlepage}
 % \changes{v0.8}{2012/03/19}{Renewed \cmd{title} command}
 % 
@@ -760,6 +793,11 @@
 % top of the page. It is aimed at typesetting a classical \emph{colophon} 
 % at the end of the work.
 %
+% \cmditem{FSPLcolophon}~\experimental
+% \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
+%
+% To typeset the colophon in the FSPL style. See section \ref{sec:FSPL} for details.
+%
 % \cmditem{chapterintro}
 %
 % Prints an unnumbered introduction at the beginning of the chapter, 
@@ -796,13 +834,13 @@
 %
 % Sets the width of \cmd{thecontentslabel}. The default values are:
 % \begin{ttquote}
-% \cmd{toclabelwidth}\{part\}\{1em\}\\
-% \cmd{toclabelwidth}\{chapter\}\{1em\}\\
-% \cmd{toclabelwidth}\{section\}\{1.5em\}\\
-% \cmd{toclabelwidth}\{subsection\}\{2em\}\\
-% \cmd{toclabelwidth}\{subsubsection\}\{2.5em\}\\
-% \cmd{toclabelwidth}\{paragraph\}\{3em\}\\
-% \cmd{toclabelwidth}\{subparagraph\}\{3.5em\}
+% \cmd{toclabelspace}\{part\}\{1em\}\\
+% \cmd{toclabelspace}\{chapter\}\{1em\}\\
+% \cmd{toclabelspace}\{section\}\{1.5em\}\\
+% \cmd{toclabelspace}\{subsection\}\{2em\}\\
+% \cmd{toclabelspace}\{subsubsection\}\{2.5em\}\\
+% \cmd{toclabelspace}\{paragraph\}\{3em\}\\
+% \cmd{toclabelspace}\{subparagraph\}\{3.5em\}
 % \end{ttquote}
 % \cmditem{xfootnote}{symbol}{footnote text}
 % \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
@@ -1004,6 +1042,7 @@
 \newif\ifsuftesi@draftdate
 \newif\ifsuftesi@fewfootnotes
 \newif\ifsuftesi@partpage
+\newif\ifsuftesi@FSPL
 \DeclareOption{a5paper}{%
   \ClassError{suftesi}{Option 'a5paper' not available}}
 \DeclareOption{b5paper}{%
@@ -1547,7 +1586,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   italic7,italic8,italic9,italic10,italic11,italic12,
   smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
   smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
-  elements,sufelements}  
+  elements,sufelements,FSPLa,FSPLb,FSPLc}  
   [roman1]{%
 \ifcase\nr\relax
 %    \end{macrocode}
@@ -1642,6 +1681,120 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     subsecfont=italic}
 \disable@keys{}
     {headerstyle,chapstyle,secfont,subsecfont}
+\or
+%    \end{macrocode}
+% The \opt{FSPLa} style:
+%    \begin{macrocode}
+  \suftesi@FSPLtrue
+  \setkeys{}{%
+    pagelayout=periodical,
+    style=roman1,
+    footnotestyle=superscript,
+    liststyle=indented,
+    tocstyle=ragged}
+%\disable@keys{}{%
+%    documentstructure,
+%    pagelayout,
+%    partfont,
+%    chapfont,
+%    secfont,
+%    subsecfont,
+%    subsubsecfont,    
+%    partstyle,
+%    chapstyle,
+%    secstyle,
+%    subsecstyle,
+%    subsubsecstyle,
+%    partnumstyle,
+%    chapnumstyle,
+%    secnumstyle,
+%    tocstyle,
+%    headerstyle,
+%    headerfont,
+%    quotestyle,
+%    quotesize,
+%    footnotestyle,
+%    liststyle,
+%    captionstyle,
+%    parindent}
+\or
+%    \end{macrocode}
+% The \opt{FSPLb} style:
+%    \begin{macrocode}
+  \suftesi@FSPLtrue
+  \setkeys{}{%  
+    pagelayout=periodical,
+    style=italic5,
+    headerstyle=center,
+    chapnumstyle=roman,
+    secstyle=center,
+    quotestyle=right,
+    footnotestyle=hung,
+    liststyle=indented,
+    tocstyle=dotted}
+%\disable@keys{}{%
+%    documentstructure,
+%    pagelayout,
+%    partfont,
+%    chapfont,
+%    secfont,
+%    subsecfont,
+%    subsubsecfont,    
+%    partstyle,
+%    chapstyle,
+%    secstyle,
+%    subsecstyle,
+%    subsubsecstyle,
+%    partnumstyle,
+%    chapnumstyle,
+%    secnumstyle,
+%    tocstyle,
+%    headerstyle,
+%    headerfont,
+%    quotestyle,
+%    quotesize,
+%    footnotestyle,
+%    liststyle,
+%    captionstyle,
+%    parindent}
+\or
+%    \end{macrocode}
+% The \opt{FSPLc} style:
+%    \begin{macrocode}
+  \suftesi@FSPLtrue
+  \setkeys{}{%
+    pagelayout=periodical,
+    style=smallcaps5,
+    secfont=smallcaps,
+    headerstyle=center,
+    footnotestyle=dotted,
+    liststyle=indented,
+    tocstyle=leftpage}
+%\disable@keys{}{%
+%    documentstructure,
+%    pagelayout,
+%    partfont,
+%    chapfont,
+%    secfont,
+%    subsecfont,
+%    subsubsecfont,    
+%    partstyle,
+%    chapstyle,
+%    secstyle,
+%    subsecstyle,
+%    subsubsecstyle,
+%    partnumstyle,
+%    chapnumstyle,
+%    secnumstyle,
+%    tocstyle,
+%    headerstyle,
+%    headerfont,
+%    quotestyle,
+%    quotesize,
+%    footnotestyle,
+%    liststyle,
+%    captionstyle,
+%    parindent}
 \fi}
 %    \end{macrocode}
 % Execute and process options:
@@ -1701,6 +1854,13 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
 %    \end{macrocode}
+% The FSPL style requires a verbose colophon which uses specific icons:
+%    \begin{macrocode}
+\ifsuftesi@FSPL
+  \RequirePackage{cclicenses}
+ \else
+\fi
+%    \end{macrocode}
 % \subsection{Greek fonts}
 % Thanks to Claudio Beccari and Enrico Gregorio for these macros:
 %    \begin{macrocode}
@@ -2455,7 +2615,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
              \setcounter{chapter}{0}%
              \setcounter{section}{0}%
              \gdef\@chapapp{\appendixname}%
-             \gdef\thechapter{\@Alph\c@chapter}}
+             \gdef\SUF@thechapter{\@Alph\c@chapter}}
     \fi
 \fi
 %    \end{macrocode}
@@ -2599,18 +2759,15 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \let\oldfootnote\footnote
 \ifsuftesi@fewfootnotes
-\def\@fnsymbol#1{\ensuremath{\ifcase#1
-  \or * \or ** \or *** \or\ClassError{suftesi}
+\AtBeginDocument{
+\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
+  \ClassError{suftesi}%
   {Too many footnotes\MessageBreak
   Remove the class option 'fewfootnote'}
   {Too many footnotes\MessageBreak
   Remove the class option 'fewfootnote'}
-  \else\@ctrerr\fi}}
-\renewcommand{\footnote}[1]{%
-  \begingroup
-    \@addtoreset{footnote}{page}
-      \renewcommand\thefootnote{\fnsymbol{footnote}}\oldfootnote{#1}
-  \endgroup}
+  \else\@ctrerr\fi}}}
+\def\thefootnote{\@fnsymbol\c@footnote}%
 \else\fi
 %    \end{macrocode}
 % \DescribeMacro{\xfootnote}
@@ -2619,9 +2776,8 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 %    \begin{macrocode}
 \newcommand{\xfootnote}[2]{%
   \begingroup
-    \addtocounter{footnote}{-1}
-    \@addtoreset{footnote}{page}
-      \renewcommand\thefootnote{\ensuremath{#1}}\oldfootnote{#2}
+    \addtocounter{footnote}{-1}%
+      \def\thefootnote{#1}\oldfootnote{#2}%
   \endgroup}
 %    \end{macrocode}
 % \subsubsection{Marginal notes}
@@ -2730,6 +2886,40 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \end{center}
     \vspace*{\stretch{6}}}
 %    \end{macrocode}
+% \DescribeMacro{The FSPL colophon} \experimental
+%    \begin{macrocode}
+\newcommand{\FSPLcolophon}[1][\the\year]{%
+\begingroup
+\thispagestyle{empty}
+\small
+\null\vspace{\stretch{2}}
+\noindent Copyright \copyright{} #1 \@author%
+
+\null\vspace{\stretch{1}}
+
+\noindent Quest'opera \`e stata prodotta nell'ambito del 
+Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} dell'Universit\`a degli studi di Verona.
+\medskip
+
+\noindent Viene rilasciata con licenza Creative Commons Attribuzione - Non commerciale - Non opere derivate 3.0 Italia. Per leggere una copia della licenza visita il sito web 
+\begin{center}
+\texttt{http://creativecommons.org/licenses/by-nc-nd/3.0/it/}.
+\end{center}
+ o spedisci una lettera a Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+\bigskip
+
+Si \`e liberi di riprodurre, distribuire, comunicare al pubblico, esporre, in pubblico, rappresentare, eseguire e recitare quest'opera alle seguenti condizioni:
+\begin{description}
+\item[\ccby Attribuzione] 
+Devi attribuire la paternit\`a dell'opera nei modi indicati dall'autore o da chi ti ha dato l'opera in licenza e in modo tale da non suggerire che essi avallino te o il modo in cui tu usi l'opera;
+\item[\ccnc Non commerciale] 
+Non si pu\`o usare quest'opera per fini commerciali;
+\item[\cc Non opere derivate] 
+Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altra.
+\end{description}
+\endgroup
+\clearpage}
+%    \end{macrocode}
 % \subsection{TOC, LOF, LOT}
 %    \begin{macrocode}
 \RequirePackage{titletoc}
@@ -2741,12 +2931,12 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \newlength\SUF@label@chapter
 \setlength\SUF@label@chapter{.5em}
 %    \end{macrocode}
-% \DescribeMacro{\toclabelwidth}
-% |\toclabelwidth| is providet to
-% adjust the label width:
+% \DescribeMacro{\toclabelspace}
+% |\toclabelspace| is provided to
+% adjust the label width i the table of contents:
 %    \begin{macrocode}
 \newcommand*{\toclabelspace}[1]{\setlength\SUF@label@chapter{#1}} 
-\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}} 
+\let\toclabelwidth\toclabelspace
 %    \end{macrocode}
 % \DescribeMacro{\SUF@tochang}
 % This macro controls the space between page number and chapter
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index e04d1ebab21..3c64676c990 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,7 +19,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2012/10/24 v1.2 A class for typesetting theses, books and articles]
+    [2013/03/05 v1.3 A class for typesetting theses, books and articles]
+
 
 
 \RequirePackage{xkeyval}
@@ -52,6 +53,7 @@
 \newif\ifsuftesi@draftdate
 \newif\ifsuftesi@fewfootnotes
 \newif\ifsuftesi@partpage
+\newif\ifsuftesi@FSPL
 \DeclareOption{a5paper}{%
   \ClassError{suftesi}{Option 'a5paper' not available}}
 \DeclareOption{b5paper}{%
@@ -502,7 +504,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   italic7,italic8,italic9,italic10,italic11,italic12,
   smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6,
   smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12,
-  elements,sufelements}
+  elements,sufelements,FSPLa,FSPLb,FSPLc}
   [roman1]{%
 \ifcase\nr\relax
   \setkeys{}{chapstyle=left}
@@ -582,6 +584,36 @@ dotarabic,dotroman,dotRoman}[arabic]{%
     subsecfont=italic}
 \disable@keys{}
     {headerstyle,chapstyle,secfont,subsecfont}
+\or
+  \suftesi@FSPLtrue
+  \setkeys{}{%
+    pagelayout=periodical,
+    style=roman1,
+    footnotestyle=superscript,
+    liststyle=indented,
+    tocstyle=ragged}
+\or
+  \suftesi@FSPLtrue
+  \setkeys{}{%
+    pagelayout=periodical,
+    style=italic5,
+    headerstyle=center,
+    chapnumstyle=roman,
+    secstyle=center,
+    quotestyle=right,
+    footnotestyle=hung,
+    liststyle=indented,
+    tocstyle=dotted}
+\or
+  \suftesi@FSPLtrue
+  \setkeys{}{%
+    pagelayout=periodical,
+    style=smallcaps5,
+    secfont=smallcaps,
+    headerstyle=center,
+    footnotestyle=dotted,
+    liststyle=indented,
+    tocstyle=leftpage}
 \fi}
 \ExecuteOptionsX<>{
   captionstyle=standard,
@@ -627,6 +659,10 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
+\ifsuftesi@FSPL
+  \RequirePackage{cclicenses}
+ \else
+\fi
 \ifxetex
   \relax
     \else
@@ -1279,7 +1315,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
              \setcounter{chapter}{0}%
              \setcounter{section}{0}%
              \gdef\@chapapp{\appendixname}%
-             \gdef\thechapter{\@Alph\c@chapter}}
+             \gdef\SUF@thechapter{\@Alph\c@chapter}}
     \fi
 \fi
 \RequirePackage{fancyhdr}
@@ -1383,24 +1419,20 @@ dotarabic,dotroman,dotRoman}[arabic]{%
                {\endlist}
 \let\oldfootnote\footnote
 \ifsuftesi@fewfootnotes
-\def\@fnsymbol#1{\ensuremath{\ifcase#1
-  \or * \or ** \or *** \or\ClassError{suftesi}
+\AtBeginDocument{
+\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
+  \ClassError{suftesi}%
   {Too many footnotes\MessageBreak
   Remove the class option 'fewfootnote'}
   {Too many footnotes\MessageBreak
   Remove the class option 'fewfootnote'}
-  \else\@ctrerr\fi}}
-\renewcommand{\footnote}[1]{%
-  \begingroup
-    \@addtoreset{footnote}{page}
-      \renewcommand\thefootnote{\fnsymbol{footnote}}\oldfootnote{#1}
-  \endgroup}
+  \else\@ctrerr\fi}}}
+\def\thefootnote{\@fnsymbol\c@footnote}%
 \else\fi
 \newcommand{\xfootnote}[2]{%
   \begingroup
-    \addtocounter{footnote}{-1}
-    \@addtoreset{footnote}{page}
-      \renewcommand\thefootnote{\ensuremath{#1}}\oldfootnote{#2}
+    \addtocounter{footnote}{-1}%
+      \def\thefootnote{#1}\oldfootnote{#2}%
   \endgroup}
 \def\SUF@mpsetup{%
     \ifsuftesi@elementsheader\relax
@@ -1476,11 +1508,42 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \end{minipage}
   \end{center}
     \vspace*{\stretch{6}}}
+\newcommand{\FSPLcolophon}[1][\the\year]{%
+\begingroup
+\thispagestyle{empty}
+\small
+\null\vspace{\stretch{2}}
+\noindent Copyright \copyright{} #1 \@author%
+
+\null\vspace{\stretch{1}}
+
+\noindent Quest'opera \`e stata prodotta nell'ambito del
+Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} dell'Universit\`a degli studi di Verona.
+\medskip
+
+\noindent Viene rilasciata con licenza Creative Commons Attribuzione - Non commerciale - Non opere derivate 3.0 Italia. Per leggere una copia della licenza visita il sito web
+\begin{center}
+\texttt{http://creativecommons.org/licenses/by-nc-nd/3.0/it/}.
+\end{center}
+ o spedisci una lettera a Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+\bigskip
+
+Si \`e liberi di riprodurre, distribuire, comunicare al pubblico, esporre, in pubblico, rappresentare, eseguire e recitare quest'opera alle seguenti condizioni:
+\begin{description}
+\item[\ccby Attribuzione]
+Devi attribuire la paternit\`a dell'opera nei modi indicati dall'autore o da chi ti ha dato l'opera in licenza e in modo tale da non suggerire che essi avallino te o il modo in cui tu usi l'opera;
+\item[\ccnc Non commerciale]
+Non si pu\`o usare quest'opera per fini commerciali;
+\item[\cc Non opere derivate]
+Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altra.
+\end{description}
+\endgroup
+\clearpage}
 \RequirePackage{titletoc}
 \newlength\SUF@label@chapter
 \setlength\SUF@label@chapter{.5em}
 \newcommand*{\toclabelspace}[1]{\setlength\SUF@label@chapter{#1}}
-\newcommand*{\toclabelwidth}[1]{\setlength\SUF@label@chapter{#1}}
+\let\toclabelwidth\toclabelspace
 \newlength{\SUF@tochang}
 \setlength{\SUF@tochang}{3em}
 \AtBeginDocument{