diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-14 22:16:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-14 22:16:30 +0000 |
commit | 46e95f178cfedc9839460ee35880698050f7644a (patch) | |
tree | 730f540a21d7047a243e929c74e4158674675814 /Master/texmf-dist/tex/latex/beamer/beamer.cls | |
parent | 44af1a53bf28c922f525bd635c417b22f3b99b39 (diff) |
beamer (14jul17)
git-svn-id: svn://tug.org/texlive/trunk@44798 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamer.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamer.cls | 141 |
1 files changed, 60 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index 4621408264e..e9b4e209fe5 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 Joseph Wright +% Copyright 2016,2017 by Joseph Wright % % This file may be distributed and/or modified % @@ -11,16 +11,13 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesClass{beamer} - [2017/01/23 v3.41 A class for typesetting presentations] + [2017/07/13 v3.42 A class for typesetting presentations] -% Force e-TeX -\RequirePackage{etoolbox} - -\RequirePackage{beamerbasemodes} % Setup modes and check for article option +% Also loads packages required by both beamer and beamerarticle +\RequirePackage{beamerbasemodes} -\beamer@transferifnecessary - +% For testing PDF versus DVI mode \RequirePackage{ifpdf} % @@ -30,7 +27,6 @@ % % Public -\newdimen\headheight % Total height of the headline (including depth) \newdimen\headdp % Depth of the headline \newdimen\footheight % Height of the footline \newdimen\sidebarheight % Height of the sidebars @@ -78,7 +74,6 @@ \newcount\beamer@sectionadjust \newcount\beamer@tocsectionnumber - \newif\ifbeamer@sansmath \newif\ifbeamer@altmode \newif\ifbeamer@notes @@ -91,10 +86,8 @@ \newif\ifbeamer@ignorenonframe \newif\ifbeamer@autopdfinfo +% Option management \RequirePackage{beamerbaseoptions} -% For option management - - % % @@ -122,7 +115,6 @@ \DeclareOptionBeamer{t}{\beamer@centeredfalse} \DeclareOptionBeamer{c}{\beamer@centeredtrue} - \DeclareOptionBeamer{leqno}{\input{leqno.clo}} \DeclareOptionBeamer{fleqn}{\input{fleqn.clo}} @@ -164,22 +156,16 @@ \def\beamer@hypercjk{} \DeclareOptionBeamer{CJK}{\ExecuteOptionsBeamer{cjk}} -\DeclareOptionBeamer{cjk}{ +\DeclareOptionBeamer{cjk}{% \def\beamer@hypercjk{\hypersetup{CJKbookmarks=true}} - - \def\beamer@activecjk{ + \def\beamer@activecjk{% % Activate all >=128 characters. - \count@=127 + \count@=127 % \@whilenum\count@<254 \do{% - \advance\count@ by 1 + \advance\count@ by 1 % \lccode`\~=\count@ \catcode\count@=\active - \lowercase{\def~{\kern1ex}} - } - } -} - - + \lowercase{\def~{\kern1ex}}}}} % obsolete options \DeclareOptionBeamer{notes}[show]{\csname beamer@notesaction@#1\endcsname} @@ -199,36 +185,36 @@ \nofiles } \def\beamer@notesaction@onlyslideswithnotes{% - \beamer@notestrue% - \beamer@frameswithnotesonlytrue% + \beamer@notestrue + \beamer@frameswithnotesonlytrue \nofiles } -\DeclareOptionBeamer{inrow}{ +\DeclareOptionBeamer{inrow}{% \ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}} \DeclareOptionBeamer{compressnotes}{% \ClassWarning{beamer}{``compressnotes'' is obsolete. Use \noexpand\setbeamertemplate{note page}[compressed] instead} \AtBeginDocument{\beamertemplatenotecompress}} -\DeclareOptionBeamer{notesonly}{ +\DeclareOptionBeamer{notesonly}{% \ClassWarning{beamer}{``notesonly'' is obsolete. Use beamer option ``show only notes'' instead.} \beamer@notesaction@only} -\DeclareOptionBeamer{blue}{ +\DeclareOptionBeamer{blue}{% \ClassWarning{beamer}{``blue'' is obsolete. Use color theme structure instead} \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.7}]{structure}}} -\DeclareOptionBeamer{red}{ +\DeclareOptionBeamer{red}{% \ClassWarning{beamer}{``red'' is obsolete. Use color theme structure instead} \def\beamer@loadlater{\usecolortheme[rgb={0.7,0.2,0.2}]{structure}}} -\DeclareOptionBeamer{blackandwhite}{ +\DeclareOptionBeamer{blackandwhite}{% \ClassWarning{beamer}{``blackandwhite'' is obsolete. Use color theme structure instead} \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.2}]{structure}}} -\DeclareOptionBeamer{brown}{ +\DeclareOptionBeamer{brown}{% \ClassWarning{beamer}{``brown'' is obsolete. Use color theme structure instead} \def\beamer@loadlater{\usecolortheme[rgb={0.66,0.4,0.166}]{structure}}} -\DeclareOptionBeamer{slidescentered}{ +\DeclareOptionBeamer{slidescentered}{% \ClassWarning{beamer}{``slidescentered'' is obsolete. Use ``c'' instead} \beamer@centeredtrue} -\DeclareOptionBeamer{slidestop}{ +\DeclareOptionBeamer{slidestop}{% \ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead} \beamer@centeredfalse} \DeclareOptionBeamer{sans}{% @@ -243,13 +229,13 @@ \def\mathfamilydefault{\rmdefault} \beamer@sansmathfalse } -\DeclareOptionBeamer{mathsans}{ +\DeclareOptionBeamer{mathsans}{% \ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``stillsansserifmath''} \def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue} -\DeclareOptionBeamer{mathserif}{ +\DeclareOptionBeamer{mathserif}{% \ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''} \def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse} -\DeclareOptionBeamer{professionalfont}{ +\DeclareOptionBeamer{professionalfont}{% \ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead} \beamer@suppressreplacementstrue} @@ -258,8 +244,6 @@ \def\mathfamilydefault{\sfdefault} \beamer@sansmathtrue - - \PassOptionsToPackage{bookmarks=true,% bookmarksopen=true,% pdfborder={0 0 0},% @@ -276,13 +260,13 @@ \DeclareOptionBeamer{ucs}{% \ifpdf \PassOptionsToPackage{pdftex,unicode}{hyperref} - \def\beamer@loaducs{ + \def\beamer@loaducs{% \RequirePackage[hyperref]{ucs}% \AtBeginDocument{\PreloadUnicodePage{0}}% \AtBeginDocument{\PreloadUnicodePage{1}}% } \else - \def\beamer@loaducs{ + \def\beamer@loaducs{% \RequirePackage{ucs}% \AtBeginDocument{\PreloadUnicodePage{0}}% \AtBeginDocument{\PreloadUnicodePage{1}}% @@ -292,10 +276,10 @@ \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} +\DeclareOptionBeamer{utf8}{% + \ClassWarning{beamer}{This option works no longer loads ucs.}% + \RequirePackage[utf8]{inputenc}% + \PassOptionsToPackage{unicode}{hyperref}% } % @@ -303,34 +287,34 @@ % 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% +\newlength\beamer@paperwidth +\setlength\beamer@paperwidth{12.80cm} +\newlength\beamer@paperheight +\setlength\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% - \else\ifnum#1=141% - \beamer@paperwidth 14.85cm% - \beamer@paperheight10.50cm% - \fi\fi\fi\fi\fi\fi\fi% + \ifnum#1=1610 % + \setlength\beamer@paperwidth{16.00cm}% + \setlength\beamer@paperheight{10.00cm}% + \else\ifnum#1=169 % + \setlength\beamer@paperwidth{16.00cm}% + \setlength\beamer@paperheight{9.00cm}% + \else\ifnum#1=149 % + \setlength\beamer@paperwidth{14.00cm}% + \setlength\beamer@paperheight{9.00cm}% + \else\ifnum#1=54 % + \setlength\beamer@paperwidth{12.50cm}% + \setlength\beamer@paperheight{10.00cm}% + \else\ifnum#1=43 % + \setlength\beamer@paperwidth{12.80cm}% + \setlength\beamer@paperheight{9.60cm}% + \else\ifnum#1=32 % + \setlength\beamer@paperwidth{13.50cm}% + \setlength\beamer@paperheight{9.00cm}% + \else\ifnum#1=141 % + \setlength\beamer@paperwidth{14.85cm}% + \setlength\beamer@paperheight{10.50cm}% + \fi\fi\fi\fi\fi\fi\fi } \RequirePackage[% @@ -355,28 +339,23 @@ % Filter class option list \beamer@filterclassoptions - +% Low-level graphic drawing and advanced color support. \RequirePackage{pgfcore} -% We need only the core stuff. - \RequirePackage{xxcolor} -% For color management (comes with pgf). -\RequirePackage{atbegshi} % Normally loaded by hyperref but to be on the safe side ... +\RequirePackage{atbegshi} \RequirePackage[implicit=false]{hyperref} -% For hyperlinks \hypersetup{pdfcreator={LaTeX with Beamer class}} -% Coding stuff +% Encoding stuff \beamer@loaducs \beamer@hypercjk - -\RequirePackage{beamerbaserequires} % Beamer packages required both by presentation and article modes +\RequirePackage{beamerbaserequires} % Defaults \normalfont |