suftesi (21jun13)

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

1 files changed, 63 insertions, 39 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index f3ee883e6db..f4eb6b169e2 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -19,9 +19,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-    [2013/04/17 v1.6 A class for typesetting theses, books and articles]
+    [2013/06/20 v1.7 A class for typesetting theses, books and articles]
 
 
+\ClassWarningNoLine{suftesi}{%
+  DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
+  WITH PACKAGES AND/OR COMMANDS WHICH CHANGE\MessageBreak
+  THE LAYOUT OF THE DOCUMENT.\MessageBreak
+  SEE DOCUMENTATION FOR DETAILS}{}%
 \RequirePackage{xkeyval}
 \newif\ifsuftesi@standardfont
 \newif\ifsuftesi@porson
@@ -77,13 +82,13 @@
 \@titlepagefalse
 \fi}
 \RequirePackage{geometry}
-  \geometry{heightrounded}
 \define@choicekey{}{pagelayout}[\val\nr]
     {standard,periodical,compact,supercompact,elements,
     periodicalaureo}[standard]{%
 \ifcase\nr\relax
   \DeclareRobustCommand{\SUF@chaptersize}{\Large}
 \geometry{%
+  heightrounded,
   a4paper,
   includeheadfoot=true,
   textwidth=      110mm,
@@ -95,6 +100,7 @@
 \suftesi@periodicaltrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
+  heightrounded,
   includeheadfoot=false,
     textheight=     165mm,
     textwidth=      110mm,
@@ -107,6 +113,7 @@
 \suftesi@compacttrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
+  heightrounded,
   includeheadfoot=false,
     textheight=     165mm,
     textwidth=      110mm,
@@ -119,6 +126,7 @@
 \suftesi@supercompacttrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{
+  heightrounded,
   includeheadfoot=false,
     textheight=     150mm,
     textwidth=      100mm,
@@ -130,6 +138,7 @@
 \or
 \suftesi@elementspagelayouttrue
   \geometry{%
+  heightrounded,
     includeheadfoot=false,
     textwidth=      251pt,
     textheight=     502pt,
@@ -143,6 +152,7 @@
 \suftesi@periodicalaureotrue
   \DeclareRobustCommand{\SUF@chaptersize}{\large}
   \geometry{%
+  heightrounded,
     includeheadfoot=true,
     textwidth=      120mm,
     textheight=     194mm,
@@ -328,6 +338,13 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
 \fi}
+\define@choicekey{}{smallcapsstyle}[\val\nr]
+    {low,upper}[low]{%
+\ifcase\nr\relax
+  \def\suftesi@MakeTextLowercase{\MakeTextLowercase}
+\or
+  \def\suftesi@MakeTextLowercase{\relax}
+\fi}
 \define@choicekey{}{headerstyle}[\val\nr]
     {inner,center,plain,authortitleinner,
      authortitlecenter,elements}[inner]{%
@@ -469,7 +486,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \ifcase\nr\relax
 \or
   \suftesi@standardfonttrue
-  \setkeys{suftesi.cls}{greekfont=cbgreek}
+\def\SUF@greekfamily{lmr}
 \fi}
 \define@choicekey{}{greekfont}[\val\nr]{%
     artemisia,porson,cbgreek}[artemisia]{%
@@ -506,13 +523,15 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \suftesi@draftdatetrue
 \or
 \fi}
-\define@choicekey{}{viewmode}[\val\nr]
-    {screen,print}[print]{%
+\define@choicekey{}{version}[\val\nr]
+    {screen,draft,final}[draft]{%
 \ifcase\nr\relax
   \suftesi@nocroptrue
-  \@twosidefalse
+  \geometry{hmarginratio=1:1}
   \newcommand*\crop[1][]{}
 \or
+\or
+  \AtBeginDocument{\crop[off]}
 \fi}
 \define@choicekey{}{titlepage}[\val\nr]
     {true,false}[true]{%
@@ -632,6 +651,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     style=italic5,
     chapnumstyle=roman,
     headerstyle=inner,
+    headerfont=italic,
     footnotestyle=hung,
     liststyle=indented,
     tocstyle=leftpage}
@@ -649,6 +669,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     style=smallcaps5,
     chapnumstyle=roman,
     headerstyle=inner,
+    headerfont=smallcaps,
     secfont=smallcaps,
     footnotestyle=hung,
     liststyle=indented,
@@ -685,7 +706,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   headerfont=roman,
   secnumstyle=arabic,
   partnumstyle=Roman,
-  chapnumstyle=arabic}
+  chapnumstyle=arabic,
+  smallcapsstyle=low}
 \ProcessOptionsX<>\relax
 \XKV@useoption{a4paper}   \XKV@useoption{10pt}
 \XKV@useoption{11pt}      \XKV@useoption{12pt}
@@ -705,7 +727,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \RequirePackage{emptypage}
 \RequirePackage{textcase}
 \RequirePackage{ifxetex}
-\RequirePackage{microtype}
+\RequirePackage[final]{microtype}
+  \SetTracking
+    [ name         = default,
+      no ligatures = {f} ]
+    { encoding     = {OT1,T1,T2A,LY1,OT4,QX,EU2} }
+    { 110 }
 \ifsuftesi@FSPL
   \RequirePackage{cclicenses}
  \else
@@ -722,6 +749,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
      \RequirePackage[osf,sc]{mathpazo}
      \RequirePackage[scaled=0.8]{beramono}
        \renewcommand{\sfdefault}{iwona}
+\AtBeginDocument{
+  \DeclareRobustCommand{\greektext}{%
+    \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}}%
+    \DeclareTextFontCommand{\textgreek}{\greektext}
+    }
 \fi
 \ifsuftesi@porson
 \sbox\z@{\fontsize{10}{10}\normalfont A}
@@ -745,10 +777,6 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \DeclareFontShape{LGR}{porson}{bx}{it}{<-> ssub * porson/m/n}{}
 \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> ssub * porson/m/n}{}
    \fi
-\AtBeginDocument{
-  \DeclareRobustCommand{\greektext}{%
-    \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}}%
-    \DeclareTextFontCommand{\textgreek}{\greektext}}
 \fi
 \ifsuftesi@nocrop
   \relax
@@ -765,17 +793,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
     \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
 \ifxetex
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
-    \addfontfeature{LetterSpace=6}\scshape\MakeTextLowercase{#1}}
+    \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}}
     \newcommand{\chapnumfont}[1]{%
       \def\SUF@chapnumfont{#1}}
       \chapnumfont{\fontspec[Numbers=OldStyle]{Junicode}}
 \else
   \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
-    \scshape\MakeTextLowercase{\textls[110]{#1}}}%
+    \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
-    \scshape\MakeTextLowercase{\textls[110]{#1}}}%
+    \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}%
   \newcommand{\chapnumfont}[1]{%
     \def\SUF@chapnumfont{\fontfamily{#1}}}
     \chapnumfont{pplj}
@@ -1280,7 +1308,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
           \ifsuftesi@supercompact
           \Margini {4.5cm}{10cm}{6cm}{1cm}
         \else
-     \fi
+      \ifsuftesi@periodicalaureo
+          \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+      \fi
+    \fi
   \fi
 \fi}
 {\@ifpackageloaded{frontespizio}
@@ -1582,33 +1613,24 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \newcommand{\FSPLcolophon}[1][\the\year]{%
 \begingroup
 \thispagestyle{empty}
-\small
-\null\vspace{\stretch{2}}
-\noindent Copyright \copyright{} #1 \@author%
-
 \null\vspace{\stretch{1}}
+\noindent \hskip-.5em\cc #1 \@author%
+\vskip1ex
 
-\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
+\small\noindent This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+To view a copy of this license, visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 
-\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
+\endgroup
+
+\begingroup
+\footnotesize
+
+\null\vspace{\stretch{1}}
+
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janusz M. Nowacki.
 
-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}
 \else
 \def\FSPLcolophon{%
@@ -1891,6 +1913,7 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
+    \vspace{2ex}%
     \section*{\listfigurename}%
        \@mkboth{\listfigurename}{\listfigurename}%
      \thispagestyle{empty}
@@ -1898,6 +1921,7 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
+    \vspace{2ex}%
     \section*{\listtablename}%
         \@mkboth{\listtablename}{\listtablename}%
       \thispagestyle{empty}