diff options
author | Karl Berry <karl@freefriends.org> | 2013-06-25 22:59:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-06-25 22:59:51 +0000 |
commit | 126b0d7e4e423777ec343b7350530e17ecbfc811 (patch) | |
tree | 84d9619e149fd3e00321176c689eded7cb408496 /Master/texmf-dist/tex/latex/beamer | |
parent | 5aa654d4ba7f9cc5edd8a09397f653fcc3dde5c5 (diff) |
beamer (18jun13)
git-svn-id: svn://tug.org/texlive/trunk@30943 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
9 files changed, 72 insertions, 54 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index a1bae316935..92a2378dcc5 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls @@ -10,7 +10,7 @@ % See the file doc/licenses/LICENSE for more details. \RequirePackage{beamerbasercs} -\ProvidesClassRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamer.cls,v e81e0c94bcc6 2013/01/04 20:02:32 joseph $ +\ProvidesClassRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamer.cls,v dca7db0ccda1 2013/04/04 11:31:05 joseph $ [\beamer@version\space A class for typesetting presentations] @@ -325,7 +325,10 @@ \else\ifnum#1=32% \beamer@paperwidth 13.50cm% \beamer@paperheight 9.00cm% - \fi\fi\fi\fi\fi\fi% + \else\ifnum#1=141% + \beamer@paperwidth 14.85cm% + \beamer@paperheight10.50cm% + \fi\fi\fi\fi\fi\fi\fi% } \RequirePackage[% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty index 1a253c0f1f2..33ba1ed79ad 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseauxtemplates.sty,v 67c48b3b652d 2012/05/01 07:25:30 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseauxtemplates.sty,v f179744ff1e3 2013/02/02 09:20:06 joseph $ \mode<presentation> @@ -711,7 +711,7 @@ \begin{beamerboxesrounded}[upper=block title example,lower=block body example,#1] {\raggedright\usebeamerfont*{block title example}\insertblocktitle}% \raggedright% - \usebeamerfont{block body alerted}% + \usebeamerfont{block body example}% }% \defbeamertemplate{block example end}{rounded}[1][] {\end{beamerboxesrounded}\vskip\smallskipamount} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty index e7e6c5220d3..14b0f5c6444 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasefont.sty,v 733629cd0c6c 2012/09/19 19:55:31 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasefont.sty,v e18016724886 2013/06/04 06:13:49 joseph $ \ifbeamer@amssymb \RequirePackage{amssymb} @@ -175,49 +175,48 @@ }{} - +\newcommand*{\beamer@font@check}{% + \def\beamer@cmr{cmr} + \edef\beamer@fmdef{\mathfamilydefault} + % supress for standard cm + \ifx\beamer@fmdef\beamer@cmr\beamer@suppressreplacementstrue\fi + % supress for mathtime serif and math minion serif + \@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathpmnt}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathpple}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mathtime}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mtpro}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} + \@ifpackageloaded{mtpro2}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} +} \AtBeginDocument{% -\def\beamer@cmr{cmr} -\edef\beamer@fmdef{\mathfamilydefault} - -% supress for standard cm -\ifx\beamer@fmdef\beamer@cmr\beamer@suppressreplacementstrue\fi - -% supress for mathtime serif and math minion serif -\@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{mathpmnt}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{mathpple}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{mathtime}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{mtpro}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} -\@ifpackageloaded{mtpro2}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{} - +\beamer@font@check \ifbeamer@suppressreplacements\else \ifbeamer@sansmath - \SetSymbolFont{operators}{normal}{OT1}{cmss}{m}{n} + \SetSymbolFont{operators}{normal}{OT1}{cmss}{\mddefault}{n} \ifx\mv@bold\@undefined \else - \SetSymbolFont{operators}{bold}{OT1}{cmss}{bx}{n} + \SetSymbolFont{operators}{bold}{OT1}{cmss}{\bfdefault}{n} \fi \fi - \DeclareSymbolFont{numbers}{\encodingdefault}{\mathfamilydefault}{m}{n} - \DeclareSymbolFont{pureletters}{\encodingdefault}{\mathfamilydefault}{m}{it} - \SetMathAlphabet{\mathrm}{normal}{\encodingdefault}{\rmdefault}{m}{n} - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\mathfamilydefault}{bx}{n} - \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} - \DeclareMathAlphabet{\mathit}{\encodingdefault}{\mathfamilydefault}{m}{it} - \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} + \DeclareSymbolFont{numbers}{\encodingdefault}{\mathfamilydefault}{\mddefault}{n} + \DeclareSymbolFont{pureletters}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it} + \SetMathAlphabet{\mathrm}{normal}{\encodingdefault}{\rmdefault}{\mddefault}{n} + \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n} + \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{\mddefault}{n} + \DeclareMathAlphabet{\mathit}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it} + \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{\mddefault}{n} \ifx\mv@bold\@undefined\else - \SetSymbolFont{numbers}{bold}{\encodingdefault}{\mathfamilydefault}{bx}{n} - \SetSymbolFont{pureletters}{bold}{\encodingdefault}{\mathfamilydefault}{bx}{it} - \SetMathAlphabet{\mathrm}{bold}{\encodingdefault}{\rmdefault}{bx}{n} - \SetMathAlphabet{\mathbf}{bold}{\encodingdefault}{\mathfamilydefault}{bx}{n} - \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{bx}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\mathfamilydefault}{bx}{it} - \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{bx}{n} + \SetSymbolFont{numbers}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n} + \SetSymbolFont{pureletters}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it} + \SetMathAlphabet{\mathrm}{bold}{\encodingdefault}{\rmdefault}{\bfdefault}{n} + \SetMathAlphabet{\mathbf}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n} + \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{\bfdefault}{n} + \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it} + \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{\bfdefault}{n} \fi \def\operator@font{\mathgroup\symnumbers} @@ -289,6 +288,12 @@ \fi } +\ifbeamer@sansmath + \IfFileExists{sansmathaccent.sty} + {\RequirePackage{sansmathaccent}} + {} +\fi + \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} \DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty index 97b4b764e25..09ef7512441 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty @@ -9,7 +9,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseframe.sty,v 1443917db2cf 2012/12/26 20:56:22 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseframe.sty,v edcfd2d0f22d 2013/03/31 21:23:17 joseph $ \mode <presentation> @@ -626,7 +626,7 @@ % \includeonlyframes % -\def\beamer@checkifinlist#1,#2\relax{ +\def\beamer@checkifinlist#1,#2\relax{% \def\beamer@temp{#1}% \ifx\beamer@temp\beamer@againname\else \def\beamer@temp{#2}% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty index c5a78992199..6210030dbe2 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasenavigation.sty,v 42a0f21a412d 2012/04/03 05:51:09 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasenavigation.sty,v 905a39e12b38 2013/04/04 14:51:09 joseph $ \mode <presentation> diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty index 3a14cd063f3..9c0acfbbba8 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseoptions.sty,v 982469101dd6 2010/04/27 12:45:50 rivanvx $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseoptions.sty,v 47431932db0d 2013/03/10 09:24:31 joseph $ \RequirePackage{keyval}[1997/11/10] @@ -22,10 +22,13 @@ \fi \edef\@tempa{% \noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}% - \let\beamer@origkverr\KV@err% - \ifx\@currext\@clsextension\let\KV@errx=\@gobble\fi% never mind + \let\beamer@origkverr\KV@errx% + \let\beamer@origxkverr\XKV@err% + \let\KV@errx=\@gobble% never mind + \let\XKV@err=\@gobble% never mind \@tempa% - \let\KV@err\beamer@origkverr% + \let\KV@errx\beamer@origkverr% + \let\XKV@err\beamer@origxkverr% \AtEndOfPackage{\let\@unprocessedoptions\relax}} \def\ExecuteOptionsBeamer#1{% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty index 837f4496bf9..0294e0318d4 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty @@ -10,7 +10,7 @@ % See the file doc/licenses/LICENSE for more details. % Define beamer version -\def\beamer@version{3.26} +\def\beamer@version{3.27} % Get date and version from RCS Ids @@ -37,4 +37,4 @@ \ProvidesClass{\beamer@rcsfile}[\beamer@rcsdate\space#2\space (rcs-revision \beamer@rcsrevision)] } -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v 9a97a4eee358 2013/01/04 20:01:07 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v 7b8d65c07caf 2013/04/04 11:35:50 joseph $ diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index c7c3defa856..67c04cb6489 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasesection.sty,v 54309ceef997 2013/01/04 11:42:18 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasesection.sty,v 60b9fe0f342f 2013/06/07 08:01:35 joseph $ \mode <all> @@ -51,6 +51,7 @@ \mode<all> \refstepcounter{lecture} \def\beamer@currentlecturelabel{#3} + \@onelevel@sanitize\beamer@currentlecturelabel \def\beamer@lecturename{#2} \def\beamer@shortlecturename{#1} \ifx\beamer@onlylecture\@empty @@ -73,7 +74,9 @@ \AtBeginLecture{} \newcommand\includeonlylecture[1]{% - \def\beamer@onlylecture{#1}} + \def\beamer@onlylecture{#1}% + \@onelevel@sanitize\beamer@onlylecture + } \includeonlylecture{} } diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty index 3c3b2b1a450..548f577b1a0 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasetoc.sty,v 5ed0f4010e8a 2012/10/02 06:08:21 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasetoc.sty,v 0fdf5bc43be8 2013/05/23 07:10:57 joseph $ \mode <presentation> @@ -114,7 +114,11 @@ \expandafter\only\beamer@tocsections{\gdef\beamer@todo{% \beamer@tempcount=#5\relax% \advance\beamer@tempcount by\beamer@sectionadjust% - \edef\inserttocsectionnumber{\the\beamer@tempcount}% + \ifnum\beamer@tempcount>0 + \edef\inserttocsectionnumber{\the\beamer@tempcount}% + \else + \def\inserttocsectionnumber{}% + \fi% \def\inserttocsection{\hyperlink{Navigation#3}{#2}}% \beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@cs\else\beamer@toc@os\fi}% { @@ -174,7 +178,7 @@ { \beamer@saveanother% \gdef\beamer@todo{}% - \beamer@slideinframe=#2\relax% + \beamer@slideinframe=#1\relax% \expandafter\only\beamer@tocsections{\gdef\beamer@todo{% \ifbeamer@pausesubsections\pause\fi% \beamer@tempcount=#7% |