summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/beamer.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamer.cls')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls19
1 files changed, 8 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index 298292983b3..05b46102215 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamer.cls
+++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2011 by Vedran Mileti\'c, Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -9,7 +10,7 @@
% See the file doc/licenses/LICENSE for more details.
\RequirePackage{beamerbasercs}
-\ProvidesClassRCS $Header: /home/vedranm/bitbucket/beamer/base/beamer.cls,v a6b1a8434d30 2010/06/21 09:34:49 rivanvx $
+\ProvidesClassRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamer.cls,v 70f9d8411e54 2011/09/12 18:58:34 joseph $
[development version \beamer@version\space A class for typesetting presentations]
@@ -18,11 +19,7 @@
\beamer@transferifnecessary
-%
-% Ensure that \pdfoutput is defined. Might be removed at some point.
-%
-\ifx\pdfoutput\@undefined \newcount\pdfoutput \fi
-\ifx\pdfoutput\relax \newcount\pdfoutput \fi
+\RequirePackage{ifpdf}
%
%
@@ -273,16 +270,16 @@
\def\beamer@loaducs{}
\DeclareOptionBeamer{ucs}{%
- \ifcase\pdfoutput
+ \ifpdf
+ \PassOptionsToPackage{pdftex,unicode}{hyperref}
\def\beamer@loaducs{
- \RequirePackage{ucs}%
+ \RequirePackage[hyperref]{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
}
- \or
- \PassOptionsToPackage{pdftex,unicode}{hyperref}
+ \else
\def\beamer@loaducs{
- \RequirePackage[hyperref]{ucs}%
+ \RequirePackage{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
}