suftesi (28mar15)

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

1 files changed, 42 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index c4fad11c000..c8ed3c9c597 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -6,7 +6,7 @@
 %%
 %% suftesi.dtx  (with options: `class')
 %% 
-%%  Copyright 2009-2014 by Ivan Valbusa
+%%  Copyright 2009-2015 by Ivan Valbusa
 %% 
 %%  This program is provided under the terms of the
 %%  LaTeX Project Public License distributed from CTAN
@@ -19,12 +19,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2014/04/05 v1.9c A class for typesetting theses, books and articles]
+    [2015/03/29 v2.0 A class for typesetting theses, books and articles]
 \ClassWarningNoLine{suftesi}{%
   ******************************************\MessageBreak
   * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
-  * WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
-  * THE LAYOUT OF THE DOCUMENT.\MessageBreak
+  * WITH PACKAGES AND/OR COMMANDS WHICH\MessageBreak
+  * MAY CHANGE THE LAYOUT OF THE DOCUMENT.\MessageBreak
   * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
   * ANYWAY, DON'T WORRY!\MessageBreak
   * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
@@ -96,7 +96,7 @@
 \fi}
 \RequirePackage{geometry}
 \define@choicekey{}{pagelayout}[\val\nr]
-    {standard,periodical,compact,compactaureo,supercompact,
+    {standard,standardaureo,periodical,compact,compactaureo,supercompact,
     supercompactaureo,elements,periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
@@ -110,6 +110,17 @@
     marginparwidth= 30mm,
     marginparsep=   12pt}
 \or
+  \DeclareRobustCommand{\SUF@chaptersize}{\Large}
+  \geometry{%
+    heightrounded,
+    a4paper,
+    includeheadfoot=true,
+    textwidth=      136mm,
+    textheight=     220mm,
+    marginratio=    2:3,
+    marginparwidth= 30mm,
+    marginparsep=   12pt}
+\or
 \suftesi@periodicaltrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
@@ -442,7 +453,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \fi}
 \RequirePackage[inline]{enumitem}
 \renewcommand\labelitemi{\color{sufgray}\textbullet}
-\setlist{itemsep=.5ex,parsep=0pt}
+\setlist{itemsep=.5ex,parsep=0pt,listparindent=\parindent}
 \setlist[description]{font=\normalfont\itshape}
 \define@choicekey{}{liststyle}[\val\nr]
     {bulged,aligned,indented}[bulged]{%
@@ -943,33 +954,36 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
-\RequirePackage[final]{microtype}
-  \SetTracking
-    [ name         = default,
-      no ligatures = {f} ]
-    { encoding     = {OT1,T1,T2A,LY1,OT4,QX,EU2} }
-    { 110 }
+\RequirePackage{ifluatex}
+\RequirePackage{ifthen}
+\RequirePackage{microtype}
 \newcommand{\versionstring}[1]{\def\version@string{#1}}
 \versionstring{Version of}
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
  \else
 \fi
-\ifxetex
-\AtBeginDocument{
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+{% if xetex or luatex
+\AtBeginDocument{%
 \@ifpackageloaded{fontspec}
   {\relax}
   {\ClassError{suftesi}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}
     {***********************************\MessageBreak
     * For using suftesi with XeLaTeX\MessageBreak
     * load either 'fontspec' or 'mathspec'\MessageBreak
+    * For using suftesi with LuaLaTeX\MessageBreak
+    * load 'fontspec' \MessageBreak
     ************************************}}
   }
-\else
+  }
+{% if pdftex
 \RequirePackage[LGR,T1]{fontenc}
 \RequirePackage{substitutefont}
 \AtBeginDocument{\fontencoding{T1}\selectfont}
@@ -1032,7 +1046,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
 \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
    \fi
-\fi
+}
 \ifsuftesi@nocrop
   \relax
     \else
@@ -1046,7 +1060,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{titlesec}
     \newlength{\sectionsep}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
-\ifxetex
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {% if xetex or luatex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1054,7 +1069,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
       \chapnumfont{\relax}%
-\else
+  }
+  {% if pdftex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
     \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
@@ -1062,7 +1078,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \newcommand{\chapnumfont}[1]{%
     \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
-\fi
+  }
 \define@key[SUF]{elements}{chapsize}[90]{%
   \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}}
 \define@key[SUF]{elements}{chapposition}[-83]{%
@@ -1844,7 +1860,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \fi
 \fi
 \RequirePackage{fancyhdr}
-  \pagestyle{fancy}
+\AtBeginDocument{%
+ \pagestyle{fancy}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footnoterule}{}
 \def\SUF@versionstring{\texttt{\version@string{} \today}}
@@ -1916,6 +1933,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
   \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
   \ifsuftesi@elementsheader\pagestyle{elements}\else\fi
+}
 \renewenvironment{quotation}
             {\list{}{\listparindent\parindent%
                      \itemindent    \listparindent
@@ -2546,7 +2564,7 @@ Janusz M. Nowacki.
       \normalfont \list{}{%
       \setlength{\itemindent}{-\parindent}
       \setlength{\leftmargin}{\parindent}
-      \setlength{\labelwidth}{\leftmargin}
+      \setlength{\labelwidth}{0pt}
       \setlength{\parsep}{\parskip}
       \let\makelabel}}
   {\endlist}
@@ -2565,7 +2583,9 @@ Janusz M. Nowacki.
   {\endlist}
 \AtBeginDocument{\RequirePackage{fixltxhyph}}
 \let\hemph\emph
-\ifxetex\let\@afterindenttrue\@afterindentfalse\else\fi
+\ifthenelse{\boolean{xetex}\or\boolean{luatex}}
+  {\let\@afterindenttrue\@afterindentfalse}
+  {\relax}
 \frenchspacing
 \endinput
 %%