summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/suftesi/README4
-rw-r--r--Master/texmf-dist/doc/latex/suftesi/suftesi.pdfbin1425138 -> 1427000 bytes
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.dtx231
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.ins100
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls102
5 files changed, 239 insertions, 198 deletions
diff --git a/Master/texmf-dist/doc/latex/suftesi/README b/Master/texmf-dist/doc/latex/suftesi/README
index c8a37403eb4..2760647365a 100644
--- a/Master/texmf-dist/doc/latex/suftesi/README
+++ b/Master/texmf-dist/doc/latex/suftesi/README
@@ -23,7 +23,6 @@ This work consists of the following files:
README (this file)
suftesi.dtx
- suftesi.ins
suftesi.pdf
templates/
tesi-triennale/
@@ -59,7 +58,7 @@ INSTALLATION:
To install the distribution:
-o run "latex suftesi.ins"
+o run "pdflatex suftesi.dtx"
o move "suftesi.cls" to locations where LaTeX will find
it (the FAQ on CTAN in /help/uktug-FAQ gives more
information about this magic place)
@@ -69,7 +68,6 @@ DOCUMENTATION:
To reproduce the complete documentation, follow these steps:
-$ latex suftesi.ins
$ mpost fakelogo.mp
$ epstopdf --hires fakelogo.mps
$ pdflatex suftesi.dtx
diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
index a682358db7a..e6790a80242 100644
--- a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
+++ b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index e141f126350..8e2db041359 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -1,4 +1,83 @@
% \iffalse meta-comment
+%<*internal>
+\begingroup
+\input docstrip
+\preamble
+
+ Copyright 2009-2012 by Ivan Valbusa
+
+ This program is provided under the terms of the
+ LaTeX Project Public License distributed from CTAN
+ archives in directory macros/latex/base/lppl.txt.
+
+ Author: Ivan Valbusa
+ ivan dot valbusa at univr dot it
+
+ This work has the LPPL maintenance status "author-maintained".
+
+\endpreamble
+
+\keepsilent
+\askforoverwritefalse
+
+\Msg{*** Generating the class file ***}
+\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
+ \nopreamble\nopostamble
+ \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
+ \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
+ \file{style-roman1.tex}{\from{suftesi.dtx}{style-roman1}}
+ \file{style-roman2.tex}{\from{suftesi.dtx}{style-roman2}}
+ \file{style-roman3.tex}{\from{suftesi.dtx}{style-roman3}}
+ \file{style-roman4.tex}{\from{suftesi.dtx}{style-roman4}}
+ \file{style-roman5.tex}{\from{suftesi.dtx}{style-roman5}}
+ \file{style-roman6.tex}{\from{suftesi.dtx}{style-roman6}}
+ \file{style-italic1.tex}{\from{suftesi.dtx}{style-italic1}}
+ \file{style-italic2.tex}{\from{suftesi.dtx}{style-italic2}}
+ \file{style-italic3.tex}{\from{suftesi.dtx}{style-italic3}}
+ \file{style-italic4.tex}{\from{suftesi.dtx}{style-italic4}}
+ \file{style-italic5.tex}{\from{suftesi.dtx}{style-italic5}}
+ \file{style-italic6.tex}{\from{suftesi.dtx}{style-italic6}}
+ \file{style-italic7.tex}{\from{suftesi.dtx}{style-italic7}}
+ \file{style-italic8.tex}{\from{suftesi.dtx}{style-italic8}}
+ \file{style-italic9.tex}{\from{suftesi.dtx}{style-italic9}}
+ \file{style-italic10.tex}{\from{suftesi.dtx}{style-italic10}}
+ \file{style-italic11.tex}{\from{suftesi.dtx}{style-italic11}}
+ \file{style-italic12.tex}{\from{suftesi.dtx}{style-italic12}}
+ \file{style-smallcaps1.tex}{\from{suftesi.dtx}{style-smallcaps1}}
+ \file{style-smallcaps2.tex}{\from{suftesi.dtx}{style-smallcaps2}}
+ \file{style-smallcaps3.tex}{\from{suftesi.dtx}{style-smallcaps3}}
+ \file{style-smallcaps4.tex}{\from{suftesi.dtx}{style-smallcaps4}}
+ \file{style-smallcaps5.tex}{\from{suftesi.dtx}{style-smallcaps5}}
+ \file{style-smallcaps6.tex}{\from{suftesi.dtx}{style-smallcaps6}}
+ \file{style-smallcaps7.tex}{\from{suftesi.dtx}{style-smallcaps7}}
+ \file{style-smallcaps8.tex}{\from{suftesi.dtx}{style-smallcaps8}}
+ \file{style-smallcaps9.tex}{\from{suftesi.dtx}{style-smallcaps9}}
+ \file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}}
+ \file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}}
+ \file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}}
+ \file{style-elements.tex}{\from{suftesi.dtx}{style-elements}}
+ \file{style-sufelements.tex}{\from{suftesi.dtx}{style-sufelements}}
+ \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
+ \file{frontespizio.tex}{\from{suftesi.dtx}{frontespizio}}
+ }
+
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* files into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space suftesi.cls}
+\Msg{*}
+\Msg{*}
+\Msg{* To produce the documentation on suftesi's code run}
+\Msg{* the file ending with `.dtx' through (pdf)LaTeX. See the}
+\Msg{* README file for more details.}
+\Msg{*}
+\Msg{* Happy TeXing}
+\Msg{***********************************************************}
+
+\endgroup
+%</internal>
%
% Copyright (C) 2009-2012 by Ivan Valbusa
% <ivan dot valbusa at univr dot it>
@@ -23,7 +102,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [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]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -62,7 +141,7 @@
\renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont}
\usepackage{array,booktabs,multirow}
-\usepackage{microtype}
+\usepackage[final]{microtype}
\usepackage{siunitx}
\usepackage{pdfpages}
\usepackage{metalogo}
@@ -133,7 +212,7 @@
%</driver>
% \fi
%
-% \CheckSum{3356}
+% \CheckSum{3370}
%
% \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
@@ -151,6 +230,9 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v1.7}{2013/06/20}{Renamed \opt{viewmode} option to \opt{version}:
+% renamed \opt{print} value to \opt{draft} and
+% added \opt{final} value. New \opt{smallcapsstyle} option.}
% \changes{v1.6}{2013/04/17}{New option \opt{viewmode}. Corrected bugs in definition of \cmd{listoffigures}, \cmd{listoftables} and \cmd{tableofcontens} commands. Updated documentation.}
% \changes{v1.5}{2013/03/22}{The \sty{microtype} package is loaded for all engines. Improved compatibility with \sty{todonotes} package and with \sty{mdframed} and \sty{bookmark} packages when using \sty{style} class option. New option \opt{viewmode}}
% \changes{v1.4}{2013/03/15}{New value \opt{periodicalaureo} for option \opt{pagelayout}. Changed code for \cmd{xfootnote} command.}
@@ -452,6 +534,12 @@
% \end{valuelist}
% Where <level> can be \opt{part}, \opt{chap}, \opt{sec},
% \opt{subsec}, \opt{subsubsec}.
+% \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
+% This option is active only with \opt{<level>font=smallcaps} options.
+% \begin{valuelist}
+% \item[low] Prints lowercase small capitals.
+% \item[upper] Prints small capitals without changing the case.
+% \end{valuelist}
% \optitem[left]{<level>style}{\opt{left}, \opt{center},
% \opt{right}, \opt{parleft}, \opt{parcenter},
% \opt{parright}}
@@ -628,21 +716,22 @@
%
%\begin{optionlist}
% \settowidth{\labelwidth}{marginpar}
-% \optitem[print]{viewmode}{\opt{screen},\opt{print}}
+% \optitem[print]{version}{\opt{screen},\opt{draft}, \opt{final}}
% \begin{valuelist}
% \item[screen]
% This option is provided to have a better view when you are
% typesetting and reading the \textsc{pdf} on the screen.
% It simply executes the \opt{oneside} and \opt{nocrop=false}
% option and redefines the \cmd{crop} command so you do not need to comment it if it is used in the document.
-% \item[print]
+% \item[draft]
% Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{crop=true}.
+% \item[final] Prints the output on a A4 paper, hiding the crop marks.
% \end{valuelist}
%\boolitem[true]{crop}
% \begin{valuelist}
-% \item[true] Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{viewmode=print}.
+% \item[true] Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{version=draft}.
% \item[false] Prints a \textsc{pdf} with page dimensions
-% according to the \opt{pagelayout} option. It is similar to \opt{viewmode=screen} but it does not execute \opt{oneside} option and it does not redefine the \cmd{crop} command.
+% according to the \opt{pagelayout} option. It is similar to \opt{version=screen} but it does not execute \opt{oneside} option and it does not redefine the \cmd{crop} command.
% \end{valuelist}
% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
% \changes{v0.9b}{2012/09/23}{New option \opt{parindent}}
@@ -845,19 +934,21 @@
% \cmd{chapnumfont}\{pplj\}\\
% \cmd{chapnumfont}\{\cmd{fontspec}[Numbers=OldStyle]\{Junicode\}\}
% \end{ttquote}
-% \cmditem{toclabelspace}{level}{label-width}\new
+% \cmditem{toclabelspace}{label-width}\new
% \changes{v0.9a}{2012/08/31}{New command \cmd{toclabelspace}}
%
-% Sets the width of \cmd{thecontentslabel}. The default values are:
-% \begin{ttquote}
-% \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}
+% Sets the width of \cmd{thecontentslabel}.
+%
+% ^^A The default values are:
+% ^^A \begin{ttquote}
+% ^^A \cmd{toclabelspace}\{part\}\{1em\}\\
+% ^^A \cmd{toclabelspace}\{chapter\}\{1em\}\\
+% ^^A \cmd{toclabelspace}\{section\}\{1.5em\}\\
+% ^^A \cmd{toclabelspace}\{subsection\}\{2em\}\\
+% ^^A \cmd{toclabelspace}\{subsubsection\}\{2.5em\}\\
+% ^^A \cmd{toclabelspace}\{paragraph\}\{3em\}\\
+% ^^A \cmd{toclabelspace}\{subparagraph\}\{3.5em\}
+% ^^A \end{ttquote}
% \cmditem{xfootnote}{symbol}{footnote text}
% \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
%
@@ -1031,6 +1122,11 @@
% \section{The Code}
%<*class>
% \begin{macrocode}
+\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
@@ -1095,13 +1191,13 @@
% \subsection{Page layout}
% \begin{macrocode}
\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,
@@ -1113,6 +1209,7 @@
\suftesi@periodicaltrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
+ heightrounded,
includeheadfoot=false,
textheight= 165mm,
textwidth= 110mm,
@@ -1125,6 +1222,7 @@
\suftesi@compacttrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
+ heightrounded,
includeheadfoot=false,
textheight= 165mm,
textwidth= 110mm,
@@ -1137,6 +1235,7 @@
\suftesi@supercompacttrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
+ heightrounded,
includeheadfoot=false,
textheight= 150mm,
textwidth= 100mm,
@@ -1148,6 +1247,7 @@
\or
\suftesi@elementspagelayouttrue
\geometry{%
+ heightrounded,
includeheadfoot=false,
textwidth= 251pt,
textheight= 502pt,
@@ -1161,6 +1261,7 @@
\suftesi@periodicalaureotrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{%
+ heightrounded,
includeheadfoot=true,
textwidth= 120mm,
textheight= 194mm,
@@ -1373,6 +1474,17 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\def\SUF@dotsec{.}
\fi}
% \end{macrocode}
+% This option controls the style of small capitals used in the
+% title of chapters and sections using \opt{<level>font=smallcaps} option:
+% \begin{macrocode}
+\define@choicekey{}{smallcapsstyle}[\val\nr]
+ {low,upper}[low]{%
+\ifcase\nr\relax
+ \def\suftesi@MakeTextLowercase{\MakeTextLowercase}
+\or
+ \def\suftesi@MakeTextLowercase{\relax}
+\fi}
+% \end{macrocode}
% \subsection{Headers}
% \subsubsection{Header style}
% \begin{macrocode}
@@ -1549,7 +1661,7 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\or
\suftesi@standardfonttrue
- \setkeys{suftesi.cls}{greekfont=cbgreek}
+ \def\SUF@greekfamily{lmr}
\fi}
% \end{macrocode}
% \subsubsection{Greek fonts}
@@ -1605,13 +1717,15 @@ dotarabic,dotroman,dotRoman}[arabic]{%
% \end{macrocode}
% \subsubsection{View mode}
% \begin{macrocode}
-\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}
% \end{macrocode}
% \subsubsection{Titlepage}
@@ -1758,6 +1872,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
style=italic5,
chapnumstyle=roman,
headerstyle=inner,
+ headerfont=italic,
footnotestyle=hung,
liststyle=indented,
tocstyle=leftpage}
@@ -1778,6 +1893,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
style=smallcaps5,
chapnumstyle=roman,
headerstyle=inner,
+ headerfont=smallcaps,
secfont=smallcaps,
footnotestyle=hung,
liststyle=indented,
@@ -1817,7 +1933,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
headerfont=roman,
secnumstyle=arabic,
partnumstyle=Roman,
- chapnumstyle=arabic}
+ chapnumstyle=arabic,
+ smallcapsstyle=low}
\ProcessOptionsX<>\relax
% \end{macrocode}
% The use of the \cmd{XKV@useoption} command, provided by
@@ -1852,7 +1969,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 }
% \end{macrocode}
% The FSPL style requires a verbose colophon which uses specific icons:
% \begin{macrocode}
@@ -1876,6 +1998,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
% \end{macrocode}
% Scale the Porson font:
@@ -1902,10 +2029,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
% \end{macrocode}
% \subsection{Page layout}
@@ -1936,17 +2059,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
% \begin{macrocode}
\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}
@@ -2521,7 +2644,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}
@@ -2922,33 +3048,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
+
+\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 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
+\endgroup
-\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
+\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{%
@@ -3279,6 +3396,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}
@@ -3286,6 +3404,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}
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.ins b/Master/texmf-dist/source/latex/suftesi/suftesi.ins
deleted file mode 100644
index 46a4329b7cf..00000000000
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.ins
+++ /dev/null
@@ -1,100 +0,0 @@
-%% suftesi.ins
-%% Copyright (C) 2012-2012 Ivan Valbusa
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% Author: Ivan Valbusa
-%% ivan dot valbusa at univr dot it
-%%
-%% This work has the LPPL maintenance status "author-maintained".
-%%
-%% This file will generate fast loadable files and documentation
-%% driver files from the doc files in this package when run through
-%% LaTeX or TeX.
-%%
-%% This work consists of all files listed in README
-%%
-%% --------------- start of docstrip commands ------------------
-%%
-\input docstrip
-\preamble
-
- Copyright 2009-2012 by Ivan Valbusa
-
- This program is provided under the terms of the
- LaTeX Project Public License distributed from CTAN
- archives in directory macros/latex/base/lppl.txt.
-
- Author: Ivan Valbusa
- ivan dot valbusa at univr dot it
-
- This work has the LPPL maintenance status "author-maintained".
-
-\endpreamble
-
-\keepsilent
-\askforoverwritefalse
-
-\Msg{*** Generating the class file ***}
-\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
- \nopreamble\nopostamble
- \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
- \file{fakelogo.mp}{\from{suftesi.dtx}{fakelogo}}
- \file{style-roman1.tex}{\from{suftesi.dtx}{style-roman1}}
- \file{style-roman2.tex}{\from{suftesi.dtx}{style-roman2}}
- \file{style-roman3.tex}{\from{suftesi.dtx}{style-roman3}}
- \file{style-roman4.tex}{\from{suftesi.dtx}{style-roman4}}
- \file{style-roman5.tex}{\from{suftesi.dtx}{style-roman5}}
- \file{style-roman6.tex}{\from{suftesi.dtx}{style-roman6}}
- \file{style-italic1.tex}{\from{suftesi.dtx}{style-italic1}}
- \file{style-italic2.tex}{\from{suftesi.dtx}{style-italic2}}
- \file{style-italic3.tex}{\from{suftesi.dtx}{style-italic3}}
- \file{style-italic4.tex}{\from{suftesi.dtx}{style-italic4}}
- \file{style-italic5.tex}{\from{suftesi.dtx}{style-italic5}}
- \file{style-italic6.tex}{\from{suftesi.dtx}{style-italic6}}
- \file{style-italic7.tex}{\from{suftesi.dtx}{style-italic7}}
- \file{style-italic8.tex}{\from{suftesi.dtx}{style-italic8}}
- \file{style-italic9.tex}{\from{suftesi.dtx}{style-italic9}}
- \file{style-italic10.tex}{\from{suftesi.dtx}{style-italic10}}
- \file{style-italic11.tex}{\from{suftesi.dtx}{style-italic11}}
- \file{style-italic12.tex}{\from{suftesi.dtx}{style-italic12}}
- \file{style-smallcaps1.tex}{\from{suftesi.dtx}{style-smallcaps1}}
- \file{style-smallcaps2.tex}{\from{suftesi.dtx}{style-smallcaps2}}
- \file{style-smallcaps3.tex}{\from{suftesi.dtx}{style-smallcaps3}}
- \file{style-smallcaps4.tex}{\from{suftesi.dtx}{style-smallcaps4}}
- \file{style-smallcaps5.tex}{\from{suftesi.dtx}{style-smallcaps5}}
- \file{style-smallcaps6.tex}{\from{suftesi.dtx}{style-smallcaps6}}
- \file{style-smallcaps7.tex}{\from{suftesi.dtx}{style-smallcaps7}}
- \file{style-smallcaps8.tex}{\from{suftesi.dtx}{style-smallcaps8}}
- \file{style-smallcaps9.tex}{\from{suftesi.dtx}{style-smallcaps9}}
- \file{style-smallcaps10.tex}{\from{suftesi.dtx}{style-smallcaps10}}
- \file{style-smallcaps11.tex}{\from{suftesi.dtx}{style-smallcaps11}}
- \file{style-smallcaps12.tex}{\from{suftesi.dtx}{style-smallcaps12}}
- \file{style-elements.tex}{\from{suftesi.dtx}{style-elements}}
- \file{style-sufelements.tex}{\from{suftesi.dtx}{style-sufelements}}
- \file{collect-examples.tex}{\from{suftesi.dtx}{collect-examples}}
- \file{frontespizio.tex}{\from{suftesi.dtx}{frontespizio}}
- }
-
-\Msg{***********************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space suftesi.cls}
-\Msg{*}
-\Msg{*}
-\Msg{* To produce the documentation on suftesi's code run}
-\Msg{* the file ending with `.dtx' through (pdf)LaTeX. See the}
-\Msg{* README file for more details.}
-\Msg{*}
-\Msg{* Happy TeXing}
-\Msg{***********************************************************}
-
-\endbatchfile
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}