sapthesis (18jan12)

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

1 files changed, 235 insertions, 307 deletions

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}}
 
   
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%