diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty index e14d9cd2138..724bdb7a36e 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011--2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017 by Joseph Wright % % This file may be distributed and/or modified % @@ -61,7 +62,7 @@ \fi% \fi% \global\c@beamerpauses=1\relax% - \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{% + \expandafter\ifblank\expandafter{\beamer@framestartpage}{% \stepcounter{subsectionslide}% \xdef\beamer@framestartpage{\the\c@page}% only first time }{\clearpage\beamer@notesactions}% cleanup from previous slide @@ -365,14 +366,14 @@ \beamer@copewithframeenv} \def\beamer@checkforverbatim#1containsverbatim#2\relax{% - \beamer@ifempty{#2}% + \ifblank{#2}% {\beamer@checkforfragile#1fragile\relax} {% contains verbatim \endgroup% end environment \expandafter\beamer@framecommand\beamer@frameoptions\bgroup}% } \def\beamer@checkforfragile#1fragile#2\relax{% - \beamer@ifempty{#2}% + \ifblank{#2}% {\beamer@frameenv}% normal frame {% contains verbatim \endgroup% end environment @@ -396,7 +397,7 @@ \fi% \beamer@next{#1#2}} \def\beamer@checkforcolon#1:#2.{% - \beamer@ifempty{#2}{}{\let\beamer@next=\beamer@oldframesyntax}} + \ifblank{#2}{}{\let\beamer@next=\beamer@oldframesyntax}} \def\beamer@newframesyntax#1{\beamer@@@frame<*>[#1]} \def\beamer@oldframesyntax#1{\beamer@@@frame<#1>[]} @@ -411,7 +412,7 @@ \def\beamer@@@@frame<#1>[#2]{% \framewidth\textwidth \beamer@savemode% - \def\beamer@mode{\mode<all>}% + \gdef\beamer@mode{\mode<all>}% \def\beamer@frametemplate{}% \def\beamer@againname{}% \def\beamer@undolabels{}% @@ -450,19 +451,9 @@ \ifx\beamer@againname\@empty% \beamer@slideinframe=0\relax% \beamer@anotherslidefalse% - {\beamer@masterdecode{\beamer@whichframes}}% + \beamer@masterdecode{\beamer@whichframes}% \ifbeamer@anotherslide% -%% \beamer@slideinframe=2\relax% -%% \def\beamer@doifnotinframe{}% -%% \def\beamer@doifinframe{\let\beamer@howtotreatframe\beamer@doseveralframes}% -%% \beamer@anotherslidefalse% -%% {\beamer@masterdecode{\beamer@whichframes}}% -%% \ifbeamer@anotherslide% \let\beamer@howtotreatframe\beamer@doseveralframes% -%% \else% single slide in frame -%% \let\beamer@howtotreatframe\beamer@dosingleframe% -%% \fi% -%% \beamer@donow% \ifbeamer@containsverbatim% \let\beamer@howtotreatframe\beamer@dosingleframe% \fi% @@ -517,11 +508,11 @@ \beamer@slideinframe=1\relax% \loop% \beamer@anotherslidefalse% - \def\beamer@doifnotinframe{}% + \gdef\beamer@doifnotinframe{}% \def\beamer@doifinframe{\begin{beamer@frameslide}% #1% \end{beamer@frameslide}}% - {\beamer@masterdecode{\beamer@whichframes}}% + \beamer@masterdecode{\beamer@whichframes}% \beamer@donow% \ifbeamer@twoscreenstext% \beamer@dosecondscreennow{#1}% two screen stuff @@ -572,7 +563,9 @@ \def\beamer@doframeinput{\@ifnextchar<{\beamer@frameinput}{\beamer@frameinput<*>}} \def\beamer@frameinput<#1>{\@ifnextchar[{\beamer@@frameinput<#1>}{\beamer@@frameinput<#1>[]}} -\def\beamer@@frameinput<#1>[{\@ifnextchar<{\beamer@@@@frameinput<#1>[}{\beamer@@@frameinput<#1>[<*>][}} +\def\beamer@@frameinput<#1>[{\@ifnextchar<{\beamer@@@@frameinput<#1>[}% + {\edef\beamer@temp{\noexpand\beamer@@@frameinput<#1>[\beamer@defaultospec][}% + \beamer@temp}} \def\beamer@@@@frameinput<#1>[#2]{\@ifnextchar[{\beamer@@@frameinput<#1>[{#2}]}{\beamer@@@frameinput<#1>[{#2}][]}} \def\beamer@@@frameinput<#1>[#2][#3]{% \global\advance\c@framenumber by-1\relax% @@ -591,7 +584,7 @@ \csname end#1\endcsname} \def\beamer@writeslidentry{% - \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{}% does not happen normally + \expandafter\ifblank\expandafter{\beamer@framestartpage}{}% does not happen normally {%else \addtocontents{nav}% {\protect\headcommand{% @@ -659,7 +652,7 @@ \refstepcounter{framenumber}% \beamer@slideinframe=0\relax% \beamer@anotherslidefalse% - {\beamer@masterdecode{#1}}% + \beamer@masterdecode{#1}% \ifbeamer@anotherslide% \let\beamer@howtotreatframe\beamer@dosingleframe% \else% no slides in frame |