diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty index d4f9c16bd96..d50942b34eb 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty @@ -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 % @@ -7,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbasetemplates.sty,v 1.51 2007/01/28 20:48:21 tantau Exp $ +\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbasetemplates.sty,v efa082c6111d 2010/05/01 13:27:03 rivanvx $ % % Template Installation Commands @@ -30,7 +31,8 @@ \beamer@ifdo} -\mode<article> +\mode +<article> { % the following do the same in article mode: \let\beamer@usebeamertemplatedosss=\beamer@usebeamertemplatedo @@ -48,20 +50,20 @@ {\def\beamer@@oar{#1}}\beamer@defbeamertemplate} \def\beamer@defbeamertemplate{\@ifstar{\beamer@sbttrue\beamer@sbtoo}{\beamer@sbtfalse\beamer@sbtoo}} \def\beamer@sbtoo#1#2{\@ifnextchar[{\beamer@sbto{#1}{#2}}{\beamer@sbto{#1}{#2}[0]}} -\def\beamer@sbto#1#2[#3]{\@ifnextchar[{\beamer@@sbto{#1}{#2}[#3]}{\def\beamer@sbtotemp{}\beamer@@@sbto{#1}{#2}[#3]}} -\long\def\beamer@@sbto#1#2[#3][#4]{\long\def\beamer@sbtotemp{[#4]}\beamer@@@sbto{#1}{#2}[#3]} +\def\beamer@sbto#1#2[#3]{\@ifnextchar[{\beamer@@sbto{#1}{#2}[{#3}]}{\def\beamer@sbtotemp{}\beamer@@@sbto{#1}{#2}[{#3}]}} +\long\def\beamer@@sbto#1#2[#3][#4]{\long\def\beamer@sbtotemp{[{#4}]}\beamer@@@sbto{#1}{#2}[{#3}]} \long\def\beamer@@@sbto#1#2[#3]#4{% - \beamer@sbttoks={\beamer@@@@sbto{#1}{#2}[#3]{#4}}% + \beamer@sbttoks={\beamer@@@@sbto{#1}{#2}[{#3}]{#4}}% \@ifnextchar[{\the\beamer@sbttoks}{\the\beamer@sbttoks[action]{}}% } \long\def\beamer@@@@sbto#1#2[#3]#4[#5]#6{% - \edef\beamer@@sbtoarg{\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#3]}% + \edef\beamer@@sbtoarg{\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[{#3}]}% \expandafter\expandafter\expandafter\newcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{% \expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname{#4}#6}% \let\beamer@@next=\beamer@resetsbtoarg% \expandafter\mode\beamer@@oar{\let\beamer@@next=\relax}% \beamer@@next% - \ifbeamer@sbt\setbeamertemplate{#1}[#2]\relax\relax\relax\relax\relax\relax\relax\relax\relax\fi% + \ifbeamer@sbt\setbeamertemplate{#1}[{#2}]\relax\relax\relax\relax\relax\relax\relax\relax\relax\fi% } \def\beamer@resetsbtoarg{% \expandafter\expandafter\expandafter\renewcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{} @@ -73,14 +75,14 @@ \def\defbeamertemplateparent#1{\@ifnextchar[{\beamer@sbtoparo{#1}}{\beamer@sbtoparo{#1}[*]}} -\def\beamer@sbtoparo#1[#2]#3{\@ifnextchar[{\beamer@sbtopar{#1}[#2]{#3}}{\beamer@sbtopar{#1}[#2]{#3}[0]}} +\def\beamer@sbtoparo#1[#2]#3{\@ifnextchar[{\beamer@sbtopar{#1}[{#2}]{#3}}{\beamer@sbtopar{#1}[{#2}]{#3}[0]}} \def\beamer@sbtopar#1[#2]#3[#4]{\@ifnextchar[ - {\beamer@@sbtopar{#1}[#2]{#3}[#4]} - {\def\beamer@sbtotemp{}\beamer@@@sbtopar{#1}[#2]{#3}[#4]}} -\long\def\beamer@@sbtopar#1[#2]#3[#4][#5]{\long\def\beamer@sbtotemp{[#5]}\beamer@@@sbtopar{#1}[#2]{#3}[#4]} + {\beamer@@sbtopar{#1}[{#2}]{#3}[{#4}]} + {\def\beamer@sbtotemp{}\beamer@@@sbtopar{#1}[{#2}]{#3}[{#4}]}} +\long\def\beamer@@sbtopar#1[#2]#3[#4][#5]{\long\def\beamer@sbtotemp{[{#5}]}\beamer@@@sbtopar{#1}[{#2}]{#3}[{#4}]} \long\def\beamer@@@sbtopar#1[#2]#3[#4]#5{% \expandafter\def\csname beamer@@tmpgrp@#1\endcsname{#3}% - \edef\beamer@@sbtoarg{\noexpand\newcommand\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#4]}% + \edef\beamer@@sbtoarg{\noexpand\newcommand\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[{#4}]}% \expandafter\beamer@@sbtoarg\beamer@sbtotemp{% \def\beamer@sbtlist{#3}% \@for\beamer@templ:=\beamer@sbtlist\do @@ -127,4 +129,3 @@ \mode <all> - |