From 56bd1f5b8377f54b4af39a114362a7762d27f13c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 7 May 2020 03:01:09 +0000 Subject: CTAN sync 202005070301 --- macros/latex/contrib/beamer/base/beamer.cls | 2 +- macros/latex/contrib/beamer/base/beamerarticle.sty | 2 +- .../latex/contrib/beamer/base/beamerbaseframe.sty | 3 +++ .../beamer/base/beamerbaselocalstructure.sty | 23 ++++++++++++++++++++++ .../latex/contrib/beamer/base/beamerbasenotes.sty | 2 +- .../contrib/beamer/base/beamerbaseoverlay.sty | 2 +- .../base/themes/outer/beamerouterthemedefault.sty | 4 ++-- .../base/themes/outer/beamerouterthemeshadow.sty | 2 +- .../themes/outer/beamerouterthemesmoothbars.sty | 4 ++-- .../themes/outer/beamerouterthemesmoothtree.sty | 4 ++-- 10 files changed, 37 insertions(+), 11 deletions(-) (limited to 'macros/latex/contrib/beamer/base') diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls index f3564e183c..8da6b10836 100644 --- a/macros/latex/contrib/beamer/base/beamer.cls +++ b/macros/latex/contrib/beamer/base/beamer.cls @@ -12,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesClass{beamer} - [2019/09/29 v3.57 A class for typesetting presentations] + [2020/05/06 v3.58 A class for typesetting presentations] % Setup modes and check for article option % Also loads packages required by both beamer and beamerarticle diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty index 2972dd7fb0..1b3de32744 100644 --- a/macros/latex/contrib/beamer/base/beamerarticle.sty +++ b/macros/latex/contrib/beamer/base/beamerarticle.sty @@ -12,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesPackage{beamerarticle} - [2019/09/29 v3.57 beamer input in article mode] + [2020/05/06 v3.58 beamer input in article mode] % Setup modes and check for article option % Also loads packages required by both beamer and beamerarticle diff --git a/macros/latex/contrib/beamer/base/beamerbaseframe.sty b/macros/latex/contrib/beamer/base/beamerbaseframe.sty index 5da51c7ef2..bda14b5d5a 100644 --- a/macros/latex/contrib/beamer/base/beamerbaseframe.sty +++ b/macros/latex/contrib/beamer/base/beamerbaseframe.sty @@ -755,6 +755,9 @@ { \expandafter\let\expandafter\beamer@origbreak\expandafter=% \csname\expandafter\@gobble\string\\ \endcsname% evil trickery to add a space to the name + \ifx\beamer@origbreak\relax + \let\beamer@origbreak\\ + \fi \DeclareRobustCommand\\{\beamer@ifnextcharospec{\beamer@breaker}{\beamer@@breaker}} \def\beamer@breaker<#1>{\only<#1>{\beamer@origbreak}} \def\beamer@@breaker{\ifbeamer@inframe\else\expandafter\beamer@origbreak\fi} diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty index adf021aae7..c0d85832b5 100644 --- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty +++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty @@ -495,6 +495,29 @@ {\ifcsundef{abx@field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}% \newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}} {}} + +% Adding patches to some biblatex styles +\csappto{blx@filehook@postload@numeric.bbx}{% + \mode{\setbeamertemplate{bibliography item}{\insertbiblabel}}} +\csappto{blx@filehook@postload@alphabetic.bbx}{% + \mode{\setbeamertemplate{bibliography item}{\insertbiblabel}}} +\csappto{blx@filehook@postload@authoryear.bbx}{% + \mode{% + \newlength{\beamer@bibiconwidth} + \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}} + \setlength{\labelwidth}{-\beamer@bibiconwidth} + \addtolength{\labelwidth}{2\labelsep} + \addtolength{\bibhang}{\labelsep} + }} +\csappto{blx@filehook@postload@authortitle.bbx}{% + \mode{% + \newlength{\beamer@bibiconwidth} + \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}} + \setlength{\labelwidth}{-\beamer@bibiconwidth} + \addtolength{\labelwidth}{2\labelsep} + \addtolength{\bibhang}{\labelsep} + }} + \mode
diff --git a/macros/latex/contrib/beamer/base/beamerbasenotes.sty b/macros/latex/contrib/beamer/base/beamerbasenotes.sty index b0cc196c31..d15fb1c8fd 100644 --- a/macros/latex/contrib/beamer/base/beamerbasenotes.sty +++ b/macros/latex/contrib/beamer/base/beamerbasenotes.sty @@ -203,7 +203,7 @@ \begin{pgflowlevelscope}{\pgftransformscale{#1}}% \color{normal text.bg} \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\paperheight}} - \pgfusepath{fill} + \pgfusepath{fill,clip} \color{normal text.fg} {\pgftransformshift{\pgfpoint{\beamer@origlmargin}{\footheight}}\pgftext[left,bottom]{\copy\beamer@frameboxcopy}} \end{pgflowlevelscope} diff --git a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty index 9b7d9268a0..0f718e7287 100644 --- a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty +++ b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty @@ -661,7 +661,7 @@ \raggedright } {% - \end{minipage}\vfil + \end{minipage}\endgraf\vfil \egroup \wd\beamer@areabox=\beamer@animht \ht\beamer@areabox=\beamer@animwd diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty index cd7537d36c..dac39b1ffb 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty @@ -158,11 +158,11 @@ \usebeamerfont{frametitle}% \vbox{}\vskip-1ex% \if@tempswa\else\csname beamer@fte#1\endcsname\fi% - \strut\insertframetitle\par% + \strut\insertframetitle\strut\par% {% \ifx\insertframesubtitle\@empty% \else% - {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\par}% + {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}% \fi }% \vskip-1ex% diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty index f76955cbf9..9e4385341d 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty @@ -51,7 +51,7 @@ \vbox{}\vskip-.75ex% \leftskip0.3cm% \rightskip0.3cm plus1fil\leavevmode - \usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\strut\insertframetitle\par% + \usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\strut\insertframetitle\strut\par% \ifx\insertframesubtitle\@empty\else% {\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}% \fi% diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty index 36d1622e23..0a68ff0598 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty @@ -97,11 +97,11 @@ \vskip-.5ex% \nointerlineskip% \begin{beamercolorbox}[wd=\paperwidth,leftskip=.3cm,rightskip=.3cm plus1fil,vmode]{frametitle} - \usebeamerfont*{frametitle}\insertframetitle% + \usebeamerfont*{frametitle}\strut\insertframetitle% \ifx\insertframesubtitle\@empty% \strut\par% \else - \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}% + \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}% \fi%% \usebeamerfont{headline}% \vskip.5ex diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty index 21ca7701eb..6af2e39505 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty @@ -75,11 +75,11 @@ \vskip-.5ex% \nointerlineskip% \begin{beamercolorbox}[wd=\paperwidth,leftskip=.935cm,rightskip=.3cm plus1fil]{frametitle} - \usebeamerfont*{frametitle}\insertframetitle% + \usebeamerfont*{frametitle}\strut\insertframetitle% \ifx\insertframesubtitle\@empty% \strut\par% \else - \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}% + \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}% \fi%% \usebeamerfont{headline}% \vskip.5ex -- cgit v1.2.3