diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty index fb496a87333..beebc74d5eb 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2010,2012--2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017 by Joseph Wright % % This file may be distributed and/or modified % @@ -24,7 +25,7 @@ % \newcommand<>\frametitle{\alt#1{\@dblarg\beamer@@frametitle}{\beamer@gobbleoptional}} \long\def\beamer@@frametitle[#1]#2{% - \beamer@ifempty{#2}{}{% + \ifblank{#2}{}{% \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}% \gdef\beamer@frametitle{#2}% \gdef\beamer@shortframetitle{#1}% @@ -42,7 +43,7 @@ <all> { \let\beamer@aftersubtitle=\relax - \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}} + \newcommand<>\framesubtitle[1]{\only#2{\ifblank{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}} } @@ -53,7 +54,7 @@ \@ifnextchar\framesubtitle{\beamer@donextsubtitle}{\usebeamertemplate{frametitle}}}} \renewcommand<>\framesubtitle[1]{% \only#2{% - \beamer@ifempty{#1} + \ifblank{#1} {\usebeamertemplate{frametitle}} {\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}} \def\beamer@donextsubtitle{% @@ -71,13 +72,13 @@ \mode <all> { - \newenvironment{alertenv}{\begin{altenv}% - {\usebeamertemplate{alerted text begin}\usebeamercolor[fg]{alerted text}\usebeamerfont{alerted text}} - {\usebeamertemplate{alerted text end}}{\color{.}}{}}{\end{altenv}} + \newenvironment<>{alertenv}{\begin{altenv}#1% + {\usebeamercolor[fg]{alerted text}\usebeamerfont{alerted text}\usebeamertemplate{alerted text begin}} + {\usebeamertemplate{alerted text end}}{\color{.}}{}\ignorespaces}{\ifhmode\unskip\fi\end{altenv}} - \newenvironment{structureenv}{\begin{altenv}% - {\usebeamertemplate{structure text begin}\usebeamercolor[fg]{structure}\usebeamerfont{structure}} - {\usebeamertemplate{structure text end}}{\color{.}}{}}{\end{altenv}} + \newenvironment<>{structureenv}{\begin{altenv}#1% + {\usebeamercolor[fg]{structure}\usebeamerfont{structure}\usebeamertemplate{structure text begin}} + {\usebeamertemplate{structure text end}}{\color{.}}{}\ignorespaces}{\ifhmode\unskip\fi\end{altenv}} \newcommand<>{\alert}[1]{\begin{alertenv}#2\relax#1\end{alertenv}} \newcommand<>{\structure}[1]{\begin{structureenv}#2\relax#1\end{structureenv}} @@ -242,7 +243,7 @@ % \renewcommand{\itemize}[1][]{% - \beamer@ifempty{#1}{}{\def\beamer@defaultospec{#1}}% + \ifblank{#1}{}{\def\beamer@defaultospec{#1}}% \ifnum \@itemdepth >2\relax\@toodeep\else \advance\@itemdepth\@ne \beamer@computepref\@itemdepth% sets \beameritemnestingprefix @@ -295,6 +296,9 @@ \beamer@descdefault\wd\beamer@tempbox\@@description} \def\@@description{% \advance\beamer@descdefault by \labelsep% + \usebeamerfont{description body}% + \usebeamercolor[fg]{description body}% + \usebeamertemplate{description body begin}% \list {} {\labelwidth\beamer@descdefault\leftmargin\beamer@descdefault\let\makelabel\beamer@descriptionitem}% @@ -302,7 +306,8 @@ \raggedright \beamer@firstlineitemizeunskip% } -\def\enddescription{\ifhmode\unskip\fi\endlist} +\def\enddescription{\ifhmode\unskip\fi\endlist% + \usebeamertemplate{description body end}} \long\def\beamer@descriptionitem#1{% \def\insertdescriptionitem{#1}% \hfil\hspace\labelsep{\usebeamertemplate**{description item}}} @@ -491,8 +496,8 @@ {\ifcsundef{abx@name@labelname}{}{\let\bbx@tempa\labelnamepunct}% \bbx@tempa\newblock\unspace\usebeamercolor[fg]{bibliography entry title}}{}{} \apptocmd{\abx@macro@title} - {\ifcsundef{abx@field@title}{}{\midsentence\newunitpunct}% - \newblock\usebeamercolor[fg]{bibliography entry note}}{}{}} + {\ifcsundef{abx@field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}% + \newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}} {}} \mode |