diff options
Diffstat (limited to 'Master')
15 files changed, 350 insertions, 138 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/README b/Master/texmf-dist/doc/latex/beamer2thesis/README index d553449dc1d..ab7fb2794d1 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/README +++ b/Master/texmf-dist/doc/latex/beamer2thesis/README @@ -1,11 +1,11 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Copyright 2011 Claudio Fiandrino +% Copyright 2011-2012 Claudio Fiandrino % -% Beamer2Thesis - 2.0 +% Beamer2Thesis - 2.2 % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Beamer2Thesis is a Beamer Theme to create presentation for a thesis: -it introduces specific commands. Guides are provided in english and -italian. +it introduces specific commands. Guides are provided, as presentations, +in english and italian. diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf Binary files differindex fd04d50f636..030361a3530 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf +++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex index e9962185a05..2b593e56ff5 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex @@ -1,10 +1,15 @@ \documentclass{beamer} \usetheme[titlepagelogo=logopolito,% Logo for the first page - ]{TorinoTh} + language=english + ]{TorinoTh} + +\usepackage[beamer,customcolors]{hf-tikz} +\hfsetfillcolor{alerted text.fg!10} +\hfsetbordercolor{alerted text.fg} \author{Claudio Fiandrino} \rel{Mario Rossi} -\title{Beamer2Thesis 2.1, thesis theme for Beamer } +\title{Beamer2Thesis 2.2, thesis theme for Beamer} \ateneo{Politecnico di Torino} \date{\today} @@ -54,5 +59,32 @@ If you want to highlight your text out of the enviroment \emph{itemize}, Beamer2 Of course, the color used, is set accordingly to your choice in the configuration phase. \end{frame} +\begin{frame}[fragile]{Highlighting formulas} +\begin{itemize} +\item The package \href{http://www.ctan.org/pkg/hf-tikz}{hf-tikz} allows to highlight formulas and formula parts in Beamer with overlay specifications +\item The adaptation of colors to the theme could be done in this way: +\begin{verbatim} +\usepackage[beamer,customcolors]{hf-tikz} +\hfsetfillcolor{alerted text.fg!10} +\hfsetbordercolor{alerted text.fg} +\end{verbatim} +\item \highlight{Two compilation runs} are required to get the right result! +\item Read the package documentation to find more options; an example will be provided in the next frame. +\end{itemize} +\end{frame} + +\begin{frame}[fragile]{Highlighting formulas (II)} +\begin{itemize} +\item Example: +\[\tikzmarkin<2->{a}x+\tikzmarkin<1>{b}y\tikzmarkend{b}=10\tikzmarkend{a}\] +\item<2-> Code: +\begin{verbatim} +\[\tikzmarkin<2->{a}x+ + \tikzmarkin<1>{b}y\tikzmarkend{b} + =10\tikzmarkend{a}\] +\end{verbatim} +\end{itemize} +\end{frame} + \input{content_end} -\end{document}
\ No newline at end of file +\end{document} diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf Binary files differindex c57755133c1..0fffb1a5684 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf +++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex index e20904099dc..4087b96e732 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex @@ -3,14 +3,17 @@ language=italian, bullet=triangle, color=green, - coding=utf8x ]{TorinoTh} + +\usepackage[beamer,customcolors]{hf-tikz} +\hfsetfillcolor{alerted text.fg!10} +\hfsetbordercolor{alerted text.fg} \author{Claudio Fiandrino} \rel{Mario Rossi} \title{Beamer2Thesis 2.1, thesis theme for Beamer} \ateneo{Politecnico di Torino} -\date{2 Novembre 2011} +\date{\today} \begin{document} \input{content_initial_ita.tex} @@ -54,5 +57,32 @@ Se volete evidenziare il vostro testo al di fuori dell'ambiente \emph{itemize}, Ovviamente, il colore utilizzato è quello da voi scelto nel preambolo. \end{frame} +\begin{frame}[fragile]{Evidenziare formule matematiche} +\begin{itemize} +\item Il pacchetto \href{http://www.ctan.org/pkg/hf-tikz}{hf-tikz} permette di evidenziare formule matematiche (completamente o in parte) in Beamer con animazioni semplici +\item Si possono adattare i colori del tema così: +\begin{verbatim} +\usepackage[beamer,customcolors]{hf-tikz} +\hfsetfillcolor{alerted text.fg!10} +\hfsetbordercolor{alerted text.fg} +\end{verbatim} +\item È necessario \highlight{compilare due volte} per ottenere il risultato voluto! +\item Si legga la documentazione del pacchetto per ulteriori opzioni; un esempio di utilizzo è riportato nella diapositiva successiva. +\end{itemize} +\end{frame} + +\begin{frame}[fragile]{Evidenziare formule matematiche (II)} +\begin{itemize} +\item Esempio: +\[\tikzmarkin<2->{a}x+\tikzmarkin<1>{b}y\tikzmarkend{b}=10\tikzmarkend{a}\] +\item<2-> Codice: +\begin{verbatim} +\[\tikzmarkin<2->{a}x+ + \tikzmarkin<1>{b}y\tikzmarkend{b} + =10\tikzmarkend{a}\] +\end{verbatim} +\end{itemize} +\end{frame} + \input{content_end_ita} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex index 881d07a03cf..c44b1a91705 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex @@ -56,14 +56,11 @@ text \begin{frame}[t,fragile]{Suggestions (III)} \begin{itemize} -\item From version 2.1, just when you use the option \highlight{language} italian, the command \verb!\today! does not work properly because the translation of the language is not automatic. Therefore, I suggest you to insert the date in a more \emph{traditional} way: -\begin{itemize} -\item \verb!\date{day Month year}! -\end{itemize} -For example: -\begin{itemize} -\item \verb!\date{2 November 2011}! -\end{itemize} +\item If the title does not fit in the footer box, it is possible to exploit the so called \highlight{shorttitle}; an example: +\begin{verbatim} +\title[short title]{Long title of the thesis} +\end{verbatim} +In this way the long title is just placed in the titlepage. \item In case there are more than two supervisors or assistansupervisors, I suggest you to insert them through commands reported in \ref{secondrel} and separate names thanks to a comma. \end{itemize} \end{frame} @@ -86,11 +83,15 @@ Here are shortly reported the main features of the releases: \end{itemize} \item release 2.0: \begin{itemize} -\item third logo, assistant supervisor, new ways to highlight, new command for the titlepage, new enviroments \emph{adv} and \emph{disadv}, \XeTeX\, and \XeLaTeX\, support, block; +\item third logo, assistant supervisor, new ways to highlight, new command for the titlepage, new enviroments \emph{adv} and \emph{disadv}, \XeTeX\, and \XeLaTeX\, support, blocks; \end{itemize} \item release 2.1: \begin{itemize} -\item coding option, second supervisor, second assistantsupervisor. +\item coding option, second supervisor, second assistantsupervisor; +\end{itemize} +\item release 2.2: +\begin{itemize} +\item language, short title, highlighting formulas. \end{itemize} \end{itemize} \end{tframe} diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex index 3008f4de23e..82b9b113f7d 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex @@ -56,14 +56,11 @@ text \begin{frame}[t,fragile]{Suggerimenti (III)} \begin{itemize} -\item Dalla versione 2.1, soltanto utilizzando l'opzione \highlight{language} italian, il comando \verb!\today! non funziona correttamente in quanto non viene tradotto automaticamente. Si consiglia pertando di inserire la data in modo \emph{tradizionale} con: -\begin{itemize} -\item \verb!\date{giorno Mese anno}! -\end{itemize} -Ad esempio: -\begin{itemize} -\item \verb!\date{2 Novembre 2011}! -\end{itemize} +\item Se il titolo è troppo lungo rischia di non essere perfettamente inserito a fondo diapositiva, perciò si può utilizzare il \highlight{titolo corto}; ad esempio: +\begin{verbatim} +\title[Titolo corto]{Titolo lungo} +\end{verbatim} +In questo modo il titolo lungo viene soltanto inserito nel frontespizio. \item In caso si abbiano più di due relatori o correlatori, suggerisco di inserirli con i comandi riportati in slide \ref{secondrel} separati da una virgola. \end{itemize} \end{frame} @@ -92,6 +89,10 @@ Di seguito sono riportate le principali caratteristiche delle versioni: \begin{itemize} \item opzione sulla codifica, secondo relatore, secondo correlatore. \end{itemize} +\item versione 2.2: +\begin{itemize} +\item supporto per più lingue, titolo corto, suggerimento per evidenziare formule matematiche. +\end{itemize} \end{itemize} \end{tframe} diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex index e2805bfc31a..ac387f3a373 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex @@ -55,6 +55,11 @@ As an alternative, Beamer2Thesis can be downloaded from my personal page as a zi \begin{itemize} \item \href{http://claudiofiandrino.altervista.org/latex\_projects.html}{http://claudiofiandrino.altervista.org/latex\_projects.html} \end{itemize} +or in the official page: +\begin{itemize} +\item \href{http://cfiandra.github.com/Beamer2Thesis/}{http://cfiandra.github.com/Beamer2Thesis/} +\end{itemize} + It can be installed with the standard procedure used to install a common package: I suggest you to read a short guide I have written \begin{itemize} \item \href{http://claudiofiandrino.altervista.org/LaTeX/package_installation.pdf}{download the guide here} @@ -164,16 +169,31 @@ There are several ways to do it (for people highly capable in \LaTeX\, this is n \begin{frame}[t,fragile]{Languages} \begin{itemize} -\item There are two languages avaiable: +\item All languages can be supported, but the two main ones are: \begin{itemize} -\item english (default) +\item english \item italian \end{itemize} -\item The choice of the language implies that in the titlepage, date and labels (Supervisor, Candidate, Relatore, Candidato) are shown with the proper language in an automatic way -\item To set the italian language, use in the configuration phase: -\verb!language=italian! +\item The choice of one of the main languages implies that in the titlepage, date and labels (Supervisor, Candidate, Relatore, Candidato) are shown with the proper language in an automatic way +\item To set the italian language, for example, use in the configuration phase: +\verb!language=italian!; the name should be the one used by the package babel or by \verb!\setmainfont! with \XeLaTeX +\item If the language selected is not one of the two main languages, then labels in the titlepage should be introduced by the user (see the example in the next frame) +\end{itemize} +\end{frame} + +\begin{frame}[t,fragile]{Languages (II)} +\begin{itemize} +\item Example with spanish language: +\begin{verbatim} +\usetheme[language=spanish,...]{TorinoTh} +\setrellabel{Relator Tesis} +\setcandidatelabel{Candidato} +\setassistentsupervisorlabel{Co Tesis} +\setsubject{Tesis} +\end{verbatim} +\item Commands illustrated are mandatory when \highlight{not using} a main language \item If you have already set a language and you change, it may happen that, the first time you compile, this error occurs: \begin{flushleft} -\highlight{! Package babel Error: You haven't loaded the option english/italian yet} +\highlight{! Package babel Error: You haven't loaded the option -language- yet} \end{flushleft} do not be afraid and compile a second time: it will work!! \end{itemize} @@ -387,4 +407,4 @@ More in general, Beamer provide three \emph{block} environments: \item \highlight{exampleblock} \end{itemize} To have more details, not only on this argument, I suggest to read the \href{http://mirrors.ctan.org/macros/latex/contrib/beamer/doc/beameruserguide.pdf}{beameruserguide}. -\end{frame}
\ No newline at end of file +\end{frame} diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex index dcd6856b941..926bcd80067 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex +++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex @@ -54,6 +54,11 @@ In alternativa, Beamer2Thesis può essere scaricato dalla mia pagina personale c \begin{itemize} \item \href{http://claudiofiandrino.altervista.org/latex\_projects.html}{http://claudiofiandrino.altervista.org/latex\_projects.html} \end{itemize} +o dalla pagina ufficiale: +\begin{itemize} +\item \href{http://cfiandra.github.com/Beamer2Thesis/}{http://cfiandra.github.com/Beamer2Thesis/} +\end{itemize} + Ovviamente deve essere installato seguendo la procedura standard di installazione manuale di un pacchetto: suggerisco, ancora di leggere la guida di Enrico Gregorio \end{tframe} @@ -151,16 +156,32 @@ Ci sono diversi modi per inserire il vostro logo (per persone molto esperte in \ \begin{frame}[t,fragile]{Lingue} \begin{itemize} -\item Sono disponibili due lingue: +\item Tutte le lingue sono disponibili, ma le due principali sono: \begin{itemize} -\item inglese (default) +\item inglese \item italiano \end{itemize} -\item La scelta delle lingue implica che, nella pagina iniziale, date e label (Supervisor, Candidate, Relatore, Candidato) siano riportate esattamente in modo automatico -\item Per selezionare la lingua italiana, usate nel preambolo: +\item La scelta di una delle due lingue principali implica che, nella pagina iniziale, date e label (Supervisor, Candidate, Relatore, Candidato) siano riportate esattamente in modo automatico +\item Per selezionare la lingua italiana, ad esempio, usate nel preambolo: \verb!language=italian! +il nome deve essere quello utilizzato dal pacchetto babel or dal comando \verb!\setmainfont! con \XeLaTeX +\item Se la lingua selezionata non è una delle due principali, occorre ridefinire manualmente le label del frontespizio (si riporta un esempio nella diapositiva successiva) +\end{itemize} +\end{frame} + +\begin{frame}[t,fragile]{Lingue (II)} +\begin{itemize} +\item Un esempio con la lingua spagnola: +\begin{verbatim} +\usetheme[language=spanish,...]{TorinoTh} +\setrellabel{Relator Tesis} +\setcandidatelabel{Candidato} +\setassistentsupervisorlabel{Co Tesis} +\setsubject{Tesis} +\end{verbatim} +\item I comandi illustrati sono obbligatori quando \highlight{non si utilizza} una delle due lingue principali \item Se avete scelto una lingua e volete cambiarla, può succedere che, la prima compilazione dia questo errore: \begin{flushleft} -\highlight{! Package babel Error: You haven't loaded the option english/italian yet} +\highlight{! Package babel Error: You haven't loaded the option -lingua- yet} \end{flushleft} non spaventatevi e compilate nuovamente: funzionerà! \end{itemize} diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/license b/Master/texmf-dist/doc/latex/beamer2thesis/license index e1e4d0efefb..a5e7ac8e25a 100644 --- a/Master/texmf-dist/doc/latex/beamer2thesis/license +++ b/Master/texmf-dist/doc/latex/beamer2thesis/license @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Copyright 2011 Claudio Fiandrino +% Copyright 2011-2012 Claudio Fiandrino % % Beamer2Thesis % 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},% |