suftesi (19sep15)

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

4 files changed, 66 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index fce3f1ec15b..5065c08bdc5 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/doc/latex/suftesi/templates.zip b/Master/texmf-dist/doc/latex/suftesi/templates.zip
index 8ae14b1a930..8fbc83cd2e2 100644
--- a/Master/texmf-dist/doc/latex/suftesi/templates.zip
+++ b/Master/texmf-dist/doc/latex/suftesi/templates.zip
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 31778c104a4..ce7692c323e 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -67,7 +67,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2015/09/10 v2.2 A class for typesetting theses, books and articles]
+    [2015/09/19 v2.3 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass[10pt]{ltxdoc}
@@ -212,7 +212,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4279}
+% \CheckSum{4338}
 %
 % \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
@@ -230,6 +230,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.3}{2015/09/19}{Maintenance release.}
 % \changes{v2.2}{2015/09/10}{Maintenance release.}
 % \changes{v2.1}{2015/06/13}{New option \opt{toc\meta{level}font}.Updated documentation. Removed \cmd{includeart} command}
 % \changes{v2.0.1}{2015/03/31}{Corrected a bug in \opt{version} option.}
@@ -1758,7 +1759,7 @@
 \or
 \def\SUF@tocCHAP@font{\itshape}
 \or
-\def\SUF@tocCHAP@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocCHAP@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
@@ -1766,7 +1767,7 @@
 \or
 \def\SUF@tocSEC@font{\itshape}
 \or
-\def\SUF@tocSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1774,7 +1775,7 @@
 \or
 \def\SUF@tocSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSUBSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -1782,7 +1783,7 @@
 \or
 \def\SUF@tocSUBSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 %    \end{macrocode}
 % \subsection{Sections number style}
@@ -2556,13 +2557,32 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{textcase}
 \RequirePackage{ifxetex}
 \RequirePackage{ifluatex}
 \RequirePackage{ifthen}
 \RequirePackage{microtype}
-\newcommand{\versionstring}[1]{\def\version@string{#1}}
-\versionstring{Version of}
+\RequirePackage{textcase}
+%    \end{macrocode}
+% The \cmd{MakeTextLowercase} command provided by \sty{textcase} conflicts with \sty{hyperref} when the command is used to format the TOC entries (for example when unsing the \opt{tocchapfont=smallcaps} option). Thanks to the user \emph{skevin93} of the GuIT forum (www.guitex.org/home/it/forum) for this macro:
+%    \begin{macrocode}
+    \AtBeginDocument{
+    \@ifpackageloaded{hyperref}{%
+    \def\@uclcnotmath#1#2#3#4{\begingroup #1%
+    \def \({$}\let \)\(\def \NoCaseChange ##1{%
+    \noexpand \NoCaseChange {\noexpand ##1}}%
+    \def\hyper@linkstart##1##2##3{$\valign$\noexpand\hyper@linkstart{##1}{##2}{%
+    \noexpand\@skipmath #3
+    ##3$\valign $}\noexpand\@skipmath}\def\hyper@linkend{%
+    \noexpand\hyper@linkend}%
+    \@nonchangecase \label
+    \@nonchangecase \ref
+    \@nonchangecase \ensuremath
+    \def \cite ##1##{\toks@ {\noexpand \cite ##1}\@citex }%
+    \def \@citex ##1{\NoCaseChange {\the \toks@ {##1}}}%
+    \def \reserved@a ##1##2{\let #2\reserved@a }%
+    \expandafter \reserved@a \@uclclist \reserved@b {\reserved@b \@gobble }%
+    \protected@edef \reserved@a {\endgroup\noexpand \@skipmath #3#4$\valign $}%
+    \reserved@a}}{}}
 %    \end{macrocode}
 % The FSPL style requires a verbose colophon which uses specific icons:
 %    \begin{macrocode}
@@ -2688,8 +2708,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \ifthenelse{\boolean{xetex}\or\boolean{luatex}}
   {% if xetex or luatex
-  \DeclareRobustCommand{\SUF@tocsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape #1}
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -2699,8 +2717,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \chapnumfont{\relax}%
   }
   {% if pdftex
-  \DeclareRobustCommand{\SUF@tocsmallcaps}[1]{%
-    \scshape\lsstyle #1}%
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -3621,6 +3637,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 % \subsection{Headings}
 %    \begin{macrocode}
 \RequirePackage{fancyhdr}
+\newcommand{\versionstring}[1]{\def\version@string{#1}}
+  \versionstring{Version of}
 \AtBeginDocument{%
  \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt} 
@@ -4499,9 +4517,12 @@ Janusz M. Nowacki.
 % In a previous version the \cmd{hemph} command was provided
 % to fix a bug in the hyphenation of some italian expressions
 % like ``dell'\emph{encyclopaedia}''. Now the bug has been fixed by the \sty{fixltxhyph} package by Claudio Beccari. The package 
-% must be loaded ofter \sty{babel} or \sty{polyglossia}:
+% must be loaded after \sty{babel} or \sty{polyglossia}:
 %    \begin{macrocode}
-\AtBeginDocument{\RequirePackage{fixltxhyph}}  
+\@ifpackageloaded{babel}
+  {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{}
+\@ifpackageloaded{polyglossia}
+  {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{}
 %    \end{macrocode}
 % The \cmd{hemph} command is provided only for 
 % backward compatibility:
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 01d82e76195..245076d2c02 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,7 +19,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2015/09/10 v2.2 A class for typesetting theses, books and articles]
+    [2015/09/19 v2.3 A class for typesetting theses, books and articles]
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
@@ -330,7 +330,7 @@
 \or
 \def\SUF@tocCHAP@font{\itshape}
 \or
-\def\SUF@tocCHAP@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocCHAP@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsecfont}[\val\nr]{roman,italic,smallcaps}[italic]{%
 \ifcase\nr\relax
@@ -338,7 +338,7 @@
 \or
 \def\SUF@tocSEC@font{\itshape}
 \or
-\def\SUF@tocSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -346,7 +346,7 @@
 \or
 \def\SUF@tocSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSUBSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{tocsubsubsecfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
 \ifcase\nr\relax
@@ -354,7 +354,7 @@
 \or
 \def\SUF@tocSUBSUBSEC@font{\itshape}
 \or
-\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@tocsmallcaps}
+\def\SUF@tocSUBSUBSEC@font{\expandafter\SUF@titlesmallcaps}
 \fi}
 \define@choicekey{}{partnumstyle}[\val\nr]
     {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
@@ -1012,13 +1012,29 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
 \RequirePackage{multicol}
 \RequirePackage{emptypage}
-\RequirePackage{textcase}
 \RequirePackage{ifxetex}
 \RequirePackage{ifluatex}
 \RequirePackage{ifthen}
 \RequirePackage{microtype}
-\newcommand{\versionstring}[1]{\def\version@string{#1}}
-\versionstring{Version of}
+\RequirePackage{textcase}
+    \AtBeginDocument{
+    \@ifpackageloaded{hyperref}{%
+    \def\@uclcnotmath#1#2#3#4{\begingroup #1%
+    \def \({$}\let \)\(\def \NoCaseChange ##1{%
+    \noexpand \NoCaseChange {\noexpand ##1}}%
+    \def\hyper@linkstart##1##2##3{$\valign$\noexpand\hyper@linkstart{##1}{##2}{%
+    \noexpand\@skipmath #3
+    ##3$\valign $}\noexpand\@skipmath}\def\hyper@linkend{%
+    \noexpand\hyper@linkend}%
+    \@nonchangecase \label
+    \@nonchangecase \ref
+    \@nonchangecase \ensuremath
+    \def \cite ##1##{\toks@ {\noexpand \cite ##1}\@citex }%
+    \def \@citex ##1{\NoCaseChange {\the \toks@ {##1}}}%
+    \def \reserved@a ##1##2{\let #2\reserved@a }%
+    \expandafter \reserved@a \@uclclist \reserved@b {\reserved@b \@gobble }%
+    \protected@edef \reserved@a {\endgroup\noexpand \@skipmath #3#4$\valign $}%
+    \reserved@a}}{}}
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
  \else
@@ -1122,8 +1138,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \ifthenelse{\boolean{xetex}\or\boolean{luatex}}
   {% if xetex or luatex
-  \DeclareRobustCommand{\SUF@tocsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape #1}
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1133,8 +1147,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
       \chapnumfont{\relax}%
   }
   {% if pdftex
-  \DeclareRobustCommand{\SUF@tocsmallcaps}[1]{%
-    \scshape\lsstyle #1}%
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1943,6 +1955,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
 \fi
 \RequirePackage{fancyhdr}
+\newcommand{\versionstring}[1]{\def\version@string{#1}}
+  \versionstring{Version of}
 \AtBeginDocument{%
  \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt}
@@ -2679,7 +2693,10 @@ Janusz M. Nowacki.
 \renewcommand\frontmatter{\cleardoublepage\@mainmatterfalse}
 \renewcommand\mainmatter{\cleardoublepage\@mainmattertrue}
 \fi
-\AtBeginDocument{\RequirePackage{fixltxhyph}}
+\@ifpackageloaded{babel}
+  {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{}
+\@ifpackageloaded{polyglossia}
+  {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{}
 \let\hemph\emph
 \ifthenelse{\boolean{xetex}\or\boolean{luatex}}
   {\let\@afterindenttrue\@afterindentfalse}