Joseph Wright avatar Joseph Wright committed dca7db0 Merge

Merge changes

Comments (0)

Files changed (12)

 c011175e662fceb18fc9a8df79a9061467f702b3 version-3-23
 cb16a617839f61fad62a993ed5ce6e1f41ba8bcd version-3-24
 8b90150cac88743665c1d26784af550d105069c1 version-3-25
+e81e0c94bcc65dd0b66fb891ad9b6b313a9b8b23 version-3-26
 
 \RequirePackage{beamerbasercs}
 \ProvidesClassRCS $Header$
-[development version \beamer@version\space A class for typesetting presentations]
+[\beamer@version\space A class for typesetting presentations]
 
 
 \RequirePackage{beamerbasemodes}

base/beamerbaseauxtemplates.sty

   \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}

base/beamerbasefont.sty

       }{}
 
 
-
+\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}
 \fi
 }
 
+\ifbeamer@sansmath
+  \IfFileExists{sansmathaccent.sty}
+    {\RequirePackage{sansmathaccent}}
+    {}
+\fi
+
 \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
 \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
 \DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}

base/beamerbaseframe.sty

 % \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}%

base/beamerbaseoptions.sty

   \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{%

base/beamerbasercs.sty

 % See the file doc/licenses/LICENSE for more details.
 
 % Define beamer version
-\def\beamer@version{3.25}
+\def\beamer@version{3.26}
 
 
 % Get date and version from RCS Ids

base/beamerbasetoc.sty

   {
     \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%

doc/beamerug-color.tex

 \end{colorthemeexample}
 
 \begin{colorthemeexample}{monarca}
-  The theme is based on the the colors of the Monarch butterfly.
+  The theme is based on the colors of the Monarch butterfly.
   
   \themeauthor Max Dohse.
 \end{colorthemeexample}
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{spruce}
-  The theme is based on the the colors of Michigan State University.
+  The theme is based on the colors of Michigan State University.
   
   \themeauthor Alan Munn.
 \end{colorthemeexample}

doc/beamerug-globalstructure.tex

-p% Copyright 2003--2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
 % Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified

doc/beamerug-translator.tex

 The \translatorname\ package is loaded ``in stages'':
 \begin{enumerate}
 \item
-  First, some package or the document author requests the the \translatorname\ package is loaded.
+  First, some package or the document author requests the \translatorname\ package is loaded.
 \item
   The \translatorname\ package allows options like |ngerman| to be given. These options cause the necessary aliases and the correct \translatorname\ languages to be requested.
 \item

doc/beameruserguide.tex

 
 \documentclass{ltxdoc}
 
-\def\beamerugversion{3.25}
+\def\beamerugversion{3.26}
 \def\beamerugpgfversion{1.00}
 \def\beamerugxcolorversion{2.00}
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.