summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer2thesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-28 23:42:33 +0000
committerKarl Berry <karl@freefriends.org>2011-10-28 23:42:33 +0000
commit245a543c69cd4f9fd8a39137053f554738fa5941 (patch)
tree0712ab03207db66d94548b2f90517c4f3a484ceb /Master/texmf-dist/tex/latex/beamer2thesis
parentcbacacfcd4827d9cad12656a2b37666975770269 (diff)
beamer2thesis (28oct11)
git-svn-id: svn://tug.org/texlive/trunk@24429 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer2thesis')
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty18
-rw-r--r--Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty48
2 files changed, 34 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
index 0fca505c11f..541a491750e 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
@@ -41,24 +41,6 @@
\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/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
index 5646ed98df2..c315209adda 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
@@ -11,6 +11,22 @@
\mode<presentation>
+% 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}}
+\DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}}
+\DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{coding}{\def\beamer@torinoth@coding{#1}}
+\ExecuteOptionsBeamer{coding=utf8x}
+\ProcessOptionsBeamer
+
% Packages
\RequirePackage{ifxetex}%
\RequirePackage{pifont}%
@@ -23,22 +39,26 @@
\RequirePackage{xkeyval}%
\RequirePackage{polyglossia}%
\else
- \RequirePackage[utf8x]{inputenc}%
+ \RequirePackage[\beamer@torinoth@coding]{inputenc}%
\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}}
-\DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
-\DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}}
-\DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}}
-\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%
% General settings
\useinnertheme{torinoth}