1 files changed, 42 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 2033e658716..3ebec9475b9 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>
-    [2016/02/26 v2.4 A class for typesetting theses, books and articles]
+    [2016/03/02 v2.5 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -77,11 +77,12 @@
 \usepackage[greek.ancient,english]{babel}
 \usepackage[final]{microtype}
 \usepackage{siunitx}
-
+% To use the cochineal inside the document we have to define the family
+% because the .fd files of the font refer to conditionals 
+% defined in 'cochineal.sty’:
 \DeclareFontFamily{T1}{Cochineal-LF}{}
 \DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
       <-> s*[1.0] Cochineal-Roman-osf-t1}{}
-
 % Doc facilities
 \let\cs\relax
 \let\cmd\relax
@@ -113,10 +114,8 @@
 ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
 ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
 \newcommand{\greekexample}[4]{%
-	\noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt} 
-		{\fontfamily{#2}%
-		%\fontsize{#4}{13}
-		\selectfont%
+	\noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt}% 
+		{ \fontfamily{#2}\fontsize{#4}{13}\selectfont%
 		\textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
 % New commands
 \newcommand{\argstyle}{\itshape}
@@ -128,11 +127,11 @@
 \DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
 % New environments
 \newenvironment{ttquote}
-  {\begin{mdframed}[backgroundcolor=gray!20]
+  {\begin{mdframed}[default]
   \ttfamily\microtypesetup{activate=false}}
   {\end{mdframed}}
 \newenvironment{latexcode}
-  {\begin{mdframed}[backgroundcolor=gray!20]}
+  {\begin{mdframed}[default]}
   {\end{mdframed}}
 % Correct (?) \optitem to use \meta inside #2
 \makeatletter
@@ -150,7 +149,7 @@
     pdfauthor={Ivan Valbusa},
     pdfkeywords={thesis, humanities, books}}   
 % Informations
-\author{Ivan Valbusa\thanks{Dipartimento di Filosofia, Università degli Studi di Verona --- 
+\author{Ivan Valbusa\thanks{Dipartimento di Scienze Umane, Università degli Studi di Verona --- 
 	\texttt{ivan dot valbusa at univr dot it}}}
 \title{User's Guide to \textsf{suftesi}\\
 	\normalsize A document class for typesetting\\ theses,  books and articles}
@@ -167,7 +166,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{4594}
+% \CheckSum{4589}
 %
 % \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
@@ -185,6 +184,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.5}{2016/03/02}{Corrected a bug when loading CB Greek fonts. Updated documentation.}
 % \changes{v2.4}{2016/02/27}{Changed the default font to Cochineal with Linux Biolinum O sans serif and Inconsolata monospaced. The Palatino is now loaded with \sty{newpxtext} and \sty{newpxmath}. Bera Mono and Iwona have been substituted by Linux Biolinum O and Inconsolata. New values for font options: \opt{cochineal}, \opt{libertine}, \opt{bodoni} (greek only). Value \opt{compatibility} for \opt{defaultfont} option to get the fonts of suftesi v2.3 or previous. Updated documentation.}
 % \changes{v2.3}{2015/09/19}{Maintenance release.}
 % \changes{v2.2}{2015/09/10}{Maintenance release.}
@@ -355,7 +355,7 @@
 % 
 % The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at:
 %\begin{center} 
-%\url{https://www.ctan.org/tex-archive/macros/latex/contrib/suftesi}
+%\textcolor{magenta}{\url{https://www.ctan.org/tex-archive/macros/latex/contrib/suftesi}}
 %\end{center}
 %
 %
@@ -435,21 +435,21 @@
 % set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson, by the Greek Font Society and CB Greek by Claudio Beccari. You may, of course, choose a different font but, as previously cleared, remember to load the \opt{defaultfont=none} option.
 % 
 %
-% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{12}
+% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{10}
 % \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{10}
-% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10.4}
+% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10}
 % \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{10}
 % \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{10}
-% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{12}
-% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10.5}
-% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10.9}
+% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{10}
+% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10}
+% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10}
 % \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{10}
-% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{11}
-% \greekexample{zplosf}{bodoni}{Palatino/Bodoni}{11}
-% \greekexample{zplosf}{artemisia}{Palatino/Artemisia}{11}
-% \greekexample{zplosf}{porson}{Palatino/Porson}{11.3}
-% \greekexample{zplosf}{lmr}{Palatino/CB Greek}{11}
-% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{11}
+% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{10}
+% \greekexample{zplosf}{bodoni}{Palatino/Bodoni}{10}
+% \greekexample{zplosf}{artemisia}{Palatino/Artemisia}{10}
+% \greekexample{zplosf}{porson}{Palatino/Porson}{10}
+% \greekexample{zplosf}{lmr}{Palatino/CB Greek}{10.5}
+% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{10}
 %
 %
 % \subsection{The frontispiece} \enlargethispage{\baselineskip}
@@ -468,8 +468,6 @@
 % The \sty{frontespizio} package produces a frontispiece in the standard Computer Modern typeface. If you prefer a consistent font remember to load the needed packages or commands in the \cmd{Preambolo} command:
 %\begin{latexcode}
 %\begin{verbatim}
-%\begin{document}
-%...
 %  \begin{frontespizio} 
 %    \Preambolo{\usepackage[osf]{cochineal}}%  <===
 %    \Universita{Paperopoli} 
@@ -482,8 +480,6 @@
 %    \Candidato[vr12301231]{Paolo Rossi} 
 %    \Relatore{Guido Bianchi} 
 %  \end{frontespizio}
-%...
-%\end{document}
 %\end{verbatim}
 %\end{latexcode}
 %
@@ -530,6 +526,10 @@
 %\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
 %\end{figure}
 %
+%^^A\subsection{Title page}
+% 
+%^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of  the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
+%
 % \section{Options}\label{sec:options}
 %
 % \subsection{Layout}\label{sec:page-styles}
@@ -604,7 +604,7 @@
 %     \item[standard] Loads the {\fontfamily{lmr}\selectfont Latin Modern} font family 
 %                     and the standard CB Greek font.
 %   \end{valuelist}
-% \optitem[cbgreek]{greekfont}{\opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
+% \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
 %     \item[none] Does not load any Greek font.
@@ -674,7 +674,7 @@
 % \end{optionlist}
 %
 %
-% 	\subsection{Table fo contents}\label{sec:toc}
+% 	\subsection{Table of contents}\label{sec:toc}
 %
 %
 % \begin{optionlist}
@@ -908,6 +908,7 @@
 % With the \opt{article} option, you can use the \cmd{artcolophon} command 
 % (see below) 
 % or  the \cmd{thanks} command:
+%
 %\begin{latexcode}
 %\begin{verbatim}
 %\author{Name Surname
@@ -1079,7 +1080,6 @@
 % \begin{article}
 % \author{Author}
 % \title{Title of the paper}
-%
 %  % The abstract is optional.
 %  % \begin{abstract}
 %  %  The abstract
@@ -1136,6 +1136,7 @@
 %
 %        Note that if you use this last option you need 
 %         to protect the \cmd{thanks} command:
+%
 % \begin{latexcode}
 %\begin{verbatim}
 %\author{The Author\protect\thanks{...}}
@@ -1163,7 +1164,7 @@
 %\end{ltxsyntax}
 %
 % \section{Backward compatibility}
-% \addcontentsline{toc}{section}{Backward compatibility}
+%
 % \begin{optionlist}
 % \optitem{defaultfont}{\opt{compatibility}}
 % Loads the fonts of \sty{suftesi} v2.3 (or previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font (Artemisia) of those versions add the \opt{greekfont=artemisia} option.
@@ -1358,6 +1359,7 @@
 % \StopEventually{\PrintChanges\PrintIndex}
 %
 % \section*{The Code}
+% \addcontentsline{toc}{section}{The Code}
 % \iffalse
 %<*class>
 % \fi
@@ -2119,7 +2121,6 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \define@choicekey{}{version}[\val\nr]
     {screen,draft,final}[draft]{%
 \ifcase\nr\relax
-  \@twosidefalse
   \suftesi@nocroptrue
   \newcommand*\crop[1][]{}
 \or
@@ -2763,9 +2764,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
   \else
 \fi
 
-\ifxetex
-  \else
-    \ifsuftesi@greekfont
+\ifxetex\else
+  \ifsuftesi@greekfont
+    \ifsuftesi@cbgreek
+      \else
 \DeclareFontFamily{LGR}{bodoni}{}
 \DeclareFontShape{LGR}{bodoni}{m}{n}{<-> s * [\SUFfntscale] gbodonirg6a}{}
 \DeclareFontShape{LGR}{bodoni}{m}{it}{<-> s * [\SUFfntscale] gbodonii6a}{}
@@ -2806,13 +2808,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 \DeclareFontShape{LGR}{porson}{bx}{n}{<-> s * [\SUFfntscale] gporsonrg6a}{}
 \DeclareFontShape{LGR}{porson}{bx}{it}{<-> s * [\SUFfntscale] gporsonrg6a}{}
 \DeclareFontShape{LGR}{porson}{bx}{sl}{<-> s * [\SUFfntscale] gporsonrg6a}{}
+\fi
 \else
-  \ifsuftesi@nofont
-    \else
-      \ifsuftesi@standard
-        \else
-      \fi
-    \fi
   \fi
 \fi
 %    \end{macrocode}
@@ -2826,11 +2823,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
 %    \end{macrocode}
 % A trick to produce one-side documents:
 %    \begin{macrocode}
- \if@twoside
-   \relax
-     \else
-   \geometry{hmarginratio=1:1}
-\fi
+ \ifsuftesi@screen
+    \geometry{hmarginratio=1:1}
+   \else
+ \fi
 %    \end{macrocode}
 % \subsection*{Section titles}
 %    \begin{macrocode}