sapthesis (18jan12)

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

10 files changed, 407 insertions, 470 deletions

diff --git a/Master/texmf-dist/doc/latex/sapthesis/README.sapthesis b/Master/texmf-dist/doc/latex/sapthesis/README
index e2b0dfaf86b..debf41690e5 100644
--- a/Master/texmf-dist/doc/latex/sapthesis/README.sapthesis
+++ b/Master/texmf-dist/doc/latex/sapthesis/README
@@ -10,7 +10,7 @@
       
 ** License **********************************************************
 
-      Copyright (c) 2008-2011 by Francesco Biccari.
+      Copyright (c) 2008-2012 by Francesco Biccari.
 
       This work (specified below) may be distributed and/or
       modified under the conditions of the 
@@ -39,7 +39,7 @@
 ** Class information ************************************************
 
       Sapthesis is a LaTeX class to typeset PhD, Master and Bachelor
-      theses that adhere to "Sapienza - University of Rome" 's
+      theses that adhere to "Sapienza - University of Rome"'s
       guidelines for publishing.
       It is compatible with two compilation methods:
       pdflatex and xelatex.
@@ -70,16 +70,16 @@
         4. sapthesis-example.pdf (a document example)
         5. sapthesis-example.tex (source of the example)
         6. README (this file)
-        7. marchiologo_rosso_positivo.pdf (university logo)
-        8. marchiologo_nero_positivo.pdf (university logo)
+        7. sapienza-MLred-pos.pdf (red university logo)
+        8. sapienza-MLblack-pos.pdf (black university logo)
         9. sapthesis.bst (an english BibTeX style)
 
       The following files should end up in your texmf tree
       (or your localtexmf tree) at these locations:
 
       <texmf>/tex/latex/sapthesis/sapthesis.cls
-      <texmf>/tex/latex/sapthesis/marchiologo_rosso_positivo.pdf
-      <texmf>/tex/latex/sapthesis/marchiologo_nero_positivo.pdf
+      <texmf>/tex/latex/sapthesis/sapienza-MLred-pos.pdf
+      <texmf>/tex/latex/sapthesis/sapienza-MLblack-pos.pdf
       <texmf>/doc/latex/sapthesis/sapthesis-doc.pdf
       <texmf>/doc/latex/sapthesis/sapthesis-doc.tex
       <texmf>/doc/latex/sapthesis/sapthesis-example.pdf
@@ -90,6 +90,6 @@
       Then, you need to update the file database.
 
       Alternatively, you can simply copy sapthesis.cls and sapthesis.bst
-      together with marchiologo_rosso_positivo.pdf and
-      marchiologo_nero_positivo.pdf into your local work directory where
+      together with sapienza-MLred-pos.pdf and
+      sapienza-MLblack-pos.pdf into your local work directory where
       your thesis files will live.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/sapthesis/README.TEXLIVE b/Master/texmf-dist/doc/latex/sapthesis/README.TEXLIVE
deleted file mode 100644
index 874b450c1cb..00000000000
--- a/Master/texmf-dist/doc/latex/sapthesis/README.TEXLIVE
+++ /dev/null
@@ -1,8 +0,0 @@
-The following files have been removed in the TeX Live installation of
-the current package, typically due to duplication, lack of space, or
-missing source code.  You can find these files on CTAN at
-	http://mirror.ctan.org/macros/latex/contrib/sapthesis
-If questions or concerns, email tex-live@tug.org.
-
-	marchiologo_nero_positivo.pdf
-	marchiologo_rosso_positivo.pdf
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLblack-pos.pdf b/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLblack-pos.pdf
new file mode 100644
index 00000000000..f8b64b193ec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLblack-pos.pdf
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLred-pos.pdf b/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLred-pos.pdf
new file mode 100644
index 00000000000..348c7c9c09b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapienza-MLred-pos.pdf
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.pdf b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.pdf
index 3fede7fc9c9..c54bff221a6 100644
--- a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.pdf
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.tex b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.tex
index ef416cff199..6273b65ac42 100644
--- a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.tex
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-doc.tex
@@ -1,3 +1,7 @@
+% !TEX encoding = UTF-8
+% !TEX program = pdflatex
+% !TEX spellcheck = en_US
+
 \documentclass[a5paper,11pt]{article}
 
 \usepackage[scale=0.85, footskip=0.8cm,heightrounded]{geometry}
@@ -51,7 +55,7 @@
 \author{\small Francesco Biccari\thanks{\href{mailto:biccari@gmail.com}{biccari@gmail.com}}}
 \title{\small Documentation of the \LaTeX\ class\\
 		\Large \textbf{\texttt{sapthesis.cls}}\\
-		\small \vspace{0.2cm} Version 2.8, 2011-09-13
+		\small \vspace{0.2cm} Version 3.0, 2012-01-05
 }
 \date{}
 
@@ -138,8 +142,8 @@ In that file the page layout and the layout choices are explained.
 \textsf{Sapthesis} is released under the terms of the latest version of the 
 \href{http://www.latex-project.org/lppl/}{\LaTeX\ Project Public License}.
 
-I would thank the Italian \TeX\ user group (\href{http://www.guitex.org/}{GuIT}) for the help provided, in particular Prof.~Enrico Gregorio.
-I would thank also Dr.~Gabriele Di Segni and Dr.~Matteo Siccardi.
+I would thank the Italian \TeX\ user group (\href{http://www.guitex.org/}{GuIT}) for the help provided, in particular Enrico Gregorio.
+I would thank also (alphabetically) Claudio Beccari, Davide Di Bucchianico, Gabriele Di Segni, Giovanni Nuccetelli, Davide Paltrinieri, Francesco Pannarale and Matteo Siccardi.
 
 \section[Requirements\\ and installation]{Requirements and installation}
 
@@ -157,8 +161,8 @@ Bib\TeX\ way to compose your bibliography and if your thesis is written in
 English (its usage is not mandatory).
 
 
-\textsf{Sapthesis} explicitely loads the packages \textsf{xkeyval}, \textsf{geometry}, \textsf{ifxetex}, \textsf{xltxtra}, \textsf{fontenc}, \textsf{textcomp}, \textsf{lmodern}, \textsf{caption}, \textsf{graphicx}, \textsf{color}, \textsf{booktabs}, \textsf{amsmath}, \textsf{fancyhdr}, \textsf{emptypage}.
-It is highly recommended to not include these packages in the preamble of your document because already loaded by \textsf{sapthesis}.
+\textsf{Sapthesis} explicitely loads the packages \textsf{xkeyval}, \textsf{geometry}, \textsf{ifxetex}, \textsf{xltxtra}, \textsf{fontenc}, \textsf{textcomp}, \textsf{lmodern}, \textsf{caption}, \textsf{graphicx}, \textsf{color}, \textsf{booktabs}, \textsf{amsmath}, \textsf{fancyhdr}.
+Do \textbf{not} include these packages in the preamble of your document!
 
 
 
@@ -170,12 +174,12 @@ A \LaTeX\ document based on \textsf{sapthesis} can be compiled only by the comma
 \texttt{pdflatex} and \texttt{xelatex}. In this manual only \texttt{pdflatex} will be considered.
 
 
-As usual, in order to use this class you need to call it by
+As usual, in order to use this class, you need to call it by
 \begin{lstlisting}
 \documentclass[|\textit{\texttt{options}}|]{sapthesis}
 \end{lstlisting}
-You have to specify the correct options for your case (see Sec.~\ref{class_options}). Then you have to provide some fundamental information (title, author, etc\ldots) by specific commands (see Sec.~\ref{commands_titlepage}). Finally remember that it is important to follow a source code structure similar to those of the examples given in Sec.~\ref{sec:PhDexample} and~\ref{sec:LaMexample}.
-Especially the usage of the commands \texttt{\bs frontmatter}, \texttt{\bs mainmatter} and \texttt{\bs backmatter} is mandatory, otherwise the page style of the document will be wrong.
+You have to specify the class options for your case (see Sec.~\ref{class_options}). Then you have to provide some fundamental information (title, author, etc\ldots) by specific commands (see Sec.~\ref{commands_titlepage}). Finally remember to follow a source code structure similar to those of the examples given in App.~\ref{sec:PhDexample} and~\ref{sec:LaMexample}.
+Especially the usage of the commands \texttt{\bs frontmatter}, \texttt{\bs mainmatter} and \texttt{\bs backmatter} is mandatory, otherwise the page style of the document will be wrong!
 
 This class supports, at the moment, two languages: Italian and English. English is the default.
 If your thesis contains only English or very few paragraphs in another language, do not use the \texttt{babel} package because completely useless. Instead, if you write in italian, load the \texttt{babel} package with the
@@ -183,37 +187,37 @@ If your thesis contains only English or very few paragraphs in another language,
 
 \subsection{Class options}
 \label{class_options}
-These options can be passed in the documentclass command.
+The following options can be passed in the documentclass command.
 
 \begin{description}
-\item[\texttt{PhD}, \texttt{PhDA}, \texttt{PhDB}] The last two options are respectively for PhD theses in Physics and Mathematics. If your PhD is not in Physics or Mathematics, use the simple \texttt{PhD} option. (``Dottorato di ricerca'')
-\item[\texttt{LaM}] Option to typeset a Laurea Magistrale thesis. (``Laurea Specialistica'')
-\item[\texttt{Lau}] Option to typeset a Laurea thesis. (``Laurea Triennale'')
-\item[\texttt{MasterP}, \texttt{MasterS}] Options to typeset a thesis for a
-First level master (``Master di primo livello'') and a Second level master (``Master di secondo livello'') respectively.
-\item[\texttt{draft}] This is the usual draft option of the \LaTeX\ Standard Classes
-\item[\texttt{oneside}] The usual oneside option of the \LaTeX\ Standard Classes
-\item[\texttt{twoside}] (default) The usual twoside option of the \LaTeX\ Standard Classes
-
-\item[\texttt{bn}] This option typesets the frontispiece in black and white
-(using the b/w logo, \texttt{marchiologo\_nero\_positivo.pdf}, instead of the colored one) and passes the \texttt{monochrome} option to \textsf{color} and 
+\item[\texttt{PhD}] Option to typeset a \textit{Dottorato di Ricerca} (PhD) thesis.
+\item[\texttt{LaM}] Option to typeset a \textit{Laurea Magistrale} (Master's degree) thesis.
+\item[\texttt{Lau}] Option to typeset a \textit{Laurea} (Bachelor's degree) thesis.
+\item[\texttt{MasterP}] Option to typeset a thesis for a \textit{Master di primo livello} (First level master).
+\item[\texttt{MasterS}] Option to typeset a thesis for a \textit{Master di secondo livello} (Second level master).
+\item[\texttt{draft}] The usual \texttt{draft} option of the \LaTeX\ Standard Classes.
+\item[\texttt{oneside}] The usual \texttt{oneside} option of the \LaTeX\ Standard Classes.
+\item[\texttt{twoside}] (default) The usual \texttt{twoside} option of the \LaTeX\ Standard Classes.
+
+\item[\texttt{bn}] This option typesets the title page in black and white
+(using the b/w logo, \texttt{sapienza-MLblack-pos.pdf}, instead of the colored one) and passes the \texttt{monochrome} option to \textsf{color} and 
 \textsf{xcolor} packages.
 
 \item[\texttt{binding=\textsl{length}}] (zero default binding)
-The value of this option is an offset of the the text column.
-It is useful to take in account the margin for the binding (ask to your bookbinder for information).
+The value of this option is an offset of the text column.
+It is useful to take into account the margin for the binding (ask to your bookbinder for information).
 \item[\texttt{noexaminfo}] Remove the final exam informations.
 \item[\texttt{italian} or \texttt{english}] Explicitly declare the language of 
-the frontispiece. Useful when you want to write the frontispiece in a language 
+the title page. Useful when you want to write the title page in a language 
 and the thesis in a different language.
-\item[\texttt{nodefaultfont}] To be documented.
+\item[\texttt{nodefaultfont}] Avoid the loading of packages \textsf{fontenc}, \textsf{textcomp} and \textsf{lmodern}.
 \item[\texttt{romandiff}] See App.~\ref{sec:usefulcommands}.
 \end{description}
 
-\subsection[Commands for the\\ titlepage]{Commands for the titlepage}
+\subsection[Commands for the\\ title page]{Commands for the title page}
 \label{commands_titlepage}
 
-As usual, the titlepage is generated by the \texttt{\bs maketitle} command.
+As usual, the title page is generated by the \texttt{\bs maketitle} command.
 It needs some information that you can supply by the following commands
 in the preamble of the document.
 \begin{description}
@@ -221,11 +225,11 @@ in the preamble of the document.
 
 \item[\texttt{\bs author\{\dots\}}] Mandatory
 
-\item[\texttt{\bs IDnumber\{\dots\}}] Mandatory. Your ID number (\textit{matricola} in italian)
+\item[\texttt{\bs IDnumber\{\dots\}}] Mandatory. Your ID number (\textit{matricola} in Italian)
 
-\item[\texttt{\bs course[\dots]\{\dots\}}] Use Italian. Mandatory except for PhDA and PhDB options. The optional argument specifies the course name in another language, which is needed only in the case of PhD's.
+\item[\texttt{\bs course[\dots]\{\dots\}}] Mandatory. Use the official Italian name of the course. The optional argument specifies the course name in another language, which is needed in the case of PhD's theses because of the ``requirements'' declaration.
 
-\item[\texttt{\bs courseorganizer\{\dots\}}] Mandatory except for PhDA and PhDB options.
+\item[\texttt{\bs courseorganizer\{\dots\}}] Mandatory.
 
 \item[\texttt{\bs cycle\{\dots\}}] Mandatory only for PhD's. Use the form: \texttt{\bs cycle\{XXII\}}
 
@@ -266,7 +270,8 @@ hyper-linked if \textsf{hyperref} package is loaded.
 
 \item[\texttt{\bs dedication\{\dots\}}] A command to compose the dedication.
 
-\item[\texttt{abstract}] An environment to compose the abstract of your document.
+\item[\texttt{abstract}] An environment to compose the abstract of your document. This environment has an optional parameter to choose the title of the abstract section.
+If you use a language for the abstract different from that of the thesis, consider the \texttt{\bs selectlanguage\{\dots\}} command provided by the \texttt{babel} package.
 
 \item[\texttt{acknowledgments}] An environment to compose the acknowledgments of your document. This environment has an optional parameter to choose the title of the acknowledgments section.
 If you use a language for the acknowledgments different from that of the thesis, consider the \texttt{\bs selectlanguage\{\dots\}} command provided by the \texttt{babel} package.
@@ -284,9 +289,10 @@ This color is switched to black if the \texttt{bn} option is in use. Example of
 
 \item Do \textbf{not} change the default layout and do \textbf{not} use packages which can modify the layout of your thesis.
 
+\item Do \textbf{not} load the following packages in the preamble of your document because already loaded by \textsf{sapthesis}: \textsf{xkeyval}, \textsf{geometry}, \textsf{ifxetex}, \textsf{xltxtra}, \textsf{fontenc}, \textsf{textcomp}, \textsf{lmodern}, \textsf{caption}, \textsf{graphicx}, \textsf{color}, \textsf{booktabs}, \textsf{amsmath}, \textsf{fancyhdr}.
 
-\item As you already should know, \LaTeX\ can process only document
-in pure ASCII. If you want to insert \emph{directly} other characters, non included in the 128 ASCII
+\item As you already should know, \LaTeX\ can process only documents
+in pure ASCII. If you want to insert \emph{directly} other characters, not included in the 128 ASCII
 characters (for example accented letters), you have to use a particular text encoding for your source file. Then you have to ``tell'' to \LaTeX\ which encoding you have chosen by the packages \texttt{inputenc} or \texttt{inputenx}.
 
 However, if your thesis is in English, I suggest to avoid the use of a particular text encoding for the source code because  you will insert non ASCII characters very seldom. For this reason it is better to write these characters by the usage of the \LaTeX\ commands (for example \texttt{\bs\sq e} for the \'e letter), avoiding to load \texttt{inputenc} or \texttt{inputenx} package. This has another advantage, in fact your source file will be very portable.
@@ -309,7 +315,7 @@ is not very professional. The dedication should be enough.
 
 \item Do not put any preface in your thesis. The preface should be written only by an eminent expert in the field to comment exceptionally important results of the student.
 
-\item Usually tables and figures are centered. Remember that, according to the typographic rules, \emph{the table captions should be placed above the table}, whereas the figure caption should be placed below the figure.
+\item Usually tables and figures are centered. Remember that, according to the typographic rules, the table captions should be placed \textbf{above} the table, whereas the figure caption should be placed \textbf{below} the figure.
 
 \item If the figure has a small width, it is possible to put the figure caption
 aside the figure using the \texttt{sidecap} package (not preloaded in \texttt{sapthesis.cls}).
@@ -320,9 +326,9 @@ aside the figure using the \texttt{sidecap} package (not preloaded in \texttt{sa
 
 \item The name of operators should be typed in roman. Example: use $\sin$ (\texttt{\$\bs sin\$}) instead of $sin$ (\texttt{\$sin\$}).
 
-\item The margin notes are rarely used in scientific documents and \emph{should not be used in a thesis}.
+\item The margin notes are rarely used in scientific documents and should \textbf{not} be used in a thesis.
 
-\item Do not divide the bibliography per chapter unless it is really necessary.
+\item Do not divide the bibliography per chapter unless it is \textbf{really} necessary.
 This will save you from wasting a lot of time to prepare your \LaTeX\ source code.
 Order your bibliography alphabetically according to the
 first author surname: this order is very useful, contrary to the other typical order, the citation order. In this regard
@@ -348,10 +354,10 @@ italian students.
 Pantieri \& T. Gordini}, \textit{L'arte di scrivere con \LaTeX}, (2011)}
 
 \bibitem{Pakin_Symbol}
-\href{http://www.ctan.org/tex-archive/info/symbols/comprehensive/symbols-a4.pdf}{\textsc{S. Pakin}, \textit{The comprehensive \LaTeX\ symbol list}, (2008)}
+\href{http://www.ctan.org/tex-archive/info/symbols/comprehensive/symbols-a4.pdf}{\textsc{S. Pakin}, \textit{The comprehensive \LaTeX\ symbol list}, (2009)}
 
 \bibitem{Gregorio_Pacchetti}
-\href{http://profs.sci.univr.it/~gregorio/breveguida.pdf}{\textsc{E. Gregorio}, \textit{\LaTeX: breve guida ai pacchetti di uso pi\`u comune}, (2009)}
+\href{http://profs.sci.univr.it/~gregorio/breveguida.pdf}{\textsc{E. Gregorio}, \textit{\LaTeX: breve guida ai pacchetti di uso pi\`u comune}, (2010)}
 \end{thebibliography}
 
 
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.pdf b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.pdf
index 59eec4c4e2c..f1492191340 100644
--- a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.pdf
diff --git a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.tex b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.tex
index 9195d9a3ded..89e20acc24f 100644
--- a/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.tex
+++ b/Master/texmf-dist/doc/latex/sapthesis/sapthesis-example.tex
@@ -1,14 +1,25 @@
-\documentclass[binding=0.6cm,PhD]{sapthesis}
+\documentclass[PhD,binding=0.6cm]{sapthesis}
 
-% CLASS OPTIONS:
+% MAIN CLASS OPTIONS
+%
 % PhD: generic PhD
 % PhDA: PhD in physics
 % PhDB: PhD in mathematics
 % LaM: Laurea Magistrale
 % Lau: Laurea
+% MasterP: Master di primo livello
+% MasterS: Master di secondo livello
+%
+% draft
+% oneside/twoside
+% bn
+% binding=length
 % noexaminfo: no information about the final exam
-
+%
+%
+%
 % REQUIRED COMMANDS
+%
 % title
 % author
 % IDnumber
@@ -19,10 +30,11 @@
 % copyyear
 % advisor (at least one)
 % authoremail
-
-
-
+%
+%
+%
 % OPTIONAL COMMANDS
+%
 % coadvisor
 % examdate
 % examiner
@@ -31,11 +43,10 @@
 % ISBN
 
 
-
 % if pdfLaTeX is used load also:
 \usepackage{microtype}
 % if you write in italian:
-%\usepackage[italian]{babel}
+% \usepackage[italian]{babel}
 % \usepackage[utf8]{inputenx}
 
 \usepackage{hyperref}
@@ -47,8 +58,12 @@
 	pdftitle={Sapthesis class example},
 	pdfauthor={Francesco Biccari}}
 
-% dummy text
+% dummy text (remove in a normal thesis)
 \usepackage{lipsum}
+% draw (remove in a normal thesis unless necessary)
+\usepackage{curve2e}
+% definition of gray
+\definecolor{gray}{gray}{0.4}
 
 % custom commands
 \newcommand{\bs}{\textbackslash}
@@ -68,137 +83,118 @@
 
 \examdate{16 April 2010}
 \examiner{Prof. Enrico Gregorio}
+\examiner{Prof. Claudio Beccari}
 \examiner{Dr. Lorenzo Pantieri}
 \versiondate{1 May 2010}
 \website{biccari.altervista.org}
 \ISBN{000000000-0}
 
+
+
 \begin{document}
 
 \frontmatter
+
 \maketitle
 
 \dedication{Dedicated to\\ Donald Knuth}
 
-\begin{abstract} This document is an example which shows the main features of
+\begin{abstract}
+This document is an example which shows the main features of
 the \LaTeXe\ class \texttt{sapthesis.cls} developed by Francesco Biccari
 with the help of GuIT (Gruppo Utilizzatori Italiani di \TeX).
 \end{abstract}
 
 \begin{acknowledgments}[Ringraziamenti]
 Ho deciso di scrivere i ringraziamenti in italiano
-per dimostrare la mia gratitudine verso i ragazzi
+per dimostrare la mia gratitudine verso i membri
 del GuIT, il Gruppo Utilizzatori Italiani di \TeX, e, in particolare,
-verso il Prof. Enrico Gregorio.
+verso il prof. Enrico Gregorio.
 \end{acknowledgments}
 
 \tableofcontents
 
+% Do not use the starred version of the chapter command!
 \chapter{Non numbered chapter}
 
+In this manual you can skip the gray text because it is just dummy text.
 
-\lipsum[1-10]
+\textcolor{gray}{\lipsum[1-22]}
 
-\mainmatter
-\chapter{Style features of \textsf{sapthesis} (this is a numbered chapter)}
 
-The page is fixed at the dimensions of an A4 paper. The font dimension is fixed at 11\, pt and the text column and the margins are chosen to fill to the best an A4 paper while keeping a reasonable line length (396\, pt) for a good readability.
+\section*{Non numbered section}
 
-The text heigth and the text width are in golden ratio (\textasciitilde 1.62) as well as the outer and inner margins in a two-side document after binding margin removal.
-The top margin and bottom margin are instead in the ratio $1\colon\sqrt{2}$. Finally the header and the footer style have been modified by the \texttt{fancyhdr} package.
+In this manual you can skip the gray text because it is just dummy text.
 
-The captions have a smaller font respect to the text and the label is in boldface.
+\textcolor{gray}{\lipsum[1-22]}
 
-The appearance of the margin notes has been improved.
-They have the same font dimension of the footnotes and are typed in italics.
-Moreover I defined a new command to typeset margin note aligned to the left on the right page and vice versa on the left page.
-Notice that if a binding margin greater than 1.5\, cm is used, the dimensions of the margin notes become too small and very ugly.
-Do not use them in this case.
 
-The mathematical objects, figures and tables are numbered within the chapters (e.g. 1.1, 1.2,\ldots for the first chapter, 2.1, 2.2 for the second one and so on\ldots)
 
-The titlepage is automatically composed when the \texttt{\bs maketitle} command is given.
-The parameters needed for the titlepage, author, title, etc\ldots , are supplied
-by dedicated commands explained in the next section.
-A copy of the logo, in \texttt{pdf} or in \texttt{eps} format, must be present in the root directory of the thesis.
-These files are supplied in the \texttt{sapthesis.zip} archive.
 
+\mainmatter
 
-%\section{Common problems}
-%
-%\subsection{Compose a system of equation in displaystyle}
-%
-%Using the array environment to typeset a system of equation has the problem that the mathematics is
-%in textstyle. Usually a student wants the displaystyle. Instead of using \texttt{\bs dfrac} and so on\ldots
-%which produce the wrong vertical spacing, I suggest the following environment definition in the
-%preamble of the document:
-%\begin{lstlisting}
-%\usepackage{mathtools}
-%\usepackage{cases}
-%
-%\newenvironment{system*}%
-%{\begin{displaymath}\left\lbrace \begin{lgathered}}%
-%{\end{lgathered} \right. \end{displaymath}\ignorespacesafterend}
-%
-%\newenvironment{system}[1][]%
-%{\begin{equation}#1\left\lbrace \begin{lgathered}}%
-%{\end{lgathered} \right. \end{equation}\ignorespacesafterend}
-%
-%\newenvironment{subsystem}[1][]%
-%{\begin{subnumcases}{#1}}%
-%{\end{subnumcases}\ignorespacesafterend}
-%\end{lstlisting}
-%
-%\texttt{system*} is for unnumbered systems, \texttt{system} for numbered systems with a number
-%for the entire system and \texttt{subsystem} for numbered system with a subnumbered equations
-%(1a, 1b,\ldots). The optional argument is used to attach a label to the system.
-%
-%Example of usage:
-%\begin{lstlisting}
-%\begin{system}[\label{eq:nice_system}]
-%  a=b \\
-%  c=d
-%\end{system}
-%\end{lstlisting}
-%
-%However if you do not want to load mathtools package you can use the aligned environment
-%of the amsmath package (already loaded in sapthesis). Example:
-%\begin{lstlisting}
-%\begin{equation}
-%  \label{eq:nice_system}
-%  \left\lbrace
-%  \begin{aligned}
-%    & a=b \\
-%    & c=d
-%  \end{aligned}
-%  \right.
-%\end{equation}
-%\end{lstlisting}
-%Notice the usage of the ampersand (\&) used to align to the left the content of the system.
-%
+\chapter{Style features of \textsf{sapthesis}}
 
+In this chapter I will discuss my stylistic choices of \textsf{sapthesis}.
+I will show the page layout geometry and I will describe the page style.
 
-\section{A section}
-\lipsum[1-10]
+\section{Page layout}
 
-\section{Another section}
-\lipsum
+The page is fixed at the dimensions of an A4 paper, therefore you have to print your thesis on A4 paper to obtain the best results. The font dimension is fixed at 11\, pt. The text column and the margins are chosen to fill to the best an A4 paper while keeping a reasonable line length (396\, pt) for a good readability. The text height and the text width are in golden ratio (\textasciitilde 1.6180) as well as the outer and inner margins in a two-side document after binding margin removal. Also the top margin (excluding the header) and bottom margin are in the golden ratio. In Fig.~\ref{layout} a sketch of the \textsf{sapthesis} page layout is shown.
 
-\chapter{Some floating objects and some maths}
+\begin{figure}[h]
+\centering
+\setlength{\unitlength}{0.27mm}
+\begin{picture}(420,297)(-210,0)
+\polyline(-210,0)(210,0)(210,297)(-210,297)(-210,0)
+\Line(0,0)(0,297)
+\put(27.05,37.4){\polygon(0,0)(139.2,0)(139.2,223.8)(0,223.8)}
+\put(-27.05,37.4){\polygon(0,0)(-139.2,0)(-139.2,223.8)(0,223.8)}
+\put(27.05,268.16){\polygon(0,0)(139.2,0)(139.2,4.22)(0,4.22)}
+\put(-27.05,268.16){\polygon(0,0)(-139.2,0)(-139.2,4.22)(0,4.22)}
+\end{picture}
+\caption{Page layout scheme of \textsf{sapthesis class} using a zero binding margin.}
+\label{layout}
+\end{figure}
+
+
+\section{Page style}
+
+The captions have a smaller font respect to the text and the label is in boldface. The appearance of the margin notes has been improved.
+They have the same font dimension of the footnotes and are typed in italics.
+Moreover I defined a new command to typeset margin note aligned to the left on the right page and vice versa on the left page.
+Notice that if a binding margin greater than 1.5\, cm is used, the dimensions of the margin notes become too small and very ugly.
+Do not use them in this case.
+
+The mathematical objects, figures and tables are numbered within the chapters (e.g. 1.1, 1.2,\ldots for the first chapter, 2.1, 2.2 for the second one and so on\ldots). See for example the number of this simple equation
+\begin{equation}
+x_{1,2}=\frac{-b\pm\sqrt{b^2-4ac}}{2a}
+\end{equation}
+
+
+The title page is automatically composed when the \texttt{\bs maketitle} command is given.
+The parameters needed for the title page, author, title, etc\ldots , are supplied by dedicated commands explained in the next section.
+Two copies of the university logo in \texttt{pdf} format, one for color printing and the other one for black and white printing, are supplied in the \textsf{sapthesis} package. They are shown in Fig.~\ref{fig:largenenough}.
 
 \begin{figure}
 \centering
-\includegraphics[width=0.8\textwidth]{marchiologo_rosso_positivo}\\[3ex]
-\includegraphics[width=0.8\textwidth]{marchiologo_nero_positivo}
-\caption{Use vector images as much as possible! \LaTeX\ supports the eps vector image format whereas pdf\LaTeX\ supports the pdf format (and the eps by the epstopdf package).}
+\includegraphics[width=0.7\textwidth]{sapienza-MLred-pos}\\[3ex]
+\includegraphics[width=0.7\textwidth]{sapienza-MLblack-pos}
+\caption{Logo of the Sapienza -- University of Rome.}
 \label{fig:largenenough}
 \end{figure}
 
-\lipsum
+
+
+\section{About figures and tables}
+
+As regards the image formats, please use vector images as much as possible! Use jpg images only for photographs! pdf\LaTeX\ supports the pdf, jpg and png formats.
+
+A very simple table is show in Tab.~\ref{tab:letters}. Remember to typeset
+always the table caption above the table. Do not use vertical lines.
 
 \begin{table}
-\caption{This is a simple table. Remember to typeset
-always the table caption above the table. Do not use vertical lines.}
+\caption{This is a simple table.}
 \label{tab:letters}
 \centering
 \begin{tabular}{lcc}
@@ -211,48 +207,63 @@ B & D & F \\
 \end{tabular}
 \end{table}
 
-\lipsum
 
-And now a simple equation. Note the form of the equation number.
-\begin{equation}
-x_{1,2}=\frac{-b\pm\sqrt{b^2-4ac}}{2a}
-\end{equation}
+\section{A section}
+
+In this manual you can skip the gray text because it is just dummy text.
+
+\textcolor{gray}{\lipsum[1-10]}
+
+
+
+\section{Another section}
+
+In this manual you can skip the gray text because it is just dummy text.
+
+\textcolor{gray}{\lipsum}
 
-\lipsum
 
 \appendix
-\chapter{Some special commands}
+\chapter{Special commands provided by \textsf{sapthesis}}
 
-Some important numbers (we have used the commands \texttt{\bs eu} and \texttt{\bs iu}):
+\textsf{Sapthesis} provides some special commands, particularly useful for scientific works. You can use for example the roman shape, instead of the italic, for the imaginary unit (\texttt{\bs iu}) and Napier's number (\texttt{\bs eu}):
 \begin{equation}
 \eu^{\iu\pi}+1=0
 \end{equation}
 
-\noindent Derivatives (we have used the commands \texttt{\bs der} and \texttt{\bs pder}):
+There are also two commands to speed up the writing of derivatives. In the following example we have used the commands \texttt{\bs der} and \texttt{\bs pder}):
 \begin{equation}
 \der{f}{x} \qquad \pder[2]{f}{y}
 \end{equation}
 
-\noindent Subscripts and superscripts (we have used the commands \texttt{\bs rb} and \texttt{\bs rs}):
+
+\textsf{Sapthesis} provides also 4 commands to improve the writing of subscripts, \texttt{\bs rb} and \texttt{\bs tb}, and superscripts, \texttt{\bs rp} and \texttt{\bs tp}. Two of these commands, \texttt{\bs rb} and \texttt{\bs rp}, can be used both in text and in math mode and compose their argument in roman. The other two, \texttt{\bs tb} and \texttt{\bs tp}, can be used only in text mode and compose their argument as are. Here it is an usage example of \texttt{\bs rb} and \texttt{\bs rp}:
 \[
 a_b \neq a\rb{b}\qquad a^b \neq a\rp{b}
 \]
+And here it is an usage example of \texttt{\bs tb}: \emph{Cu\tb{It} indicates copper bought in Italy}. And a usage example of \texttt{\bs ts}: \emph{Cher G\tp{le} Napol\'eon}.
+
 
-\noindent Unit of measurements (we have used the command \texttt{\bs un}): $25\un{m}$, $3.5\un{m/s}$
+Then several commands for the correct typesetting of unit of measurements are provided. For example the command \texttt{\bs un} typesets its argument in roman and leaves a thin space between the number and the unit: $25\un{m}$, $3.5\un{m/s}$. Other commands are: (\texttt{\bs g}) 45\g, (\texttt{\bs C}) 30\,\C, (\texttt{\bs A}) 12\,\A, (\texttt{\bs micro}) 40\,\micro m, (\texttt{\bs ohm}) 27\,\ohm. 
 
-\noindent Other commands: (\texttt{\bs g}) 45\g, (\texttt{\bs C}) 30\,\C, (\texttt{\bs A}) 12\,\A, (\texttt{\bs micro}) 40\,\micro m, (\texttt{\bs ohm}) 27\,\ohm, (\$7 \bs x 10\^{}5\$) $7 \x 10^5$. And finally (\texttt{\bs di})
+We have also \texttt{\bs x} as abbreviation of \texttt{\bs times}: \$7 \bs x 10\^{}5\$ gives $7 \x 10^5$. Then \texttt{\bs di} is the differential symbol which automatically insert the correct spacing.
 \[
 \int x \di x
 \]
 
-\medskip
-\lipsum
-\mnote{This is a fancy margin note!}
-\lipsum
+Finally we have defined the color \textsf{sapred} which is the official color
+of Sapienza -- University of Rome. It is defined as RGB(130,36,51). \textcolor{sapred}{This text is written with the color \textsf{sapred}.}
+
+In the following dummy text you can observe the usage of \texttt{\bs mnote} command which typesets fancy margin notes.
+
+\textcolor{gray}{\lipsum}
+\marginpar{This is a fancy margin note!}
+\textcolor{gray}{\lipsum}
 
 \backmatter
 % bibliography
 %\cleardoublepage
+%\phantomsection
 %\bibliographystyle{sapthesis} % BibTeX style
 %\bibliography{bibliography} % BibTeX database without .bib extension
 
diff --git a/Master/texmf-dist/tex/latex/sapthesis/sapthesis.cls b/Master/texmf-dist/tex/latex/sapthesis/sapthesis.cls
index ba30bf5aa04..fa0dc08132f 100644
--- a/Master/texmf-dist/tex/latex/sapthesis/sapthesis.cls
+++ b/Master/texmf-dist/tex/latex/sapthesis/sapthesis.cls
@@ -1,12 +1,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% sapthesis.cls                                                   %%
-%% version 2.8                                                     %%
-%% 2011-09-13                                                      %%
+%% version 3.0                                                     %%
+%% 2012-01-05                                                      %%
 %% author: Francesco Biccari                                       %%
 %% contact: biccari@gmail.com                                      %%
 %%                                                                 %%
 %% This file is the LaTeX class for the thesis style               %%
-%% of the "Sapienza" -- University of Rome                         %%
+%% of the "Sapienza -- University of Rome"                         %%
 %%                                                                 %%
 %% see README for license information and installation             %%
 %% see sapthesis-doc.pdf for usage                                 %%
@@ -17,9 +17,10 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Identification %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{sapthesis}%
-[2011/09/13 Sapienza - University of Rome thesis class]
+[2012/01/05 Sapienza - University of Rome thesis class]
 
 
 
@@ -33,8 +34,6 @@
 \newif\ifSAP@customlanguage \SAP@customlanguagefalse
 \newif\ifSAP@bn \SAP@bnfalse
 \newif\ifSAP@PhD \SAP@PhDfalse
-\newif\ifSAP@PhDA \SAP@PhDAfalse
-\newif\ifSAP@PhDB \SAP@PhDBfalse
 \newif\ifSAP@MasterP \SAP@MasterPfalse
 \newif\ifSAP@MasterS \SAP@MasterSfalse
 \newif\ifSAP@LaM \SAP@LaMfalse
@@ -45,14 +44,16 @@
 \define@key[sap]{}{noexaminfo}[]{\SAP@noexaminfotrue}
 \define@key[sap]{}{nodefaultfont}[]{\SAP@nodefaultfonttrue}
 \define@key[sap]{}{romandiff}[]{\SAP@romandifftrue}
-\define@key[sap]{}{italian}[]{\SAP@customlanguagetrue\renewcommand{\SAP@customlanguage}{\SAP@italian}}
-\define@key[sap]{}{english}[]{\SAP@customlanguagetrue\renewcommand{\SAP@customlanguage}{\SAP@english}}
-\define@key[sap]{}{bn}[]{\SAP@bntrue\PassOptionsToPackage{monochrome}{color}\PassOptionsToPackage{monochrome}{xcolor}}
+\define@key[sap]{}{italian}[]{\SAP@customlanguagetrue
+  \renewcommand{\SAP@customlanguage}{\SAP@italian}}
+\define@key[sap]{}{english}[]{\SAP@customlanguagetrue
+  \renewcommand{\SAP@customlanguage}{\SAP@english}}
+\define@key[sap]{}{bn}[]{\SAP@bntrue
+  \PassOptionsToPackage{monochrome}{color}
+  \PassOptionsToPackage{monochrome}{xcolor}}
 \define@key[sap]{}{PhD}[]{\SAP@PhDtrue}
 \define@key[sap]{}{LaM}[]{\SAP@LaMtrue}
 \define@key[sap]{}{Lau}[]{\SAP@Lautrue}
-\define@key[sap]{}{PhDA}[]{\SAP@PhDAtrue\SAP@PhDtrue}
-\define@key[sap]{}{PhDB}[]{\SAP@PhDBtrue\SAP@PhDtrue}
 \define@key[sap]{}{MasterP}[]{\SAP@MasterPtrue\SAP@MasterPtrue}
 \define@key[sap]{}{MasterS}[]{\SAP@MasterStrue\SAP@MasterStrue}
 \define@key[sap]{}{binding}[0pt]{\setlength{\SAP@binding}{#1}}
@@ -71,8 +72,8 @@
     \ifSAP@Lau\relax\else
       \ifSAP@MasterP\relax\else
         \ifSAP@MasterS\relax\else
-          \ClassError{sapthesis}{You must specify the PhD, LaM, Lau, %
-          MasterP or MasterS option}{You can use also special options PhDA, PhDB, ...}
+          \ClassError{sapthesis}{You must specify the PhD, LaM, Lau, MasterP or%
+          MasterS option}{}
         \fi
       \fi
     \fi
@@ -84,18 +85,19 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Page layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\RequirePackage{geometry}
+\RequirePackage[a4paper]{geometry}
 \geometry{textwidth=396pt,
-  textheight=650pt,
+  textheight=641pt,
   marginparsep=12pt,
   bindingoffset=\SAP@binding,
-  hmarginratio=61:99,
-  vmarginratio=72:99,
-  heightrounded,
-  marginparwidth=72pt}
+  hmarginratio=55:89,
+  vmarginratio=55:89,
+  includehead,
+  marginparwidth=72pt,
+  heightrounded}
   
 \if@twoside
-  \geometry{hmarginratio=61:99}
+  \geometry{hmarginratio=55:89}
 \else
   \geometry{hmarginratio=1:1}
 \fi
@@ -103,7 +105,7 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Some settings%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage{ifxetex}
 \ifxetex
   \RequirePackage{xltxtra}
@@ -121,36 +123,65 @@
 \RequirePackage{color}
 \RequirePackage{booktabs}
 \RequirePackage{amsmath}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Fancy headers %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% this two lines remove the headers in the empty pages
+%% (instead of loading the emptypage package)
+\def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
+\thispagestyle{empty}\hbox{}\newpage\fi\fi}
+
 \RequirePackage{fancyhdr}
-\RequirePackage{emptypage}
 
-\newcommand{\SAP@twosidestyle}{%
+%% definition of the main page style
+\fancypagestyle{SAP@mainstyle}{%
 \pagestyle{fancy}
-\renewcommand{\chaptermark}[1]{\markboth{\thechapter.\ ##1}{}}
+\renewcommand{\chaptermark}[1]{\markboth{\ifnum \c@chapter>0 \thechapter.\ ##1 \else ##1 \fi}{}}
 \renewcommand{\sectionmark}[1]{\markright{\thesection\ ##1}}
 \fancyhf{}
 \fancyhead[LE,RO]{\small\bfseries\thepage}
 \fancyhead[LO]{\small\bfseries\nouppercase{\rightmark}}
 \fancyhead[RE]{\small\bfseries\nouppercase{\leftmark}}
 \renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\footrulewidth}{0pt}
-\addtolength{\headheight}{0.4pt} % Riserva spazio per la linea
-}
+\renewcommand{\footrulewidth}{0pt}}
 
-\newcommand{\SAP@onesidestyle}{%
-\pagestyle{fancy}
-\renewcommand{\chaptermark}[1]{\markboth{\thechapter.\ ##1}{}}
+%% ri-definition of the plain style (first page of the chapters)
+\fancypagestyle{plain}{%
+\renewcommand{\headrulewidth}{0pt}
 \fancyhf{}
-\fancyhead[R]{\small\bfseries\thepage}
-\fancyhead[L]{\small\bfseries\nouppercase{\leftmark}}
-\renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\footrulewidth}{0pt}
-\addtolength{\headheight}{0.4pt} % Riserva spazio per la linea
+%\fancyfoot[C]{\small\scshape\thepage}
+\fancyhead[LE,RO]{\small\bfseries\thepage}
 }
 
-\fancypagestyle{plain}{%
-\renewcommand{\headrulewidth}{0pt}%
-\fancyhf{}\fancyfoot[C]{\small\bfseries\thepage}}
+\g@addto@macro\frontmatter{\pagestyle{SAP@mainstyle}}
+\g@addto@macro\mainmatter{\pagestyle{SAP@mainstyle}}
+
+% fancy marginnote
+
+% commands to redefine the marginpar command
+% maybe in future I will remove the mnote command?
+%\def \@marginparreset {%
+%        \reset@font
+%        \footnotesize
+%        \itshape
+%        \@setminipage
+%}
+%\long\def\@xmpar[#1]#2{%
+%  \@savemarbox\@marbox{\raggedleft #1}%
+%  \@savemarbox\@currbox{\raggedright #2}%
+%  \@xympar}
+%\long\def\@ympar#1{%
+%  \@savemarbox\@marbox{\raggedleft #1}%
+%  \@savemarbox\@currbox{\raggedright #1}%
+%  \@xympar}
+%  
+% simpler version which cannot redefine marginpar. A new command
+% (mnote) is needed
+\g@addto@macro\@marginparreset{\footnotesize\itshape}
+\newcommand{\mnote}[1]{\marginpar[\raggedleft #1]{\raggedright #1}}
 
 
 
@@ -161,19 +192,6 @@
 \numberwithin{figure}{chapter}
 \numberwithin{table}{chapter}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Fancy headers %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\g@addto@macro\frontmatter{\pagestyle{plain}}
-\g@addto@macro\mainmatter{%
-  \if@twoside\SAP@twosidestyle\else\SAP@onesidestyle\fi%
-}
-
-% fancy marginnote
-% footnotesize marginpar
-\g@addto@macro\@marginparreset{\footnotesize\itshape}
-% new command for fancy margin note
-\newcommand{\mnote}[1]{\marginpar[\raggedleft #1]{\raggedright #1}}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -181,37 +199,26 @@
 
 %% GENERAL COMMANDS
 
-\newcommand\@courseorganizerLabel{}
-\newcommand\@courseLabel{}
-\newcommand\@PhDcourseDeclarationLabel{}
-\ifSAP@PhDA
-  \renewcommand\@courseorganizerLabel{Scuola di Dottorato in Scienze Astronomiche,\\
-    Chimiche, Fisiche e Matematiche ``Vito Volterra''}
-  \renewcommand\@courseLabel{Fisica}
-  \renewcommand\@PhDcourseDeclarationLabel{Physics}
-\fi
-\ifSAP@PhDB
-  \renewcommand\@courseorganizerLabel{Scuola di Dottorato in Scienze Astronomiche,\\
-    Chimiche, Fisiche e Matematiche ``Vito Volterra''}
-  \renewcommand\@courseLabel{Matematica}
-  \renewcommand\@PhDcourseDeclarationLabel{Mathematics}
-\fi
-\newcommand{\courseorganizer}[1]{\renewcommand\@courseorganizerLabel{#1}}
+\def\SAP@courseorganizerLabel{}
+\def\SAP@courseLabel{}
+\def\SAP@PhDcourseDeclarationLabel{}
+
+\newcommand{\courseorganizer}[1]{\def\SAP@courseorganizerLabel{#1}}
 \newcommand{\course}[2][]{%
-  \renewcommand\@courseLabel{#2}
-  \renewcommand\@PhDcourseDeclarationLabel{\if?#1?\@courseLabel\else#1\fi}}
+  \def\SAP@courseLabel{#2}
+  \def\SAP@PhDcourseDeclarationLabel{\if?#1?\SAP@courseLabel\else#1\fi}}
 
-\newcommand\@copyyear{}
-\newcommand{\copyyear}[1]{\renewcommand\@copyyear{#1}}
+\def\SAP@copyyear{}
+\newcommand{\copyyear}[1]{\def\SAP@copyyear{#1}}
 
-\newcommand\@cycle{}
-\newcommand{\cycle}[1]{\renewcommand\@cycle{#1}}
+\def\SAP@cycle{}
+\newcommand{\cycle}[1]{\def\SAP@cycle{#1}}
 
-\newcommand\@submitdate{}
-\newcommand{\submitdate}[1]{\renewcommand\@submitdate{#1}}
+\def\SAP@submitdate{}
+\newcommand{\submitdate}[1]{\def\SAP@submitdate{#1}}
 
-\newcommand\@IDnumber{}
-\newcommand{\IDnumber}[1]{\renewcommand\@IDnumber{#1}}
+\def\SAP@IDnumber{}
+\newcommand{\IDnumber}[1]{\def\SAP@IDnumber{#1}}
 
 \newcount\SAP@advisorcount
 \newtoks\SAP@advisortoks
@@ -237,48 +244,48 @@
 \newtoks\SAP@examinertoks
 \newcommand{\examiner}[1]{% 
   \ifnum\SAP@examinercount=\z@ 
-    \SAP@examinertoks={#1 (\@chairman)}% 
+    \SAP@examinertoks={#1 (\SAP@chairman)}% 
   \else 
     \SAP@examinertoks=\expandafter{\the\SAP@examinertoks\\[0.75mm]#1}% 
   \fi 
   \advance\SAP@examinercount\@ne}
 
-\newcommand\@examdate{}
-\newcommand{\examdate}[1]{\renewcommand\@examdate{#1}}
+\def\SAP@examdate{}
+\newcommand{\examdate}[1]{\def\SAP@examdate{#1}}
 
-\newcommand\@versiondate{}
-\newcommand{\versiondate}[1]{\renewcommand\@versiondate{#1}}
+\def\SAP@versiondate{}
+\newcommand{\versiondate}[1]{\def\SAP@versiondate{#1}}
 
-\newcommand\@authoremail{}
-\newcommand{\authoremail}[1]{\renewcommand\@authoremail{#1}}
+\def\SAP@authoremail{}
+\newcommand{\authoremail}[1]{\def\SAP@authoremail{#1}}
 
-\newcommand\@website{}
-\newcommand{\website}[1]{\renewcommand\@website{#1}}
+\def\SAP@website{}
+\newcommand{\website}[1]{\def\SAP@website{#1}}
 
-\newcommand\@ISBN{}
-\newcommand{\ISBN}[1]{\renewcommand\@ISBN{#1}}
+\def\SAP@ISBN{}
+\newcommand{\ISBN}[1]{\def\SAP@ISBN{#1}}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% PhD maketitle
 
-\newcommand{\maketitlePhD}{
+\newcommand{\SAP@maketitlePhD}{
 
 % Errors:
 
-\if|\@courseorganizerLabel|\ClassError{sapthesis}{You must specify the Ph.D. %
+\if|\SAP@courseorganizerLabel|\ClassError{sapthesis}{You must specify the Ph.D. %
   organizer}{Example: \protect\courseorganizer{Scuola di dottorato di ...}}\fi
-\if|\@courseLabel|\ClassError{sapthesis}{You must specify the Ph.D. %
+\if|\SAP@courseLabel|\ClassError{sapthesis}{You must specify the Ph.D. %
   course}{Example: \protect\course{Fisica}{Physics}}\fi
-\if|\@cycle|\ClassError{sapthesis}{You must specify the Ph.D. %
+\if|\SAP@cycle|\ClassError{sapthesis}{You must specify the Ph.D. %
   cycle (cycle)}{The Ph.D. cycle must be in the roman numbers}\fi
-\if|\@submitdate|\ClassError{sapthesis}{You must specify the %
+\if|\SAP@submitdate|\ClassError{sapthesis}{You must specify the %
   thesis submission date}{The date must be in the form Month(name) Year(number)}\fi
-\if|\@copyyear|\ClassError{sapthesis}{You must specify the %
+\if|\SAP@copyyear|\ClassError{sapthesis}{You must specify the %
   copyright year}{Example: \protect\copyyear{2012}}\fi
-\if|\@IDnumber|\ClassError{sapthesis}{You must specify your %
+\if|\SAP@IDnumber|\ClassError{sapthesis}{You must specify your %
   ID number (matricola)}{E.g. 123456}\fi
-\if|\@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
+\if|\SAP@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
   Example: \protect\authoremail{author@email.com}}\fi
 
 % Titlepage:
@@ -291,9 +298,9 @@
 
     \vspace*{-10mm}
     \ifSAP@bn
-      \includegraphics[width=5cm]{marchiologo_nero_positivo}
+      \includegraphics[width=5cm]{sapienza-MLblack-pos}
     \else
-      \includegraphics[width=5cm]{marchiologo_rosso_positivo}
+      \includegraphics[width=5cm]{sapienza-MLred-pos}
     \fi
 
     \nointerlineskip
@@ -305,13 +312,13 @@
     \vspace{\stretch{1}}
 
     \SAP@parbox[3cm]{%
-    \textcolor{sapred}{\@courseorganizerLabel\\[2mm]
-    Dottorato di Ricerca in \@courseLabel\ -- \@cycle\ Ciclo}}
+    \textcolor{sapred}{\SAP@courseorganizerLabel\\[2mm]
+    Dottorato di Ricerca in \SAP@courseLabel\ -- \SAP@cycle\ Ciclo}}
 
     \SAP@parbox[3cm]{%
-    \@CandidateLabel\\[2mm]
+    \SAP@CandidateLabel\\[2mm]
     \@author\\[0.75mm]
-    \@IDnumberLabel\ \@IDnumber}
+    \SAP@IDnumberLabel\ \SAP@IDnumber}
 
     
     
@@ -323,9 +330,9 @@
           \ClassError{sapthesis}{You must specify at least one advisor in the preamble}%
           {E.g. \protect\advisor{Prof. Name Surname}}
         \or
-          \@ThesisAdvisorLabel\\[2mm]
+          \SAP@ThesisAdvisorLabel\\[2mm]
         \else
-          \@ThesisAdvisorsLabel\\[2mm]
+          \SAP@ThesisAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@advisortoks}
         \hspace{1.5cm}
@@ -333,83 +340,38 @@
         \ifcase\SAP@coadvisorcount
           \relax
         \or
-          \@ThesisCoAdvisorLabel\\[2mm]
+          \SAP@ThesisCoAdvisorLabel\\[2mm]
         \else
-          \@ThesisCoAdvisorsLabel\\[2mm]
+          \SAP@ThesisCoAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@coadvisortoks}
     }}
 
-    \SAP@parbox{\@DeclarationLabel\ \@PhDcourseDeclarationLabel\\[2mm]
-    \@submitdate}
+    \SAP@parbox{\SAP@DeclarationLabel\ \SAP@PhDcourseDeclarationLabel\\[2mm]
+    \SAP@submitdate}
     
 	\end{titlepage}
 \clearpage
-\thispagestyle{empty}
-
-\ifSAP@noexaminfo
-\null
-\vfill
-\else
-\vspace*{\stretch{0.1}}
-
-\noindent
-\if?\@examdate?
-  \@ThesisNotDefensedLabel%
-\else
-  \@ThesisDefensedLabelA\ \@examdate\\
-  \@ThesisDefensedLabelB:\\[2mm]
-  \the\SAP@examinertoks%
-\fi
-
-\vspace{\stretch{0.8}}
-
-\fi
-
-\noindent
-\@author. \textit{\def\\{}\def\newline{} \@title.} \\[0.75mm]
-\@PhDthesistype. \@sapienzaname \\[0.75mm]
-\copyright\ \@copyyear\quad%
-\if|\@ISBN|
-  \relax%
-\else
-  ISBN: \@ISBN %
-\fi
-
-\begin{flushright}
-\if|\@versiondate|
-  \relax%
-\else
-  \textsc{\@versionLabel:} \@versiondate \\[2mm]%
-\fi
-\if|\@website|
-  \relax%
-\else
-  \textsc{\@websiteLabel:} \@ifundefined{href}{\@website}{\href{\@website}{\@website}} \\[2mm]%
-\fi
-\textsc{email:} \@ifundefined{href}{\@authoremail}{\href{mailto:\@authoremail}{\@authoremail}}\par
-\end{flushright}
-
-\cleardoublepage
+\SAP@composebacktitlepage
 }
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Laurea and Laurea Magistrale maketitle
 
-\newcommand{\maketitleLaurea}{
+\newcommand{\SAP@maketitleLaurea}{
 
 % Errors:
 
-\if|\@courseorganizerLabel|\ClassError{sapthesis}{You must specify the degree %
+\if|\SAP@courseorganizerLabel|\ClassError{sapthesis}{You must specify the degree %
   organizer}{Example: \protect\courseorganizer{Faculty of ...}}\fi
-\if|\@submitdate|\ClassError{sapthesis}{You must specify the Academic %
+\if|\SAP@submitdate|\ClassError{sapthesis}{You must specify the Academic %
   Year}{Example: \protect\submitdate{2011/2012}}\fi
-\if|\@IDnumber|\ClassError{sapthesis}{You must specify your %
+\if|\SAP@IDnumber|\ClassError{sapthesis}{You must specify your %
   ID number (matricola)}{E.g. 123456}\fi
-\if|\@copyyear|\ClassError{sapthesis}{You must specify the %
+\if|\SAP@copyyear|\ClassError{sapthesis}{You must specify the %
   copyright year}{Example: \protect\copyyear{2012}}\fi
-\if|\@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
+\if|\SAP@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
   Example: \protect\authoremail{author@email.com}}\fi
 
 % Titlepage:
@@ -422,9 +384,9 @@
 
     \vspace*{-10mm}
     \ifSAP@bn
-      \includegraphics[width=5cm]{marchiologo_nero_positivo}
+      \includegraphics[width=5cm]{sapienza-MLblack-pos}
     \else
-      \includegraphics[width=5cm]{marchiologo_rosso_positivo}
+      \includegraphics[width=5cm]{sapienza-MLred-pos}
     \fi
 
     \nointerlineskip
@@ -436,13 +398,13 @@
     \vspace{\stretch{0.9}}
 
     \SAP@parbox[3cm]{%
-    \textcolor{sapred}{\@courseorganizerLabel\\[2mm]
-    Corso di Laurea \ifSAP@LaM Magistrale \fi in \@courseLabel}}
+    \textcolor{sapred}{\SAP@courseorganizerLabel\\[2mm]
+    Corso di Laurea \ifSAP@LaM Magistrale \fi in \SAP@courseLabel}}
 
     \SAP@parbox[3cm]{%
-    \@CandidateLabel\\[2mm]
+    \SAP@CandidateLabel\\[2mm]
     \@author\\[0.75mm]
-    \@IDnumberLabel\ \@IDnumber}
+    \SAP@IDnumberLabel\ \@IDnumber}
 
     \SAP@parbox[4.5cm]{%
     \makebox[11.9cm][l]{%
@@ -451,9 +413,9 @@
           \ClassError{sapthesis}{You must specify at least one advisor in the preamble}%
           {E.g. \protect\advisor{Prof. Name Surname}}
         \or
-          \@ThesisAdvisorLabel\\[2mm]
+          \SAP@ThesisAdvisorLabel\\[2mm]
         \else
-          \@ThesisAdvisorsLabel\\[2mm]
+          \SAP@ThesisAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@advisortoks}
         \hspace{1.5cm}
@@ -461,62 +423,18 @@
         \ifcase\SAP@coadvisorcount
           \relax
         \or
-          \@ThesisCoAdvisorLabel\\[2mm]
+          \SAP@ThesisCoAdvisorLabel\\[2mm]
         \else
-          \@ThesisCoAdvisorsLabel\\[2mm]
+          \SAP@ThesisCoAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@coadvisortoks}
     }}
 
-    \SAP@parbox{\@AcademicYearLabel\ \@submitdate}
+    \SAP@parbox{\SAP@AcademicYearLabel\ \SAP@submitdate}
     
 	\end{titlepage}
 \clearpage
-\thispagestyle{empty}
-
-\ifSAP@noexaminfo
-\null
-\vfill
-\else
-\vspace*{\stretch{0.1}}
-
-\noindent
-\if?\@examdate?
-  \@ThesisNotDefensedLabel%
-\else
-  \@ThesisDefensedLabelA\ \@examdate\\
-  \@ThesisDefensedLabelB:\\[2mm]
-  \the\SAP@examinertoks%
-\fi
-
-\vspace{\stretch{0.8}}
-\fi
-
-\noindent
-\@author. \textit{\def\\{}\def\newline{} \@title.} \\[0.75mm]
-\ifSAP@Lau\@Lauthesistype\else\@LaMthesistype\fi. \@sapienzaname \\[0.75mm]
-\copyright\ \@copyyear\quad%
-\if|\@ISBN|
-  \relax%
-\else
-  ISBN: \@ISBN %
-\fi
-
-\begin{flushright}
-\if|\@versiondate|
-  \relax%
-\else
-  \textsc{\@versionLabel:} \@versiondate \\[2mm]%
-\fi
-\if|\@website|
-  \relax%
-\else
-  \textsc{\@websiteLabel:} \@ifundefined{href}{\@website}{\href{\@website}{\@website}} \\[2mm]%
-\fi
-\textsc{email:} \@ifundefined{href}{\@authoremail}{\href{mailto:\@authoremail}{\@authoremail}}\par
-\end{flushright}
-
-\cleardoublepage
+\SAP@composebacktitlepage
 }
 
 
@@ -524,19 +442,19 @@
 %% Master di primo livello and
 %% Master di secondo livello maketitle
 
-\newcommand{\maketitleMaster}{
+\newcommand{\SAP@maketitleMaster}{
 
 % Errors:
 
-\if|\@courseorganizerLabel|\ClassError{sapthesis}{You must specify the degree %
+\if|\SAP@courseorganizerLabel|\ClassError{sapthesis}{You must specify the degree %
   organizer}{Example: \protect\courseorganizer{Faculty of ...}}\fi
-\if|\@submitdate|\ClassError{sapthesis}{You must specify the Academic %
+\if|\SAP@submitdate|\ClassError{sapthesis}{You must specify the Academic %
   Year}{Example: \protect\submitdate{2011/2012}}\fi
-\if|\@IDnumber|\ClassError{sapthesis}{You must specify your %
+\if|\SAP@IDnumber|\ClassError{sapthesis}{You must specify your %
   ID number (matricola)}{E.g. 123456}\fi
-\if|\@copyyear|\ClassError{sapthesis}{You must specify the %
+\if|\SAP@copyyear|\ClassError{sapthesis}{You must specify the %
   copyright year}{Example: \protect\copyyear{2012}}\fi
-\if|\@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
+\if|\SAP@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
   Example: \protect\authoremail{author@email.com}}\fi
 
 % Titlepage:
@@ -549,9 +467,9 @@
 
     \vspace*{-10mm}
     \ifSAP@bn
-      \includegraphics[width=5cm]{marchiologo_nero_positivo}
+      \includegraphics[width=5cm]{sapienza-MLblack-pos}
     \else
-      \includegraphics[width=5cm]{marchiologo_rosso_positivo}
+      \includegraphics[width=5cm]{sapienza-MLred-pos}
     \fi
 
     \nointerlineskip
@@ -563,13 +481,13 @@
     \vspace{\stretch{0.9}}
 
     \SAP@parbox[3cm]{%
-    \textcolor{sapred}{\@courseorganizerLabel\\[2mm]
-    Master di \ifSAP@MasterP primo \fi \ifSAP@MasterS secondo \fi livello in \@courseLabel}}
+    \textcolor{sapred}{\SAP@courseorganizerLabel\\[2mm]
+    Master di \ifSAP@MasterP primo \fi \ifSAP@MasterS secondo \fi livello in \SAP@courseLabel}}
 
     \SAP@parbox[3cm]{%
-    \@CandidateLabel\\[2mm]
+    \SAP@CandidateLabel\\[2mm]
     \@author\\[0.75mm]
-    \@IDnumberLabel\ \@IDnumber}
+    \SAP@IDnumberLabel\ \@IDnumber}
 
     \SAP@parbox[4.5cm]{%
     \makebox[11.9cm][l]{%
@@ -578,9 +496,9 @@
           \ClassError{sapthesis}{You must specify at least one advisor in the preamble}%
           {E.g. \protect\advisor{Prof. Name Surname}}
         \or
-          \@ThesisAdvisorLabel\\[2mm]
+          \SAP@ThesisAdvisorLabel\\[2mm]
         \else
-          \@ThesisAdvisorsLabel\\[2mm]
+          \SAP@ThesisAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@advisortoks}
         \hspace{1.5cm}
@@ -588,17 +506,25 @@
         \ifcase\SAP@coadvisorcount
           \relax
         \or
-          \@ThesisCoAdvisorLabel\\[2mm]
+          \SAP@ThesisCoAdvisorLabel\\[2mm]
         \else
-          \@ThesisCoAdvisorsLabel\\[2mm]
+          \SAP@ThesisCoAdvisorsLabel\\[2mm]
         \fi
         \the\SAP@coadvisortoks}
     }}
 
-    \SAP@parbox{\@AcademicYearLabel\ \@submitdate}
+    \SAP@parbox{\SAP@AcademicYearLabel\ \SAP@submitdate}
     
 	\end{titlepage}
 \clearpage
+\SAP@composebacktitlepage
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Macro for the back of the title page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\SAP@composebacktitlepage{%
+
 \thispagestyle{empty}
 
 \ifSAP@noexaminfo
@@ -608,11 +534,11 @@
 \vspace*{\stretch{0.1}}
 
 \noindent
-\if?\@examdate?
-  \@ThesisNotDefensedLabel%
+\if?\SAP@examdate?
+  \SAP@ThesisNotDefensedLabel%
 \else
-  \@ThesisDefensedLabelA\ \@examdate\\
-  \@ThesisDefensedLabelB:\\[2mm]
+  \SAP@ThesisDefensedLabelA\ \SAP@examdate\\
+  \SAP@ThesisDefensedLabelB:\\[2mm]
   \the\SAP@examinertoks%
 \fi
 
@@ -621,43 +547,46 @@
 
 \noindent
 \@author. \textit{\def\\{}\def\newline{} \@title.} \\[0.75mm]
-\ifSAP@MasterP\@MasterPthesistype\else\@MasterSthesistype\fi. \@sapienzaname \\[0.75mm]
-\copyright\ \@copyyear\quad%
-\if|\@ISBN|
+\ifSAP@PhD\SAP@PhDthesistype\fi
+\ifSAP@LaM\SAP@LaMthesistype\fi
+\ifSAP@Lau\SAP@Lauthesistype\fi
+\ifSAP@MasterS\SAP@MasterSthesistype\fi
+\ifSAP@MasterP\SAP@MasterPthesistype\fi
+. \SAP@sapienzaname \\[0.75mm]
+\copyright\ \SAP@copyyear\quad%
+\if|\SAP@ISBN|
   \relax%
 \else
-  ISBN: \@ISBN %
+  ISBN: \SAP@ISBN %
 \fi
 
 \begin{flushright}
-\if|\@versiondate|
+\if|\SAP@versiondate|
   \relax%
 \else
-  \textsc{\@versionLabel:} \@versiondate \\[2mm]%
+  \textsc{\SAP@versionLabel:} \SAP@versiondate \\[2mm]%
 \fi
-\if|\@website|
+\if|\SAP@website|
   \relax%
 \else
-  \textsc{\@websiteLabel:} \@ifundefined{href}{\@website}{\href{\@website}{\@website}} \\[2mm]%
+  \textsc{\SAP@websiteLabel:} \@ifundefined{href}{\SAP@website}{\href{\SAP@website}{\SAP@website}} \\[2mm]%
 \fi
-\textsc{email:} \@ifundefined{href}{\@authoremail}{\href{mailto:\@authoremail}{\@authoremail}}\par
+\textsc{email:} \@ifundefined{href}{\SAP@authoremail}{\href{mailto:\SAP@authoremail}{\SAP@authoremail}}\par
 \end{flushright}
 
 \cleardoublepage
 }
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Choosing the right \maketitle according to the
-%% type of the thesis
+%% Choosing the right \maketitle according to the thesis type %%%%%%%
 
 \renewcommand{\maketitle}{%
-  \ifSAP@PhD\maketitlePhD\fi
-  \ifSAP@LaM\maketitleLaurea\fi
-  \ifSAP@Lau\maketitleLaurea\fi
-  \ifSAP@MasterS\maketitleMaster\fi
-  \ifSAP@MasterP\maketitleMaster\fi}
+  \ifSAP@PhD\SAP@maketitlePhD\fi
+  \ifSAP@LaM\SAP@maketitleLaurea\fi
+  \ifSAP@Lau\SAP@maketitleLaurea\fi
+  \ifSAP@MasterS\SAP@maketitleMaster\fi
+  \ifSAP@MasterP\SAP@maketitleMaster\fi}
 
 
 
@@ -674,74 +603,73 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% ABSTRACT ENVIRONMENT %%
-\newenvironment{abstract}[1][\@AbstractLabel]%
-{\cleardoublepage%
-  \null\begin{center}{\large \bfseries #1}\end{center}%
-}%
-{\null}
+\newenvironment{abstract}[1][\SAP@AbstractLabel]
+{\cleardoublepage\thispagestyle{plain}
+\noindent{\Large\bfseries #1}\par\vspace{0.5cm}\noindent\ignorespaces}
+{\null\ignorespacesafterend}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% ACKNOWLEDGMENTS ENVIRONMENT %%
-\newenvironment{acknowledgments}[1][\@AcknowledgmentsLabel]%
-{\cleardoublepage
-\null\begin{center}{\large \bfseries #1}\end{center}\itshape}%
-{\null}
+\newenvironment{acknowledgments}[1][\SAP@AcknowledgmentsLabel]
+{\cleardoublepage\thispagestyle{plain}
+\noindent{\Large\bfseries #1}\par\vspace{0.5cm}\itshape\noindent\ignorespaces}
+{\null\ignorespacesafterend}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LANGUAGE COMMANDS %%
 
 \newcommand{\SAP@english}{%
-  \newcommand{\@CandidateLabel}{Candidate}
-  \newcommand{\@IDnumberLabel}{ID number}
-  \newcommand{\@ThesisAdvisorLabel}{Thesis Advisor}
-  \newcommand{\@ThesisAdvisorsLabel}{Thesis Advisors}
-  \newcommand{\@ThesisCoAdvisorLabel}{Co-Advisor}
-  \newcommand{\@ThesisCoAdvisorsLabel}{Co-Advisors}
-  \newcommand{\@DeclarationLabel}{A thesis
+  \newcommand{\SAP@CandidateLabel}{Candidate}
+  \newcommand{\SAP@IDnumberLabel}{ID number}
+  \newcommand{\SAP@ThesisAdvisorLabel}{Thesis Advisor}
+  \newcommand{\SAP@ThesisAdvisorsLabel}{Thesis Advisors}
+  \newcommand{\SAP@ThesisCoAdvisorLabel}{Co-Advisor}
+  \newcommand{\SAP@ThesisCoAdvisorsLabel}{Co-Advisors}
+  \newcommand{\SAP@DeclarationLabel}{A thesis
   submitted in partial fulfillment of the requirements\\
     for the degree of Doctor of Philosophy in}
-  \newcommand{\@ThesisNotDefensedLabel}{Thesis not yet defended}
-  \newcommand{\@ThesisDefensedLabelA}{Thesis defended on}
-  \newcommand{\@ThesisDefensedLabelB}{in front of a Board of Examiners composed by}
-  \newcommand{\@chairman}{chairman}
-  \newcommand{\@PhDthesistype}{Ph.D. thesis}
-  \newcommand{\@LaMthesistype}{Master thesis}
-  \newcommand{\@Lauthesistype}{Bachelor thesis}
-  \newcommand{\@MasterPthesistype}{First level master thesis}
-  \newcommand{\@MasterSthesistype}{Second level master thesis}
-  \newcommand{\@sapienzaname}{Sapienza -- University of Rome}
-  \newcommand{\@versionLabel}{version}
-  \newcommand{\@websiteLabel}{website}
-  \newcommand{\@AcknowledgmentsLabel}{Acknowledgments}
-  \newcommand{\@AbstractLabel}{Abstract}
-  \newcommand{\@AcademicYearLabel}{Academic Year}}
+  \newcommand{\SAP@ThesisNotDefensedLabel}{Thesis not yet defended}
+  \newcommand{\SAP@ThesisDefensedLabelA}{Thesis defended on}
+  \newcommand{\SAP@ThesisDefensedLabelB}{in front of a Board of Examiners composed by}
+  \newcommand{\SAP@chairman}{chairman}
+  \newcommand{\SAP@PhDthesistype}{Ph.D. thesis}
+  \newcommand{\SAP@LaMthesistype}{Master thesis}
+  \newcommand{\SAP@Lauthesistype}{Bachelor thesis}
+  \newcommand{\SAP@MasterPthesistype}{First level master thesis}
+  \newcommand{\SAP@MasterSthesistype}{Second level master thesis}
+  \newcommand{\SAP@sapienzaname}{Sapienza -- University of Rome}
+  \newcommand{\SAP@versionLabel}{version}
+  \newcommand{\SAP@websiteLabel}{website}
+  \newcommand{\SAP@AcknowledgmentsLabel}{Acknowledgments}
+  \newcommand{\SAP@AbstractLabel}{Abstract}
+  \newcommand{\SAP@AcademicYearLabel}{Academic Year}}
 
 \newcommand{\SAP@italian}{%
-  \newcommand{\@CandidateLabel}{Candidato}
-  \newcommand{\@IDnumberLabel}{Matricola}
-  \newcommand{\@ThesisAdvisorLabel}{Relatore}
-  \newcommand{\@ThesisAdvisorsLabel}{Relatori}
-  \newcommand{\@ThesisCoAdvisorLabel}{Correlatore}
-  \newcommand{\@ThesisCoAdvisorsLabel}{Correlatori}
-  \newcommand{\@DeclarationLabel}{Tesi presentata
+  \newcommand{\SAP@CandidateLabel}{Candidato}
+  \newcommand{\SAP@IDnumberLabel}{Matricola}
+  \newcommand{\SAP@ThesisAdvisorLabel}{Relatore}
+  \newcommand{\SAP@ThesisAdvisorsLabel}{Relatori}
+  \newcommand{\SAP@ThesisCoAdvisorLabel}{Correlatore}
+  \newcommand{\SAP@ThesisCoAdvisorsLabel}{Correlatori}
+  \newcommand{\SAP@DeclarationLabel}{Tesi presentata
   in parziale adempimento dei requisiti necessari\\
   per conseguire il titolo di Dottore di Ricerca in}
-  \newcommand{\@ThesisNotDefensedLabel}{Tesi non ancora discussa}
-  \newcommand{\@ThesisDefensedLabelA}{Tesi discussa il}
-  \newcommand{\@ThesisDefensedLabelB}{di fronte a una commissione esaminatrice composta da}
-  \newcommand{\@chairman}{presidente}
-  \newcommand{\@PhDthesistype}{Tesi di dottorato}
-  \newcommand{\@LaMthesistype}{Tesi di Laurea Magistrale}
-  \newcommand{\@Lauthesistype}{Tesi di Laurea}
-  \newcommand{\@MasterPthesistype}{Tesi di Master di primo livello}
-  \newcommand{\@MasterSthesistype}{Tesi di Master di secondo livello}
-  \newcommand{\@sapienzaname}{Sapienza -- Universit\`a di Roma}
-  \newcommand{\@versionLabel}{versione}
-  \newcommand{\@websiteLabel}{sito web}
-  \newcommand{\@AcknowledgmentsLabel}{Ringraziamenti}
-  \newcommand{\@AbstractLabel}{Sommario}
-  \newcommand{\@AcademicYearLabel}{Anno Accademico}}
+  \newcommand{\SAP@ThesisNotDefensedLabel}{Tesi non ancora discussa}
+  \newcommand{\SAP@ThesisDefensedLabelA}{Tesi discussa il}
+  \newcommand{\SAP@ThesisDefensedLabelB}{di fronte a una commissione esaminatrice composta da}
+  \newcommand{\SAP@chairman}{presidente}
+  \newcommand{\SAP@PhDthesistype}{Tesi di dottorato}
+  \newcommand{\SAP@LaMthesistype}{Tesi di Laurea Magistrale}
+  \newcommand{\SAP@Lauthesistype}{Tesi di Laurea}
+  \newcommand{\SAP@MasterPthesistype}{Tesi di Master di primo livello}
+  \newcommand{\SAP@MasterSthesistype}{Tesi di Master di secondo livello}
+  \newcommand{\SAP@sapienzaname}{Sapienza -- Universit\`a di Roma}
+  \newcommand{\SAP@versionLabel}{versione}
+  \newcommand{\SAP@websiteLabel}{sito web}
+  \newcommand{\SAP@AcknowledgmentsLabel}{Ringraziamenti}
+  \newcommand{\SAP@AbstractLabel}{Sommario}
+  \newcommand{\SAP@AcademicYearLabel}{Anno Accademico}}
 
   
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 4b8270ed12a..90b0d481d78 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2168,7 +2168,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'parnotes'	 => 'PNmanual.pdf',                    # no source
  'piechartmp'	 => 'piechartmp.pdf',                   # no source
  'ptptex'        => '(overcite|cite|wrapfig).sty',	# duplicated
- 'sapthesis'	 => 'marchiologo.*\.pdf', 		# univ logos
+ 'sapthesis'	 => '.*-ML.*\.pdf', 		# univ logos
  'stix'		 => 'STIX_Font_Release_Documentation_2010.pdf', # no source
  'stubs'	 => 'stubs.pdf',			# no source
  'susy'		 => 'susy.pdf',				# no source