summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-27 22:12:01 +0000
committerKarl Berry <karl@freefriends.org>2012-08-27 22:12:01 +0000
commita65852350dd289d0de23e9b5019613e89de47a4e (patch)
tree8f6ed8413f7d533fae3467714a32b0a1f24de2f9 /Master/texmf-dist/tex
parent8242aaa29f30ed9c3abea253edf12970cc50634c (diff)
beamer2thesis (27aug12)
git-svn-id: svn://tug.org/texlive/trunk@27539 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerfontthemetorinoth.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty234
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty14
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty46
5 files changed, 203 insertions, 96 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
index 423b1aba5e9..ebeae129762 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamercolorthemetorinoth.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Copyright 2011 by Fiandrino Claudio
+% Copyright 2011-2012 by Fiandrino Claudio
%
% This file may be distributed and/or modified
%
@@ -39,6 +39,7 @@
\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}
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerfontthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerfontthemetorinoth.sty
index 22b33333df4..eb5964dde8f 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerfontthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerfontthemetorinoth.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Copyright 2011 by Fiandrino Claudio
+% Copyright 2011-2012 by Fiandrino Claudio
%
% This file may be distributed and/or modified
%
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
index c62d76ea27d..7a2e278b16f 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Copyright 2011 by Fiandrino Claudio
+% Copyright 2011-2012 by Fiandrino Claudio
%
% This file may be distributed and/or modified
%
@@ -25,6 +25,7 @@
% Language
\DeclareOptionBeamer{language}[italian]{\def\beamer@torinoth@language{#1}}
+\DeclareOptionBeamer{language}[other]{\def\beamer@torinoth@language{#1}}
\ExecuteOptionsBeamer{language=english}
% Second candidate
@@ -68,27 +69,47 @@
% Supervisor
\def\rel#1{\gdef\@rel{#1}}
+\def\@rel{\PackageError{Beamer2Thesis}%
+{\protect\rel\space not given. Please insert name and surname of the supervisor}%
+{Example: \protect\rel{Name-surname}}
+}%
% Second supervisor
\def\beamer@torinoth@secondsuptext{true}%
\ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext%
\def\secondsupervisor#1{\gdef\@secondsupervisor{#1}}%
+ \def\@secondsupervisor{\PackageError{Beamer2Thesis}%
+ {\protect\secondsupervisor\space not given. Please insert it}%
+ {Example: \protect\secondsupervisor{Name-surname}}
+ }%
\fi
% Second candidate
\def\beamer@torinoth@secondcandtext{true}%
\ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
\def\secondcandidate#1{\gdef\@secondcandidate{#1}}%
+ \def\@secondcandidate{\PackageError{Beamer2Thesis}%
+ {\protect\secondcandidate\space not given. Please insert it}%
+ {Example: \protect\secondcandidate{Name-surname}}
+ }%
\fi
% Assistant supervisor
\def\beamer@torinoth@assistantsupervisortext{true}%
\ifx\beamer@torinoth@assistantsupervisortext\beamer@torinoth@assistantsupervisor%
\def\assistantsupervisor#1{\gdef\@assistantsupervisor{#1}}%
+ \def\@assistantsupervisor{\PackageError{Beamer2Thesis}%
+ {\protect\assistantsupervisor\space not given. Please insert it}%
+ {Example: \protect\assistantsupervisor{Name-surname}}
+ }%
% Second assistant supervisor
\def\beamer@torinoth@secondassistantsuptext{true}%
\ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext%
\def\secondassistantsupervisor#1{\gdef\@secondassistantsupervisor{#1}}%
+ \def\@secondassistantsupervisor{\PackageError{Beamer2Thesis}%
+ {\protect\secondassistantsupervisor\space not given. Please insert it}%
+ {Example: \protect\secondassistantsupervisor{Name-surname}}
+ }%
\fi
\fi
@@ -101,13 +122,129 @@
\setlength\leftmarginii{.6\beamer@torinoth@normalmargin}
\setlength\leftmarginiii{.6\beamer@torinoth@normalmargin}
+% Labels in title page
+%----------------------------------
+\def\beamer@torinoth@superv{}
+\def\beamer@torinoth@assistantsupervisorlabel{}
+\def\beamer@torinoth@cand{}
+\def\beamer@torinoth@italiantext{italian}%
+\def\beamer@torinoth@englishtext{english}%
+%----------------------------------
+ % First Column labels
+ % Supervisor-number-check
+ \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext%
+ % Supervisor-language-check
+
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@superv{Relatori}%
+ \else%
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@superv{Supervisors}%
+ \else%
+ \def\setrellabel#1{\gdef\@setrellab{#1}}%
+ \def\@setrellab{\PackageError{Beamer2Thesis}%
+ {\protect\setrellabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setrellabel{Supervisor}}
+ }
+ \renewcommand\beamer@torinoth@superv{\@setrellab}%
+ \fi%
+ \fi%
+ \else%
+ % Supervisor-language-check
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@superv{Relatore}%
+ \else%
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@superv{Supervisor}%
+ \else%
+ \def\setrellabel#1{\gdef\@setrellab{#1}}%
+ \def\@setrellab{\PackageError{Beamer2Thesis}%
+ {\protect\setrellabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setrellabel{Supervisor}}
+ }
+ \renewcommand\beamer@torinoth@superv{\@setrellab}%
+ \fi%
+ \fi%
+ \fi%
+ % Assistant Supervisor-number-check
+ \ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext%
+ % Assistant-supervisor-language-check
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{Correlatori}%
+ \else%
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisors}%
+ \else%
+ \def\setassistentsupervisorlabel#1{\gdef\@setassistentsupervlab{#1}}%
+ \def\@setassistentsupervlab{\PackageError{Beamer2Thesis}%
+ {\protect\setassistentsupervisorlabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setassistentsupervisorlabel{Assistent Supervisor}}
+ }
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{\@setassistentsupervlab}%
+ \fi%
+ \fi%
+ \else%
+ % Assistant-supervisor-language-check
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{Correlatore}%
+ \else%
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisor}%
+ \else%
+ \def\setassistentsupervisorlabel#1{\gdef\@setassistentsupervlab{#1}}%
+ \def\@setassistentsupervlab{\PackageError{Beamer2Thesis}%
+ {\protect\setassistentsupervisorlabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setassistentsupervisorlabel{Assistent Supervisor}}
+ }
+ \renewcommand\beamer@torinoth@assistantsupervisorlabel{\@setassistentsupervlab}%
+ \fi%
+ \fi%
+ \fi%
+%----------------------------------
+ % Second Column labels
+ % Number-candidates-check
+ \def\beamer@torinoth@secondcandtext{true}%
+ \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
+ % Candidate-language-check
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@cand{Candidati}%
+ \else%
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@cand{Candidates}%
+ \else%
+ \def\setcandidatelabel#1{\gdef\@setcandlab{#1}}%
+ \def\@setcandlab{\PackageError{Beamer2Thesis}%
+ {\protect\setcandidatelabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setcandidatelabel{Candidate}}
+ }
+ \renewcommand\beamer@torinoth@cand{\@setcandlab}%
+ \fi%
+ \fi%
+ \else%
+ % Candidate-language-check
+ \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+ \renewcommand\beamer@torinoth@cand{Candidato}%
+ \else
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@cand{Candidate}%
+ \else%
+ \def\setcandidatelabel#1{\gdef\@setcandlab{#1}}%
+ \def\@setcandlab{\PackageError{Beamer2Thesis}%
+ {\protect\setcandidatelabel\space not given. Please insert it in your language}%
+ {Example in english: \protect\setcandidatelabel{Candidate}}
+ }
+ \renewcommand\beamer@torinoth@cand{\@setcandlab}%
+ \fi%
+ \fi%
+ \fi%
+%----------------------------------
+
% Thesis title page
\defbeamertemplate*{title page}{torinoth}[1][]
{
-
% Logo & Ateneo
\begin{centering}
- \begin{beamercolorbox}[rounded=true,shadow=true,ht=2.5ex,wd=.9\paperwidth,sep=3pt,center,#1]{ateneo page header}%
+ \begin{beamercolorbox}[rounded=true,shadow=true,ht=2.5ex,wd=.89\paperwidth,sep=3pt,center,#1]{ateneo page header}%
\usebeamerfont{ateneo}\insertateneo\par%
\end{beamercolorbox}
\vskip0.5em%
@@ -156,57 +293,22 @@
\end{beamercolorbox}%
\end{centering}
- \vskip0.75em\par%
-
- % definitions
- \def\beamer@torinoth@italiantext{italian}%
+ \vskip0.75em\par%
+
\begin{columns}
-%%%%%%%%%%%%%%%%%%%
+ %%%%%%%%%%%%%%%%%%
% First column
\column{.5\paperwidth}%
- % Definition of labels
- % Supervisor-number-check
- \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext%
- % Supervisor-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@superv{Relatori}%
- \else%
- \def\beamer@torinoth@superv{Supervisors}%
- \fi%
- \else%
- % Supervisor-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@superv{Relatore}%
- \else%
- \def\beamer@torinoth@superv{Supervisor}%
- \fi%
- \fi%
- % Assistant Supervisor-number-check
- \ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext%
- % Assistant-supervisor-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@assistantsupervisorlabel{Correlatori}%
- \else%
- \def\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisors}%
- \fi%
- \else%
- % Assistant-supervisor-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@assistantsupervisorlabel{Correlatore}%
- \else%
- \def\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisor}%
- \fi%
- \fi%
%%%%%%%%%%%%%%%%%
% Placement of labels
% Assistant-supervisor-check
\ifx\beamer@torinoth@assistantsupervisor\beamer@torinoth@assistantsupervisortext%
- % Number assistant supervisor check
- \ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext%
- \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel}
+ % Number assistant supervisor check
+ \ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext%
+ \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel}
\usebeamerfont{definition}\beamer@torinoth@superv%
\end{beamercolorbox}
- \vskip-0.25em%
+ \vskip-0.25em%
\ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext%
\begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}%
\usebeamerfont{person}\@rel%
@@ -228,7 +330,7 @@
\begin{beamercolorbox}[ht=0.06\paperheight,sep=8pt,center,#1]{rel}%
\usebeamerfont{person}\@assistantsupervisor%
\end{beamercolorbox}
- \begin{beamercolorbox}[ht=0.05\paperheight,sep=8pt,center,#1]{rel}%
+ \begin{beamercolorbox}[ht=0.05\paperheight,sep=8pt,center,#1]{rel}%
\usebeamerfont{person}\@secondassistantsupervisor%
\end{beamercolorbox}
\vskip-1.75em%
@@ -262,7 +364,7 @@
%\vskip-2em%
\fi%
\else%
- \vspace{\stretch{0.25}}%
+ \vspace{\stretch{0.25}}%
\begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel}
\usebeamerfont{definition}\beamer@torinoth@superv%
\end{beamercolorbox}
@@ -286,24 +388,6 @@
% Second column
\column{.5\paperwidth}%
- % Definitions
- % Number-candidates-check
- \def\beamer@torinoth@secondcandtext{true}%
- \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext%
- % Candidate-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@cand{Candidati}%
- \else%
- \def\beamer@torinoth@cand{Candidates}%
- \fi%
- \else%
- % Candidate-language-check
- \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@cand{Candidato}%
- \else%
- \def\beamer@torinoth@cand{Candidate}%
- \fi%
- \fi%
%%%%%%%%%%%%%%%%%
% Placement of labels
\vskip-0.5em%
@@ -333,19 +417,19 @@
\fi
\end{columns}
% Selection of space to skip for the date label
- \def\beamer@torinoth@assistantsupervisortextf{false}%
- \ifx\beamer@torinoth@assistantsupervisor\beamer@torinoth@assistantsupervisortextf%
- \vskip1.5em%
- \else
- \vskip-1.35em%
- \fi
-
+ %\def\beamer@torinoth@assistantsupervisortextf{false}%
+ %\ifx\beamer@torinoth@assistantsupervisor\beamer@torinoth@assistantsupervisortextf%
+ %\vskip1.5em%
+ %\else
+ %\vskip-1.35em%
+ %\fi
+ \vfill
% Date
\begin{centering}
\begin{beamercolorbox}[sep=8pt,center,#1]{date}%
\usebeamerfont{date}\insertdate{}%
\end{beamercolorbox}%\vskip0.5em
- \end{centering}
+ \end{centering}
\vfill
}
@@ -353,12 +437,12 @@
% Advantages mode
\newenvironment{adv}%
-{\begin{list}{\color{\beamer@torinoth@color}{\ding{51}}}{}}%
+{\begin{list}{\color{alerted text.fg}{\ding{51}}}{}}%
{\end{list}}%
% Disadvantages mode
\newenvironment{disadv}%
-{\begin{list}{\color{\beamer@torinoth@color}{\ding{55}}}{}}%
+{\begin{list}{\color{alerted text.fg}{\ding{55}}}{}}%
{\end{list}}%
% Square mode
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
index b65c634e126..a1151a58ab5 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Copyright 2011 by Fiandrino Claudio
+% Copyright 2011-2012 by Fiandrino Claudio
%
% This file may be distributed and/or modified
%
@@ -47,7 +47,7 @@
\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]{frame number}%
+ \begin{beamercolorbox}[wd=.075\paperwidth,ht=.2ex,center,rounded=true,shadow=true]{frame number}%
\usebeamerfont{frame number}\insertframenumber{} \beamer@torinoth@pageofpages{} \inserttotalframenumber{}%
\end{beamercolorbox}%
} %
@@ -60,19 +60,19 @@
\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%
+ \usebeamerfont{footnote} \insertshorttitle \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%
+ \begin{beamercolorbox}[wd=.65\paperwidth,ht=\beamer@torinoth@box,sep=0.75pt,center,rounded=true,shadow=true]{footerbox}%
+ \usebeamerfont{footnote}\insertshorttitle \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%
+ \begin{beamercolorbox}[wd=.65\paperwidth,ht=\beamer@torinoth@box,sep=0.75pt,center,rounded=true,shadow=true]{footerbox}%
+ \usebeamerfont{footnote}\insertauthor{} \beamer@torinoth@separator{} \insertshorttitle \par%
\end{beamercolorbox}%
\fi%
\fi%
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
index b482e5f4823..878734d3be6 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Copyright 2011 by Fiandrino Claudio
+% Copyright 2011-2012 by Fiandrino Claudio
%
% This file may be distributed and/or modified
%
@@ -12,7 +12,7 @@
\mode<presentation>
% Options
-\DeclareOptionBeamer{language}{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{language}{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}\def\beamer@torinoth@language{#1}}
\DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemetorinoth}}
\DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemetorinoth}}
\DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemetorinoth}}
@@ -44,23 +44,46 @@
\RequirePackage[\beamer@torinoth@coding]{inputenc}%
\fi
+% Disable insertshorttitle link
+\renewcommand\insertshorttitle[1][]{%
+ \beamer@setupshort{#1}%
+ \let\thanks=\@gobble%
+ \beamer@insertshort{\beamer@shorttitle}%
+ }
+
% Language
+\def\beamer@torinoth@subject{}%
\def\beamer@torinoth@italiantext{italian}%
+\def\beamer@torinoth@englishtext{english}%
\ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
- \def\beamer@torinoth@subject{Presentazione Tesi di Laurea}%
+ \renewcommand\beamer@torinoth@subject{Presentazione Tesi di Laurea}%
\ifxetex
\setmainlanguage{italian}%
\else
\RequirePackage[italian]{babel}%
\fi
- \else%
- \def\beamer@torinoth@subject{Thesis Presentation}%
+ \fi%
+
+ \ifx\beamer@torinoth@language\beamer@torinoth@englishtext%
+ \renewcommand\beamer@torinoth@subject{Thesis Presentation}%
\ifxetex
\setmainlanguage[variant=british]{english}%
\else
\RequirePackage[english]{babel}%
- \fi
-\fi%
+ \fi%
+ \else%
+ \def\setsubject#1{\gdef\@setsubject{#1}}%
+ \def\@setsubject{\PackageError{Beamer2Thesis}%
+ {\protect\setsubject\space not given. Please insert it}%
+ {Example in english: \protect\setsubject{Thesis Presentation}}
+ }
+ \renewcommand\beamer@torinoth@subject{\@setsubject}%
+ \ifxetex
+ \setmainlanguage{\beamer@torinoth@language}%
+ \else
+ \RequirePackage[\beamer@torinoth@language]{babel}%
+ \fi%
+ \fi%
% General settings
\useinnertheme{torinoth}
@@ -82,17 +105,16 @@
}
% Highlight a single word
-\newcommand{\highlight}[1]{{\it{\color{\beamer@torinoth@color}{#1}}}}
-\newcommand{\highlightbf}[1]{{\bf\color{\beamer@torinoth@color}{#1}}}
+\newcommand{\highlight}[1]{{\it{\color{alerted text.fg}{#1}}}}
+\newcommand{\highlightbf}[1]{{\bf\color{alerted text.fg}{#1}}}
% Define hypersetup
\hypersetup{%
colorlinks=true,
hyperindex=true,
- pdfpagelabels,
plainpages=false,
- urlcolor=\beamer@torinoth@color,
- linkcolor=\beamer@torinoth@color,
+ urlcolor=alerted text.fg,
+ linkcolor=alerted text.fg,
pdfinfo={%
Title={\inserttitle},%
Author={\insertauthor},%