diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty index 795d426faf8..1f315193150 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.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/beamerbaseoverlay.sty,v 1.50 2007/01/28 20:48:21 tantau Exp $ +\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbaseoverlay.sty,v 5584dad462a9 2010/05/07 09:01:43 joseph $ % % @@ -72,7 +73,7 @@ \long\def\beamer@todo{#2}% \else% \expandafter\long\expandafter\def\expandafter\beamer@todo% - \expandafter{\expandafter\uncover\expandafter<\expandafter a\expandafter l\expandafter l\expandafter:\beamer@decodefound>{#2}}% + \expandafter{\expandafter\uncover\expandafter<\expandafter a\expandafter l\expandafter l\expandafter:\beamer@decodefound>{#2}}% \fi% \expandafter\beamer@processactions\beamer@decaction{}% \beamer@todo} @@ -209,12 +210,12 @@ \beamer@prechecka{#3}} \long\def\beamer@prechecka#1{\@ifnextchar<{\beamer@preget{#1}}{\beamer@precheckb{#1}}} \long\def\beamer@preget#1<#2>{\def\beamer@ospec{<#2>}\beamer@precheckb{#1}} -\long\def\beamer@precheckb#1{\@ifnextchar[{\beamer@pregetb}{\beamer@pregetb[#1]}} +\long\def\beamer@precheckb#1{\@ifnextchar[{\beamer@pregetb}{\beamer@pregetb[{#1}]}} \long\def\beamer@pregetb[#1]{% \expandafter\long\expandafter\def\expandafter\beamer@todo\expandafter{\beamer@todo{#1}}% \advance\beamer@argscount by-1\relax% \beamer@parseargs% -} +} \def\beamer@sortzero#1{\beamer@ifnextcharospec{\beamer@sortzeroread{#1}}{#1{}}} \def\beamer@sortzeroread#1<#2>{#1{<#2>}} @@ -227,7 +228,7 @@ \beamer@parseargs} \def\beamer@parseargs{% - \ifnum\beamer@argscount=0% + \ifnum\beamer@argscount=0\relax% \let\next=\beamer@finalargscheck% \else% \let\next=\beamer@lookforarg% @@ -252,7 +253,8 @@ -\mode<presentation> +\mode +<presentation> % commands for smuggling skips past @@ -267,7 +269,7 @@ #1% \ifx\beamer@lastskiptext\beamer@zeropt\else% \ifvmode\vskip\beamer@lastskipcover\fi\ifhmode\hskip\beamer@lastskipcover\fi\fi% -} +} @@ -278,7 +280,7 @@ \gdef\beamer@do{#1% \expandafter\gdef\csname beamer@doafter% \the\beamer@coveringdepth\endcsname{#2}}} - + \def\beamer@startcovered{% \beamer@smuggle{% \global\advance\beamer@coveringdepth by 1\relax% @@ -365,7 +367,7 @@ \def\beamer@colorhook{} \def\beamer@pgfextension{} -\beamer@coveringdepth=0 +\beamer@coveringdepth=0\relax \mode @@ -399,10 +401,10 @@ <all> { \AtBeginDocument - { + { \let\beamer@musixpause=\pause \let\pause=\beamer@@pause - + \let\beamer@music=\music \def\music{\let\beamerpause=\pause\let\pause\beamer@musixpause\beamer@music} } @@ -440,7 +442,7 @@ {\beamer@spacingcover\gdef\beamer@endpause{\beamer@spacingcover}}% {\beamer@begininvisible\gdef\beamer@endpause{\beamer@endinvisible}}% } - + \mode <article> { @@ -449,16 +451,16 @@ \newcommand<>{\beamer@noargsvisibleonslide}{} } - - + + % % Make item overlays % \let\beamer@origitem=\item \def\beamer@callorigitem{\@ifnextchar[\beamer@@callorigitem{\beamer@origitem\kern0pt\ignorespaces}} -\def\beamer@@callorigitem[#1]{\beamer@origitem[#1]\kern0pt\ignorespaces} +\def\beamer@@callorigitem[#1]{\beamer@origitem[{#1}]\kern0pt\ignorespaces} \def\item{% \@ifnextchar\relax\beamer@origitem{% @@ -476,14 +478,14 @@ \next% }} \def\beamer@defaultparse{\expandafter\beamer@parseitem\beamer@defaultospec} -\long\def\beamer@itemcheckopta[#1]{\@ifnextchar<{\beamer@itemreverse[#1]}{% +\long\def\beamer@itemcheckopta[#1]{\@ifnextchar<{\beamer@itemreverse[{#1}]}{% \ifx\beamer@defaultospec\beamer@emptyospec% \let\next=\beamer@callorigitem% \else% \let\next=\beamer@defaultparse% \fi% - \next[#1]}} -\long\def\beamer@itemreverse[#1]<#2>{\beamer@parseitem<#2>[#1]} + \next[{#1}]}} +\long\def\beamer@itemreverse[#1]<#2>{\beamer@parseitem<#2>[{#1}]} \def\beamer@parseitem<#1>{% \gdef\beamer@closeitem{\end{actionenv}}% @@ -504,8 +506,8 @@ \newcount\beamer@trivlistdepth -\beamer@trivlistdepth=0 - +\beamer@trivlistdepth=0\relax + \let\beamer@orig@trivlist=\@trivlist \def\@trivlist{% \global\advance\beamer@trivlistdepth by1\relax% @@ -535,8 +537,8 @@ \def\item{\@ifnextchar<\beamer@@item\beamer@item} \def\beamer@@item<#1>{\beamer@item} \def\beamer@item{\@ifnextchar[\beamer@@@item\beamer@origitem} - \def\beamer@@@item[#1]{\@ifnextchar<{\beamer@@@@item[#1]}{\beamer@origitem[#1]}} - \def\beamer@@@@item[#1]<#2>{\beamer@origitem[#1]} + \def\beamer@@@item[#1]{\@ifnextchar<{\beamer@@@@item[{#1}]}{\beamer@origitem[{#1}]}} + \def\beamer@@@@item[#1]<#2>{\beamer@origitem[{#1}]} } } @@ -633,6 +635,9 @@ \beamer@animwd=#2\relax% \setbox\beamer@areabox=\vbox to#2\bgroup% \strut\begin{minipage}[t]{#1}% + % Make the minipage behave like the main part of the slide + \normalfont + \raggedright } {% \end{minipage}\vfil% @@ -703,7 +708,7 @@ % -% Transitions - DISTRACTING and to be used with CARE!!!! +% Transitions - DISTRACTING and to be used with CARE!!!! % \define@key{beamertrans}{direction}{\def\beamer@transdir{ /Di #1 }} @@ -725,24 +730,24 @@ \mode <all> { - \newcommand<>{\transblindshorizontal}[1][]{\only#2{\beamer@dotrans[#1]{Blinds /Dm /H}}} - \newcommand<>{\transblindsvertical}[1][]{\only#2{\beamer@dotrans[#1]{Blinds /Dm /V}}} - \newcommand<>{\transboxin}[1][]{\only#2{\beamer@dotrans[#1]{Box /M /I}}} - \newcommand<>{\transboxout}[1][]{\only#2{\beamer@dotrans[#1]{Box /M /O}}} - \newcommand<>{\transcover}[1][]{\only#2{\beamer@dotrans[#1]{Cover}}} - \newcommand<>{\transdissolve}[1][]{\only#2{\beamer@dotrans[#1]{Dissolve}}} - \newcommand<>{\transfade}[1][]{\only#2{\beamer@dotrans[#1]{Fade}}} - \newcommand<>{\transglitter}[1][]{\only#2{\beamer@dotrans[#1]{Glitter}}} - \newcommand<>{\transpush}[1][]{\only#2{\beamer@dotrans[#1]{Push}}} - \newcommand<>{\transsplitverticalin}[1][]{\only#2{\beamer@dotrans[#1]{Split /Dm /V /M /I}}} - \newcommand<>{\transsplitverticalout}[1][]{\only#2{\beamer@dotrans[#1]{Split /Dm /V /M /O}}} - \newcommand<>{\transsplithorizontalin}[1][]{\only#2{\beamer@dotrans[#1]{Split /Dm /H /M /I}}} - \newcommand<>{\transsplithorizontalout}[1][]{\only#2{\beamer@dotrans[#1]{Split /Dm /H /M /O}}} - \newcommand<>{\transuncover}[1][]{\only#2{\beamer@dotrans[#1]{Uncover}}} - \newcommand<>{\transwipe}[1][]{\only#2{\beamer@dotrans[#1]{Wipe}}} -} - -\newcommand<>{\transduration}[1]{\only#2{\hypersetup{pdfpageduration=#1}}} + \newcommand<>{\transblindshorizontal}[1][]{\only#2{\beamer@dotrans[{#1}]{Blinds /Dm /H}}} + \newcommand<>{\transblindsvertical}[1][]{\only#2{\beamer@dotrans[{#1}]{Blinds /Dm /V}}} + \newcommand<>{\transboxin}[1][]{\only#2{\beamer@dotrans[{#1}]{Box /M /I}}} + \newcommand<>{\transboxout}[1][]{\only#2{\beamer@dotrans[{#1}]{Box /M /O}}} + \newcommand<>{\transcover}[1][]{\only#2{\beamer@dotrans[{#1}]{Cover}}} + \newcommand<>{\transdissolve}[1][]{\only#2{\beamer@dotrans[{#1}]{Dissolve}}} + \newcommand<>{\transfade}[1][]{\only#2{\beamer@dotrans[{#1}]{Fade}}} + \newcommand<>{\transglitter}[1][]{\only#2{\beamer@dotrans[{#1}]{Glitter}}} + \newcommand<>{\transpush}[1][]{\only#2{\beamer@dotrans[{#1}]{Push}}} + \newcommand<>{\transsplitverticalin}[1][]{\only#2{\beamer@dotrans[{#1}]{Split /Dm /V /M /I}}} + \newcommand<>{\transsplitverticalout}[1][]{\only#2{\beamer@dotrans[{#1}]{Split /Dm /V /M /O}}} + \newcommand<>{\transsplithorizontalin}[1][]{\only#2{\beamer@dotrans[{#1}]{Split /Dm /H /M /I}}} + \newcommand<>{\transsplithorizontalout}[1][]{\only#2{\beamer@dotrans[{#1}]{Split /Dm /H /M /O}}} + \newcommand<>{\transuncover}[1][]{\only#2{\beamer@dotrans[{#1}]{Uncover}}} + \newcommand<>{\transwipe}[1][]{\only#2{\beamer@dotrans[{#1}]{Wipe}}} +} + +\newcommand<>{\transduration}[1]{\only#2{\hypersetup{pdfpageduration={#1}}}} \mode <article> @@ -759,7 +764,7 @@ \def\animatevalue<#1-#2>#3#4#5{% \only<#1-#2>{}% enforce these frames \ifnum\beamer@slideinframe<#1\relax% - #3=#4% + #3=#4\relax% \else% \ifnum\beamer@slideinframe<#2\relax% #3=#4\relax% @@ -775,16 +780,16 @@ \multiply#3 by\beamer@animationtempa% \advance#3 by#4% \else - #3=#5% + #3=#5\relax% \fi% - \fi% + \fi% } \mode <article> { \def\animate<#1>{} - \def\animatevalue<#1-#2>#3#4#5{#3=#4} + \def\animatevalue<#1-#2>#3#4#5{#3=#4\relax} } @@ -801,7 +806,7 @@ } \def\beamer@label<#1>#2{\alt<#1>{\beamer@origlabel{#2}\beamer@nameslide{#2}}{\beamer@dummynameslide}} -\def\beamer@label@in@display<#1>#2{\alt<#1>{\beamer@origlabel@in@display{#2}\beamer@nameslide{#2}}{\beamer@dummynameslide}} +\def\beamer@label@in@display<#1>#2{\alt<#1>{\beamer@origlabel@in@display{#2}\beamer@nameslide{#2}}{\beamer@dummynameslide}} \mode <article> @@ -821,8 +826,3 @@ \mode <all> - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex" -%%% End: |