1 files changed, 117 insertions, 61 deletions
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$}}