From 92c1851e699624bcecc2806d8055711303d9ccae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Oct 2011 23:17:41 +0000 Subject: beamer2thesis (7oct11) git-svn-id: svn://tug.org/texlive/trunk@24238 c570f23f-e606-0410-a88d-b1316a301751 --- .../beamer2thesis/beamerinnerthemetorinoth.sty | 18 ++++++++++++++++ .../beamer2thesis/beamerouterthemetorinoth.sty | 12 ++--------- .../latex/beamer2thesis/beamerthemeTorinoTh.sty | 24 +--------------------- 3 files changed, 21 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex/latex/beamer2thesis') diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty index 541a491750e..0fca505c11f 100644 --- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty +++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty @@ -41,6 +41,24 @@ \ProcessOptionsBeamer +% Language +\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% + % Definition of second logo if request \def\beamer@torinoth@secondlogotext{true}% \ifx\beamer@torinoth@secondlogo\beamer@torinoth@secondlogotext% diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty index 1c6af1ce283..b65c634e126 100644 --- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty +++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerouterthemetorinoth.sty @@ -32,15 +32,7 @@ \newlength{\beamer@torinoth@line} \setlength{\beamer@torinoth@line}{.03\paperheight} \newlength{\beamer@torinoth@box} -\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 +\setlength{\beamer@torinoth@box}{.015\paperheight} % Footer \defbeamertemplate*{footline}{torinoth theme} @@ -64,7 +56,7 @@ \def\beamer@torinoth@separator{-}% % Check if there are two candidates \def\beamer@torinoth@secondcandtext{true}% - \ifx\beamer@torinoth@secondcandidateoption\beamer@torinoth@secondcandtext% + \ifx\beamer@torinoth@secondcandidate\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}% diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty index ee3e3e589a7..5646ed98df2 100644 --- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty +++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty @@ -14,7 +14,6 @@ % Packages \RequirePackage{ifxetex}% \RequirePackage{pifont}% - \RequirePackage{calc,ifthen}% \ifxetex \RequirePackage{fontspec}% \defaultfontfeatures{Mapping=tex-text}% @@ -27,29 +26,8 @@ \RequirePackage[utf8x]{inputenc}% \fi - -% 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{language}{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemetorinoth}} \DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemetorinoth}} -- cgit v1.2.3