beamer2thesis (19sep11)

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

4 files changed, 263 insertions, 87 deletions

diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
index bdcb2932526..423b1aba5e9 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
@@ -17,19 +17,19 @@
 \definecolor{processblue}{cmyk}{0.96,0,0,0}
 % Green
 \definecolor{forestgreen}{cmyk}{0.91,0,0.88,0.12}
-\definecolor{yellowgreen}{cmyk}{0.44,0,0.74,0}
+\definecolor{yellowgreen}{cmyk}{0.48,0,0.72,0}
 % Red
 \definecolor{redorange}{cmyk}{0,0.77,0.87,0}
 \definecolor{apricot}{cmyk}{0,0.32,0.52,0}
 
-\DeclareOptionBeamer{color}{\def\beamer@politothesis@color{#1}}
+\DeclareOptionBeamer{color}{\def\beamer@torinoth@defcolor{#1}}
 \ExecuteOptionsBeamer{color=blue}
 
 \ProcessOptionsBeamer
 
 % Blue colors
-\def\beamer@politothesis@bluetext{blue}%
-\ifx\beamer@politothesis@color\beamer@politothesis@bluetext%
+\def\beamer@torinoth@bluetext{blue}%
+\ifx\beamer@torinoth@defcolor\beamer@torinoth@bluetext%
 
   \setbeamercolor*{palette primary}{fg=white,bg=processblue}
   \setbeamercolor*{palette secondary}{fg=navyblue,bg=processblue!20}
@@ -38,12 +38,19 @@
   \setbeamercolor*{frametitle}{fg=black,bg=black}
   \setbeamercolor*{item}{fg=cerulean}
   \setbeamercolor*{alerted text}{fg=cerulean}
+  \def\beamer@torinoth@color{cerulean}
+  \setbeamercolor{block body}{fg=black,bg=processblue!10}
+  \setbeamercolor{block body alerted}{fg=black,bg=processblue!10}
+  \setbeamercolor{block body example}{use=block title,fg=black,bg=processblue!10}
+  \setbeamercolor{block title}{bg=processblue,fg=white}
+  \setbeamercolor{block title alerted}{bg=processblue,fg=white}
+  \setbeamercolor{block title example}{bg=processblue,fg=white}
 
 \fi%
 
 % Green colors
-\def\beamer@politothesis@greentext{green}%
-\ifx\beamer@politothesis@color\beamer@politothesis@greentext%
+\def\beamer@torinoth@greentext{green}%
+\ifx\beamer@torinoth@defcolor\beamer@torinoth@greentext%
 
   \setbeamercolor*{palette primary}{fg=white,bg=forestgreen}
   \setbeamercolor*{palette secondary}{fg=black,bg=yellowgreen}
@@ -52,12 +59,20 @@
   \setbeamercolor*{frametitle}{fg=black,bg=black}
   \setbeamercolor*{item}{fg=forestgreen}
   \setbeamercolor*{alerted text}{fg=forestgreen}
+  \def\beamer@torinoth@color{forestgreen}
+  
+  \setbeamercolor{block body}{fg=black,bg= yellowgreen!20}
+  \setbeamercolor{block body alerted}{fg=black,bg= yellowgreen!20}
+  \setbeamercolor{block body example}{use=block title,fg=black,bg= yellowgreen!20}
+  \setbeamercolor{block title}{bg= forestgreen,fg=white}
+  \setbeamercolor{block title alerted}{bg= forestgreen,fg=white}
+  \setbeamercolor{block title example}{bg= forestgreen,fg=white}
 
 \fi%
 
 % Red colors
-\def\beamer@politothesis@redtext{red}%
-\ifx\beamer@politothesis@color\beamer@politothesis@redtext%
+\def\beamer@torinoth@redtext{red}%
+\ifx\beamer@torinoth@defcolor\beamer@torinoth@redtext%
 
   \setbeamercolor*{palette primary}{fg=white,bg=redorange}
   \setbeamercolor*{palette secondary}{fg=black,bg=apricot}
@@ -66,6 +81,14 @@
   \setbeamercolor*{frametitle}{fg=black,bg=black}
   \setbeamercolor*{item}{fg=redorange}
   \setbeamercolor*{alerted text}{fg=redorange}
+  \def\beamer@torinoth@color{redorange}
+  
+   \setbeamercolor{block body}{fg=black,bg= apricot!20}
+  \setbeamercolor{block body alerted}{fg=black,bg= apricot!20}
+  \setbeamercolor{block body example}{use=block title,fg=black,bg= apricot!20}
+  \setbeamercolor{block title}{bg= redorange,fg=white}
+  \setbeamercolor{block title alerted}{bg= redorange,fg=white}
+  \setbeamercolor{block title example}{bg= redorange,fg=white}
 
 \fi%
 
@@ -80,6 +103,8 @@
 \setbeamercolor*{second header}{parent=palette secondary}
 \setbeamercolor*{frame number}{parent=palette secondary}
 
+\setbeamercolor*{separation line}{bg=white}
+\setbeamercolor*{fine separation line}{bg=white}
 
 \mode
 <all>
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
index 41a28789392..541a491750e 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
@@ -19,6 +19,10 @@
 \DeclareOptionBeamer{secondlogo}[true]{\def\beamer@torinoth@secondlogo{#1}}
 \ExecuteOptionsBeamer{secondlogo=false}
 
+% Third optional logo to use in the title page
+\DeclareOptionBeamer{thirdlogo}[true]{\def\beamer@torinoth@thirdlogo{#1}}
+\ExecuteOptionsBeamer{thirdlogo=false}
+
 % Language
 \DeclareOptionBeamer{language}[italian]{\def\beamer@torinoth@language{#1}}
 \ExecuteOptionsBeamer{language=english}
@@ -27,6 +31,9 @@
 \DeclareOptionBeamer{secondcandidate}[true]{\def\beamer@torinoth@secondcandidate{#1}}
 \ExecuteOptionsBeamer{secondcandidate=false}
 
+% Assistant supervisor
+\DeclareOptionBeamer{assistantsupervisor}[true]{\def\beamer@torinoth@assistantsupervisor{#1}}
+\ExecuteOptionsBeamer{assistantsupervisor=false}
 
 % Bullet shape
 \DeclareOptionBeamer{bullet}{\def\beamer@torinoth@bullet{#1}}
@@ -38,15 +45,14 @@
 \def\beamer@torinoth@secondlogotext{true}%
 \ifx\beamer@torinoth@secondlogo\beamer@torinoth@secondlogotext%
   \def\titlepagesecondlogo#1{\gdef\@titlepagesecondlogo{#1}}%
-\fi%
 
-% Package usage according to language
-\def\beamer@torinoth@italiantext{italian}%
-  \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
-    \RequirePackage[italian]{babel}%
-  \else%
-    \RequirePackage[english]{babel}%
-  \fi%
+  % Definition of third logo if request
+    \def\beamer@torinoth@thirdlogotext{true}%
+    \ifx\beamer@torinoth@thirdlogo\beamer@torinoth@thirdlogotext%
+        \def\titlepagethirdlogo#1{\gdef\@titlepagethirdlogo{#1}}%
+    \fi%
+
+\fi%
 
 % Ateneo
 \providecommand{\ateneo}{\institute}%
@@ -58,12 +64,18 @@
 % Second candidate
 \def\beamer@torinoth@secondcandtext{true}%
 \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
-     \def\secondcandidate#1{\gdef\@secondcandidate{#1}}%
+   \def\secondcandidate#1{\gdef\@secondcandidate{#1}}%
+\fi
+
+% Assistant supervisor
+\def\beamer@torinoth@assistantsupervisortext{true}%
+\ifx\beamer@torinoth@assistantsupervisortext\beamer@torinoth@assistantsupervisor%
+   \def\assistantsupervisor#1{\gdef\@assistantsupervisor{#1}}%
 \fi
 
 % Margins
 \newlength{\beamer@torinoth@normalmargin}
-\setlength{\beamer@torinoth@normalmargin}{.055\paperwidth}
+\setlength{\beamer@torinoth@normalmargin}{.065\paperwidth}
 \setbeamersize{text margin left=\beamer@torinoth@normalmargin}
 \setbeamersize{text margin right=\beamer@torinoth@normalmargin}
 \setlength\leftmargini{.6\beamer@torinoth@normalmargin}
@@ -76,56 +88,105 @@
 
    % Logo & Ateneo
    \begin{centering}
-     \begin{beamercolorbox}[rounded=true,shadow=true,wd=.9\paperwidth,sep=8pt,center,#1]{ateneo page header}%
+     \begin{beamercolorbox}[rounded=true,shadow=true,ht=2.5ex,wd=.9\paperwidth,sep=3pt,center,#1]{ateneo page header}%
        \usebeamerfont{ateneo}\insertateneo\par%
      \end{beamercolorbox}
      \vskip0.5em%
      % Check-second-logo
      \def\beamer@torinoth@secondlogotext{true}%
      \ifx\beamer@torinoth@secondlogo\beamer@torinoth@secondlogotext%
+        % Check-third-logo
+        \def\beamer@torinoth@thirdlogotext{true}%
+        \ifx\beamer@torinoth@thirdlogo\beamer@torinoth@thirdlogotext%
+            \hbox{
+            % First-column
+            \begin{beamercolorbox}[wd=0.3\paperwidth,center]{}
+            \includegraphics[height=.2\paperheight]{\@titlepagesecondlogo}%
+            \end{beamercolorbox}
+            % Second-column
+            \begin{beamercolorbox}[wd=0.25\paperwidth,center]{}
+            \includegraphics[height=.2\paperheight]{\beamer@torinoth@titlepagelogo}%
+            \end{beamercolorbox}
+            % Third-column
+            \begin{beamercolorbox}[wd=0.275\paperwidth,center]{}
+            \includegraphics[height=.2\paperheight]{\@titlepagethirdlogo}%
+            \end{beamercolorbox}
+
+            }
+        \else%
         \hbox{
             % First-column
             \begin{beamercolorbox}[wd=0.475\paperwidth,center]{}
-            \includegraphics[height=.225\paperheight]{\beamer@torinoth@titlepagelogo}%
+            \includegraphics[height=.2\paperheight]{\beamer@torinoth@titlepagelogo}%
             \end{beamercolorbox}
             % Second-column
             \begin{beamercolorbox}[wd=0.325\paperwidth,center]{}
-            \includegraphics[height=.225\paperheight]{\@titlepagesecondlogo}%
+            \includegraphics[height=.2\paperheight]{\@titlepagesecondlogo}%
             \end{beamercolorbox}}
+        \fi%
      \else%
-        \includegraphics[height=.225\paperheight]{\beamer@torinoth@titlepagelogo}%
+        \includegraphics[height=.2\paperheight]{\beamer@torinoth@titlepagelogo}%
      \fi%
      \vfill%
    \end{centering}
+  \vskip0.25em%
   % Title
   \begin{centering}
      \begin{beamercolorbox}[wd=\paperwidth,sep=8pt,center,#1]{title page header}
        \usebeamerfont{title}\inserttitle\par% 
      \end{beamercolorbox}%
   \end{centering}
-  \vskip1em\par%
-  
+  \vskip0.5em\par%  
+
   % definitions
+  \def\beamer@torinoth@italiantext{italian}%
   \begin{columns}
     % First column
     \column{.5\paperwidth}%
     % Supervisor-language-check
-    \def\beamer@torinoth@italiantext{italian}%
     \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
       \def\beamer@torinoth@superv{Relatore}%
     \else%
       \def\beamer@torinoth@superv{Supervisor}%
     \fi%
-    \begin{beamercolorbox}[sep=8pt,center,#1]{rel}
-      \usebeamerfont{definition}\beamer@torinoth@superv%
-    \end{beamercolorbox}
+   % Assistant-supervisor-language-check
+    \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+      \def\beamer@torinoth@assistantsupervisorlabel{Correlatore}%
+    \else%
+      \def\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisor}%
+    \fi%
+    % Assistant-supervisor-check 
+    \def\beamer@torinoth@assistantsupervisortext{true}%
+    \ifx\beamer@torinoth@assistantsupervisor\beamer@torinoth@assistantsupervisortext%
+       \begin{beamercolorbox}[ht=0.085\paperheight,sep=8pt,center,#1]{rel}
+         \usebeamerfont{definition}\beamer@torinoth@superv%
+       \end{beamercolorbox}
+       \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}%
+         \usebeamerfont{person}\@rel%
+       \end{beamercolorbox}
+       \vspace{\stretch{1}}%
+       \begin{beamercolorbox}[ht=0.09\paperheight,sep=8pt,center,#1]{rel}
+         \usebeamerfont{definition}\beamer@torinoth@assistantsupervisorlabel%
+       \end{beamercolorbox}
+       \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}%
+         \usebeamerfont{person}\@assistantsupervisor%
+       \end{beamercolorbox}
+    \else
+        \begin{beamercolorbox}[sep=8pt,center,#1]{rel}
+         \usebeamerfont{definition}\beamer@torinoth@superv%
+       \end{beamercolorbox}
+       \vskip-0.5em%
+       \begin{beamercolorbox}[sep=8pt,center,#1]{rel}%
+         \usebeamerfont{person}\@rel%
+       \end{beamercolorbox}
+    \fi
+
     % Second column
     \column{.5\paperwidth}%
     % Number-candidates-check
     \def\beamer@torinoth@secondcandtext{true}%
     \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
        % Candidate-language-check
-       \def\beamer@torinoth@italiantext{italian}%
        \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
          \def\beamer@torinoth@cand{Candidati}%
        \else%
@@ -133,58 +194,43 @@
        \fi%
     \else%
        % Candidate-language-check
-       \def\beamer@torinoth@italiantext{italian}%
        \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
          \def\beamer@torinoth@cand{Candidato}%
        \else%
          \def\beamer@torinoth@cand{Candidate}%
        \fi%
     \fi%
-    \begin{beamercolorbox}[sep=8pt,center,#1]{author}
-      \usebeamerfont{definition}\beamer@torinoth@cand%
-    \end{beamercolorbox}
-  \end{columns}
-  \vskip-0.5em%
-  % Check-number-candidates
-  \def\beamer@torinoth@secondcandtext{true}%
-  \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
-     \begin{columns}
-       \column{.5\paperwidth}%
-       % Supervisor
-       \begin{beamercolorbox}[sep=8pt,center,#1]{rel}%
-         \usebeamerfont{person}\@rel%
+    \def\beamer@torinoth@secondcandtext{true}%
+    \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
+       \begin{beamercolorbox}[sep=8pt,center,#1]{author}
+         \usebeamerfont{definition}\beamer@torinoth@cand%
        \end{beamercolorbox}
-       \column{.5\paperwidth}
+       \vskip-0.5em%
        % First-candidate
-       \begin{beamercolorbox}[sep=8pt,center,#1]{author}%
+       \begin{beamercolorbox}[sep=8pt,center,#1]{author}
          \usebeamerfont{person}\insertauthor%
        \end{beamercolorbox}
-     \end{columns}
-     \vskip-0.75em%
-     \begin{columns}
-       \column{.5\paperwidth}%
-       % No-Supervisor
-       \column{.5\paperwidth}
-       % First-candidate
-       \begin{beamercolorbox}[sep=8pt,center,#1]{author}%
+       \vskip-0.5em%
+       % Second-candidate
+       \begin{beamercolorbox}[sep=8pt,center,#1]{author}
          \usebeamerfont{person}\@secondcandidate%
        \end{beamercolorbox}
-     \end{columns}
-  \else%
-    \begin{columns}
-    \column{.5\paperwidth}%
-    % Supervisor
-    \begin{beamercolorbox}[sep=8pt,center,#1]{rel}%
-      \usebeamerfont{person}\@rel%
-    \end{beamercolorbox}
-    \column{.5\paperwidth}
-    % Candidate
-    \begin{beamercolorbox}[sep=8pt,center,#1]{author}%
-      \usebeamerfont{person}\insertauthor%
-    \end{beamercolorbox}
-    \end{columns}
-  \fi%
-  \vskip2em%
+    \else%
+       \begin{beamercolorbox}[sep=8pt,center,#1]{author}
+         \usebeamerfont{definition}\beamer@torinoth@cand%
+       \end{beamercolorbox}
+       \vskip-0.5em%
+       % First-candidate
+       \begin{beamercolorbox}[sep=8pt,center,#1]{author}
+         \usebeamerfont{person}\insertauthor%
+       \end{beamercolorbox}
+    \fi
+  \end{columns}
+  \def\beamer@torinoth@assistantsupervisortextf{false}%
+  \ifx\beamer@torinoth@assistantsupervisor\beamer@torinoth@assistantsupervisortextf%
+    \vskip1.5em%
+  \fi
+
   % Date
   \begin{centering}
     \begin{beamercolorbox}[sep=8pt,center,#1]{date}%
@@ -196,6 +242,16 @@
 
 % Itemize environment thesis-modifications
 
+% Advantages mode
+\newenvironment{adv}%
+{\begin{list}{\color{\beamer@torinoth@color}{\ding{51}}}{}}%
+{\end{list}}%
+
+% Disadvantages mode
+\newenvironment{disadv}%
+{\begin{list}{\color{\beamer@torinoth@color}{\ding{55}}}{}}%
+{\end{list}}%
+
 % Square mode
 \defbeamertemplate{itemize item}{squarem}%
 {\tiny\raise.5ex\hbox{\donotcoloroutermaths$\blacksquare$}}
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
index 03c388aff44..1c6af1ce283 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
@@ -14,20 +14,33 @@
 % String used between the current page and the total page count.
 \def\beamer@torinoth@pageofpages{of}
 \DeclareOptionBeamer{pageofpages}{\def\beamer@torinoth@pageofpages{#1}}
+\ExecuteOptionsBeamer{pageofpages=of}
 
 % Show a line below the frame title.
-\DeclareOptionBeamer{titleline}[true]{\def\beamer@torinoth@titleline{#1}}
+\DeclareOptionBeamer{titleline}[false]{\def\beamer@torinoth@titleline{#1}}
 
-\ExecuteOptionsBeamer{titleline=false}
+% Option to not show the author in the footer
+\DeclareOptionBeamer{notshowauthor}[true]{\def\beamer@torinoth@notshowauthor{#1}}
+\ExecuteOptionsBeamer{notshowauthor=false}
+
+\ExecuteOptionsBeamer{titleline=true}
 \ProcessOptionsBeamer
 
 % Lengths
 \newlength{\headerheight}
-\setlength{\headerheight}{.05\paperheight}
+\setlength{\headerheight}{.045\paperheight}
 \newlength{\beamer@torinoth@line}
 \setlength{\beamer@torinoth@line}{.03\paperheight}
 \newlength{\beamer@torinoth@box}
-\setlength{\beamer@torinoth@box}{.01\paperheight}
+\newlength{\beamer@torinoth@textbox}
+\setlength{\beamer@torinoth@textbox}{\widthof{Evaluation text to be compared with the title}}
+\newlength{\beamer@torinoth@titlelength}
+\setlength{\beamer@torinoth@titlelength}{\widthof{\string\inserttitle}}
+\ifdim\beamer@torinoth@titlelength>\beamer@torinoth@textbox
+   \setlength{\beamer@torinoth@box}{.02\paperheight}
+\else
+   \setlength{\beamer@torinoth@box}{.015\paperheight}
+\fi
 
 % Footer
 \defbeamertemplate*{footline}{torinoth theme}
@@ -42,18 +55,35 @@
   \hbox{%
   \begin{beamercolorbox}[wd=.85\paperwidth,ht=0ex,dp=0ex]{}%
   \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.075\paperwidth,ht=.2ex,dp=0ex,center,rounded=true,shadow=true,draw]{frame number}%
+  \begin{beamercolorbox}[wd=.075\paperwidth,ht=.2ex,dp=0ex,center,rounded=true,shadow=true]{frame number}%
     \usebeamerfont{frame number}\insertframenumber{} \beamer@torinoth@pageofpages{} \inserttotalframenumber{}%
   \end{beamercolorbox}%
   } %
   % Second line.
   \hbox{%
-  \begin{beamercolorbox}[wd=.2\paperwidth,ht=\beamer@torinoth@box,dp=0pt]{}%
-  \end{beamercolorbox}%
   \def\beamer@torinoth@separator{-}%
-  \begin{beamercolorbox}[wd=.6\paperwidth,ht=\beamer@torinoth@box,dp=0pt,center,rounded=true,shadow=true]{footerbox}%
-    \usebeamerfont{footnote}\insertauthor{} \beamer@torinoth@separator{} \inserttitle % Here is inserted author-title: manage different cases
-  \end{beamercolorbox}%
+  % Check if there are two candidates
+  \def\beamer@torinoth@secondcandtext{true}%
+  \ifx\beamer@torinoth@secondcandidateoption\beamer@torinoth@secondcandtext%
+     \begin{beamercolorbox}[wd=.2\paperwidth,ht=\beamer@torinoth@box,dp=0pt]{}%
+     \end{beamercolorbox}%
+     \begin{beamercolorbox}[wd=.6\paperwidth,ht=\beamer@torinoth@box,dp=0pt,center,rounded=true,shadow=true]{footerbox}%
+       \usebeamerfont{footnote}\inserttitle \par% 
+     \end{beamercolorbox}%
+  \else%
+     \begin{beamercolorbox}[wd=.15\paperwidth,ht=\beamer@torinoth@box,dp=0pt]{}%
+     \end{beamercolorbox}%
+     \def\beamer@torinoth@notshowauthortext{true}%
+     \ifx\beamer@torinoth@notshowauthor\beamer@torinoth@notshowauthortext%
+        \begin{beamercolorbox}[wd=.65\paperwidth,ht=\beamer@torinoth@box,dp=0pt,center,rounded=true,shadow=true]{footerbox}%
+          \usebeamerfont{footnote} \inserttitle \par% 
+        \end{beamercolorbox}%
+     \else
+        \begin{beamercolorbox}[wd=.65\paperwidth,ht=\beamer@torinoth@box,dp=0pt,center,rounded=true,shadow=true]{footerbox}%
+          \usebeamerfont{footnote}\insertauthor{} \beamer@torinoth@separator{} \inserttitle \par%
+        \end{beamercolorbox}%
+     \fi%
+  \fi%
   \begin{beamercolorbox}[wd=.2\paperwidth,ht=\beamer@torinoth@box,dp=0pt]{}%
   \end{beamercolorbox}%
   } %
@@ -63,7 +93,6 @@
   \insertslidenavigationsymbol
   \end{beamercolorbox}%
   } %
-  
 }
 
 % Header
@@ -82,8 +111,7 @@
   \hbox{%
   \begin{beamercolorbox}[wd=\paperwidth,ht=\beamer@torinoth@line]{second header}%
   \end{beamercolorbox}%
-  } %
-  \vskip0pt%
+  }
 }
 
 \defbeamertemplate*{frametitle}{torinoth theme}[1][left]
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
index 408c919a830..ee3e3e589a7 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
@@ -11,20 +11,58 @@
 
 \mode<presentation>
 
-\RequirePackage[utf8x]{inputenc}
+% Packages
+\RequirePackage{ifxetex}%
+\RequirePackage{pifont}%
+  \RequirePackage{calc,ifthen}%
+\ifxetex
+  \RequirePackage{fontspec}%
+  \defaultfontfeatures{Mapping=tex-text}%
+  \RequirePackage{xunicode}% 
+  \RequirePackage{xltxtra}%
+  \RequirePackage{metalogo}%
+  \RequirePackage{xkeyval}%
+  \RequirePackage{polyglossia}%
+\else
+  \RequirePackage[utf8x]{inputenc}%
+\fi
 
-\DeclareOptionBeamer{language}[italian]{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}}
+
+% Language
+\DeclareOptionBeamer{language}[italian]{\def\beamer@torinoth@language{#1}}%
+\ExecuteOptionsBeamer{language=english}%
+
+\def\beamer@torinoth@italiantext{italian}%
+  \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+    \def\beamer@torinoth@subject{Presentazione Tesi di Laurea}%
+    \ifxetex
+      \setmainlanguage{italian}%
+    \else
+      \RequirePackage[italian]{babel}%
+    \fi
+  \else%
+    \def\beamer@torinoth@subject{Thesis Presentation}%
+    \ifxetex
+      \setmainlanguage[variant=british]{english}%
+    \else
+      \RequirePackage[english]{babel}%
+    \fi
+\fi%
+
+% Options
 \DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemetorinoth}}
 \DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemetorinoth}}
 \DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemetorinoth}}
-\DeclareOptionBeamer{titleline}[true]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
 \DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}}
 \DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}}
 \DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}}
-
-
+\DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}}
 \ProcessOptionsBeamer
 
+% General settings
 \useinnertheme{torinoth}
 \useoutertheme{torinoth}
 \usecolortheme{torinoth}
@@ -36,5 +74,34 @@
 \newenvironment{tframe}{
 \begin{frame}[t]}{\end{frame}}
 
+% Titleapageframe command
+\newcommand{\titlepageframe}{
+\begin{frame}[plain]
+\titlepage
+\end{frame}
+}
+
+% Highlight a single word
+\newcommand{\highlight}[1]{{\it{\color{\beamer@torinoth@color}{#1}}}}
+\newcommand{\highlightbf}[1]{{\bf\color{\beamer@torinoth@color}{#1}}}
+
+% Define hypersetup
+\hypersetup{%
+    colorlinks=true,
+    hyperindex=true,
+    pdfpagelabels,
+    plainpages=false,
+    urlcolor=\beamer@torinoth@color,
+    linkcolor=\beamer@torinoth@color,
+    pdfinfo={%
+        Title={\inserttitle},%
+        Author={\insertauthor},%
+        Subject={\beamer@torinoth@subject},%
+    }
+}
+
+% Blocks
+\setbeamertemplate{blocks}[rounded][shadow=true]
+
 \mode
 <all>