diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamer.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamer.cls | 159 |
1 files changed, 66 insertions, 93 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index 70103e4be72..67bda75f936 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls @@ -1,4 +1,5 @@ -% Copyright 2007 by Till Tantau +% Copyright 2003--2007 by Till Tantau +% Copyright 2010 by Vedran Mileti\'c % % This file may be distributed and/or modified % @@ -8,10 +9,8 @@ % See the file doc/licenses/LICENSE for more details. \RequirePackage{beamerbasercs} -\def\beamer@version{3.07} - -\ProvidesClassRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamer.cls,v 1.70 2007/03/11 18:50:44 tantau Exp $ -[cvs version \beamer@version\space A class for typesetting presentations] +\ProvidesClassRCS $Header: /home/vedran/bitbucket/beamer/base/beamer.cls,v bff0a9294b45 2010/06/06 13:23:19 rivanvx $ +[development version \beamer@version\space A class for typesetting presentations] \RequirePackage{beamerbasemodes} @@ -157,6 +156,7 @@ \DeclareOptionBeamer{20pt}{\def\beamer@size{{size20.clo}}} \DeclareOptionBeamer{draft}{\beamer@draftmodetrue} +\pagenumbering{arabic} \def\insertpagenumber{\thepage} \def\beamer@activecjk{} @@ -167,7 +167,7 @@ \def\beamer@hypercjk{\hypersetup{CJKbookmarks=true}} \def\beamer@activecjk{ - % Activate all >=128 characters. + % Activate all >=128 characters. \count@=127 \@whilenum\count@<254 \do{% \advance\count@ by 1 @@ -175,7 +175,7 @@ \catcode\count@=\active \lowercase{\def~{\kern1ex}} } - } + } } @@ -231,7 +231,7 @@ \ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead} \beamer@centeredfalse} \DeclareOptionBeamer{sans}{% - \ClassWarning{beamer}{``sans'' is obsolete. Just remove this option} + \ClassWarning{beamer}{``sans'' is obsolete. Just remove this option} \def\familydefault{\sfdefault} \def\mathfamilydefault{\sfdefault} \beamer@sansmathtrue @@ -243,10 +243,10 @@ \beamer@sansmathfalse } \DeclareOptionBeamer{mathsans}{ - \ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``butsansserifmath''} + \ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``butsansserifmath''} \def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue} \DeclareOptionBeamer{mathserif}{ - \ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''} + \ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''} \def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse} \DeclareOptionBeamer{professionalfont}{ \ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead} @@ -264,7 +264,7 @@ pdfborder={0 0 0},% pdfhighlight={/N},% linkbordercolor={.5 .5 .5}}{hyperref} - + \DeclareOptionBeamer{pgf}{\PassOptionsToPackage{#1}{pgf}} \DeclareOptionBeamer{hyperref}{\PassOptionsToPackage{#1}{hyperref}} \DeclareOptionBeamer{color}{\PassOptionsToPackage{#1}{color}} @@ -288,17 +288,66 @@ } \fi } -\DeclareOptionBeamer{utf8}{\ExecuteOptionsBeamer{ucs}% - \g@addto@macro\beamer@loaducs{\RequirePackage[utf8]{inputenc}}% +\DeclareOptionBeamer{utf8x}{\ExecuteOptionsBeamer{ucs}% + \g@addto@macro\beamer@loaducs{\RequirePackage[utf8x]{inputenc}}% +} +\DeclareOptionBeamer{utf8}{ + \ClassWarning{beamer}{This option works no longer loads ucs.} + \RequirePackage[utf8]{inputenc} + \PassOptionsToPackage{unicode}{hyperref} } % +% Geometry: allows 16:10, 16:9, 14:9, 5:4 and 4:3 (default 4:3). +% Default value is set right after declaring width and height +% because it doesn't work otherwise. +% +\newlength\beamer@paperwidth% +\beamer@paperwidth 12.80cm% +\newlength\beamer@paperheight% +\beamer@paperheight 9.60cm% + +\DeclareOptionBeamer{aspectratio}[43]{% + \ifnum#1=1610% + \beamer@paperwidth 16.00cm% + \beamer@paperheight 10.00cm% + \else\ifnum#1=169% + \beamer@paperwidth 16.00cm% + \beamer@paperheight 9.00cm% + \else\ifnum#1=149% + \beamer@paperwidth 14.00cm% + \beamer@paperheight 9.00cm% + \else\ifnum#1=54% + \beamer@paperwidth 12.50cm% + \beamer@paperheight 10.00cm% + \else\ifnum#1=43% + \beamer@paperwidth 12.80cm% + \beamer@paperheight 9.60cm% + \else\ifnum#1=32% + \beamer@paperwidth 13.50cm% + \beamer@paperheight 9.00cm% + \fi\fi\fi\fi\fi\fi% +} + +\RequirePackage[% + papersize={\beamer@paperwidth,\beamer@paperheight}, + hmargin=1cm,% + vmargin=0cm,% + head=0.5cm,% might be changed later + headsep=0pt,% + foot=0.5cm% might be changed later + ]{geometry} + +% % Process Options % \ExecuteOptionsBeamer{c} \ProcessOptionsBeamer +% Load corresponding size file +\expandafter\input\beamer@size + % Filter class option list \beamer@filterclassoptions @@ -307,20 +356,7 @@ % We need only the core and some image stuff for icons. \RequirePackage{xxcolor} -% For color management. - -\RequirePackage{amssymb} -% For \blacktriangleright - -\RequirePackage[% - papersize={12.80cm,9.60cm}, - hmargin=1cm,% - vmargin=0cm,% - head=0.5cm,% will be changed later - headsep=0pt,% - foot=0.5cm% will be changed later - ]{geometry} -% For the page layout +% For color management (comes with pgf). \RequirePackage[implicit=false]{hyperref} % For hyperlinks @@ -331,15 +367,9 @@ \beamer@loaducs \beamer@hypercjk -\expandafter\input\beamer@size -\geometry{headsep=0pt} - - -\RequirePackage{beamerbasecompatibility} -% Fixes other packages -\RequirePackage{beamerbasefont} -% Font stuff +\RequirePackage{beamerbaserequires} +% Beamer packages required both by presentation and article modes % Defaults \normalfont @@ -351,64 +381,7 @@ \addtocontents{nav}{\protect\beamer@endinputifotherversion{\beamer@version pt}} } -\RequirePackage{beamerbasemisc} -% Miscellaneous commands - -\RequirePackage{beamerbasetwoscreens} -% Stuff for using two screens - -\RequirePackage{beamerbaseoverlay} -% Overlay stuff - -\RequirePackage{beamerbasetitle} -% Commands for constructing the title page - -\RequirePackage{beamerbasesection} -% Parts, sections, subsections, appendix - -\RequirePackage{beamerbaseframe} -% Commands for constructing frames - -\RequirePackage{beamerbaseverbatim} -% Commands for constructing frames - -\RequirePackage{beamerbaseframesize} -% Commands for constructing frames - -\RequirePackage{beamerbaseframecomponents} -% Headlines, sidebars, columns - -\RequirePackage{beamerbasecolor} -% Color management - -\RequirePackage{beamerbasenotes} -% Commands for adding notes - -\RequirePackage{beamerbasetoc} -% Table of Contents Format - -\RequirePackage{beamerbasetemplates} -% For default templates - -\RequirePackage{beamerbaselocalstructure} -% Commands for local structure like alert, itemize, etc. - -\RequirePackage{beamerbasenavigation} -% Navigation buttons - -\RequirePackage{beamerbasetheorems} -% Theorems - -\RequirePackage{beamerbasethemes} -% Commands for including and building themes - \usetheme{default} -% Compatibility stuff: +% Compatibility stuff \csname beamer@loadlater\endcsname - - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex" -%%% End: |