From e0b537dc2d01c232e33d914e5819fef66ed769a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Nov 2011 23:18:27 +0000 Subject: beamer2thesis (3nov11) git-svn-id: svn://tug.org/texlive/trunk@24496 c570f23f-e606-0410-a88d-b1316a301751 --- .../beamer2thesis/beamerinnerthemetorinoth.sty | 265 +++++++++++++++------ .../latex/beamer2thesis/beamerthemeTorinoTh.sty | 2 + 2 files changed, 189 insertions(+), 78 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty index 541a491750e..c62d76ea27d 100644 --- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty +++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty @@ -31,10 +31,18 @@ \DeclareOptionBeamer{secondcandidate}[true]{\def\beamer@torinoth@secondcandidate{#1}} \ExecuteOptionsBeamer{secondcandidate=false} +% Second supervisor +\DeclareOptionBeamer{secondsupervisor}[true]{\def\beamer@torinoth@secondsupervisor{#1}} +\ExecuteOptionsBeamer{secondsupervisor=false} + % Assistant supervisor \DeclareOptionBeamer{assistantsupervisor}[true]{\def\beamer@torinoth@assistantsupervisor{#1}} \ExecuteOptionsBeamer{assistantsupervisor=false} +% Second assistant supervisor +\DeclareOptionBeamer{secondassistantsupervisor}[true]{\def\beamer@torinoth@secondassistantsupervisor{#1}} +\ExecuteOptionsBeamer{secondassistantsupervisor=false} + % Bullet shape \DeclareOptionBeamer{bullet}{\def\beamer@torinoth@bullet{#1}} \ExecuteOptionsBeamer{bullet=circle} @@ -61,6 +69,12 @@ % Supervisor \def\rel#1{\gdef\@rel{#1}} +% Second supervisor + \def\beamer@torinoth@secondsuptext{true}% + \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext% + \def\secondsupervisor#1{\gdef\@secondsupervisor{#1}}% + \fi + % Second candidate \def\beamer@torinoth@secondcandtext{true}% \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext% @@ -71,6 +85,11 @@ \def\beamer@torinoth@assistantsupervisortext{true}% \ifx\beamer@torinoth@assistantsupervisortext\beamer@torinoth@assistantsupervisor% \def\assistantsupervisor#1{\gdef\@assistantsupervisor{#1}}% + % Second assistant supervisor + \def\beamer@torinoth@secondassistantsuptext{true}% + \ifx\beamer@torinoth@secondassistantsupervisor\beamer@torinoth@secondassistantsuptext% + \def\secondassistantsupervisor#1{\gdef\@secondassistantsupervisor{#1}}% + \fi \fi % Margins @@ -136,105 +155,195 @@ \usebeamerfont{title}\inserttitle\par% \end{beamercolorbox}% \end{centering} - \vskip0.5em\par% + + \vskip0.75em\par% % definitions \def\beamer@torinoth@italiantext{italian}% \begin{columns} +%%%%%%%%%%%%%%%%%%% % First column \column{.5\paperwidth}% - % Supervisor-language-check - \ifx\beamer@torinoth@language\beamer@torinoth@italiantext% - \def\beamer@torinoth@superv{Relatore}% - \else% - \def\beamer@torinoth@superv{Supervisor}% - \fi% - % Assistant-supervisor-language-check - \ifx\beamer@torinoth@language\beamer@torinoth@italiantext% - \def\beamer@torinoth@assistantsupervisorlabel{Correlatore}% + % 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} + \usebeamerfont{definition}\beamer@torinoth@superv% + \end{beamercolorbox} + \vskip-0.25em% + \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vskip-0.25em% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@secondsupervisor% + \end{beamercolorbox} + \vspace{\stretch{0.6}}% + \else + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vspace{\stretch{0.6}}% + \fi + \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel} + \usebeamerfont{definition}\beamer@torinoth@assistantsupervisorlabel% + \end{beamercolorbox} + \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}% + \usebeamerfont{person}\@secondassistantsupervisor% + \end{beamercolorbox} + \vskip-1.75em% + \else% + \vspace{\stretch{0.6}}% + \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel} + \usebeamerfont{definition}\beamer@torinoth@superv% + \end{beamercolorbox} + \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vskip-0.25em% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@secondsupervisor% + \end{beamercolorbox} + \vspace{\stretch{0.6}}% + \else% + + \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vspace{\stretch{0.6}}% + \fi + \begin{beamercolorbox}[ht=0.07\paperheight,sep=8pt,center,#1]{rel} + \usebeamerfont{definition}\beamer@torinoth@assistantsupervisorlabel% + \end{beamercolorbox} + \begin{beamercolorbox}[ht=0.06\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@assistantsupervisor% + \end{beamercolorbox} + %\vskip-2em% + \fi% \else% - \def\beamer@torinoth@assistantsupervisorlabel{Assistant Supervisor}% + \vspace{\stretch{0.25}}% + \begin{beamercolorbox}[ht=0.075\paperheight,sep=8pt,center,#1]{rel} + \usebeamerfont{definition}\beamer@torinoth@superv% + \end{beamercolorbox} + + \ifx\beamer@torinoth@secondsupervisor\beamer@torinoth@secondsuptext% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vspace{\stretch{0.5}}% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@secondsupervisor% + \end{beamercolorbox} + \vspace{\stretch{0.75}}% + \else% + \begin{beamercolorbox}[ht=0.065\paperheight,sep=8pt,center,#1]{rel}% + \usebeamerfont{person}\@rel% + \end{beamercolorbox} + \vspace{\stretch{1}}% + \fi% \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}% + % 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% - \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} - \vskip-0.5em% - % First-candidate - \begin{beamercolorbox}[sep=8pt,center,#1]{author} - \usebeamerfont{person}\insertauthor% - \end{beamercolorbox} - \vskip-0.5em% - % Second-candidate - \begin{beamercolorbox}[sep=8pt,center,#1]{author} - \usebeamerfont{person}\@secondcandidate% - \end{beamercolorbox} - \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 + \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% + \ifx\beamer@torinoth@secondcandidate\beamer@torinoth@secondcandtext% + \begin{beamercolorbox}[ht=0.075\paperheight,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} + \vskip-0.5em% + % Second-candidate + \begin{beamercolorbox}[sep=8pt,center,#1]{author} + \usebeamerfont{person}\@secondcandidate% + \end{beamercolorbox} + \else% + \begin{beamercolorbox}[ht=0.075\paperheight,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} + % 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 % Date \begin{centering} \begin{beamercolorbox}[sep=8pt,center,#1]{date}% - \usebeamerfont{date}\insertdate% + \usebeamerfont{date}\insertdate{}% \end{beamercolorbox}%\vskip0.5em \end{centering} \vfill diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty index c315209adda..b482e5f4823 100644 --- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty +++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty @@ -19,9 +19,11 @@ \DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}} \DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}} \DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}} +\DeclareOptionBeamer{secondsupervisor}[true]{\PassOptionsToPackage{secondsupervisor=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}} +\DeclareOptionBeamer{secondassistantsupervisor}[true]{\PassOptionsToPackage{secondassistantsupervisor=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}} \DeclareOptionBeamer{coding}{\def\beamer@torinoth@coding{#1}} \ExecuteOptionsBeamer{coding=utf8x} -- cgit v1.2.3