From 14b9c74b24ab667050881bb540464c1593f7e3c9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Aug 2018 21:58:14 +0000 Subject: beamer (23aug18) git-svn-id: svn://tug.org/texlive/trunk@48468 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/beamer/CHANGELOG.md | 26 ++++ .../latex/beamer/beamerexample-conference-talk.pdf | Bin 148612 -> 194232 bytes .../beamerexample-lecture-beamer-version.pdf | Bin 352661 -> 352674 bytes .../beamer/beamerexample-lecture-print-version.pdf | Bin 324209 -> 324224 bytes .../doc/latex/beamer/beameruserguide.pdf | Bin 1596867 -> 1642186 bytes .../doc/latex/beamer/beameruserguide.tex | 2 +- Master/texmf-dist/tex/latex/beamer/beamer.cls | 2 +- .../texmf-dist/tex/latex/beamer/beamerarticle.sty | 2 +- .../tex/latex/beamer/beamerbasearticle.sty | 4 +- .../tex/latex/beamer/beamerbaseboxes.sty | 142 ++++++++------------- .../tex/latex/beamer/beamerbasecolor.sty | 3 +- .../tex/latex/beamer/beamerbasedecode.sty | 2 +- .../tex/latex/beamer/beamerbasemodes.sty | 2 + .../tex/latex/beamer/beamerbasenotes.sty | 2 +- .../tex/latex/beamer/beamerbasesection.sty | 2 +- .../tex/latex/beamer/beamercolorthemedefault.sty | 2 +- .../tex/latex/beamer/beamerouterthemeinfolines.sty | 2 +- .../latex/beamer/beamerouterthememiniframes.sty | 8 +- .../tex/latex/beamer/beamerouterthemeshadow.sty | 46 ++++--- .../tex/latex/beamer/beamerouterthemesplit.sty | 2 +- 20 files changed, 125 insertions(+), 124 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/beamer/CHANGELOG.md (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md new file mode 100644 index 00000000000..e004a7a055e --- /dev/null +++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md @@ -0,0 +1,26 @@ +# Changelog +All notable changes to this project since v3.50 will be documented in this +file. + +The format is based on [Keep a +Changelog](https://keepachangelog.com/en/1.0.0/), version strings comprise +a major and minor version only. + +## [Unreleased] + +## [v3.51] + +## Changed +- Add `\include` and `\input` to commands respected in 'skipping' mode +- Dynamically calculate note page size (see #487) + +### Fixed +- Properly set space in rounded boxes +- Enable transparency in shadows (see #466) +- Restore `\secname` in `\sectionentry` +- Apply color correctly to page number (see #468) +- Support for `noxcolor` with `beamerarticle` (see #483) +- Treatment of mixed overlay/alert specifications + +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.51...HEAD +[v3.51]: https://github.com/josephwright/beamer/compare/v3.50...v3.51 diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf index 78adcd84a2c..cd742e46d7a 100644 Binary files a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf and b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf index ad584f6adae..aa766cdc22e 100644 Binary files a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf and b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf index 2b4a2c940a1..aee8350b4ce 100644 Binary files a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf and b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf index 4028936a050..a8a384735d0 100644 Binary files a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf and b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex index aba4fc9767c..17e38de2534 100644 --- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex +++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex @@ -13,7 +13,7 @@ \documentclass{ltxdoc} -\def\beamerugversion{3.50} +\def\beamerugversion{3.51} \def\beamerugpgfversion{1.00} \def\beamerugxcolorversion{2.00} diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index ea7f71450fc..c8c06eaa4e2 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls @@ -12,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesClass{beamer} - [2018/02/20 v3.50 A class for typesetting presentations] + [2018/08/22 v3.51 A class for typesetting presentations] % Setup modes and check for article option % Also loads packages required by both beamer and beamerarticle diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty index ae77083abf5..900545fda81 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty @@ -12,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesPackage{beamerarticle} - [2018/02/20 v3.50 beamer input in article mode] + [2018/08/22 v3.51 beamer input in article mode] % Setup modes and check for article option % Also loads packages required by both beamer and beamerarticle diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty index 965691b6e4a..a32a3531994 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty @@ -66,7 +66,9 @@ \fi \ifbeamer@articlexcolor - \RequirePackage[override]{xcolor} + \RequirePackage{xcolor} + \colorlet{fg}{black} + \colorlet{bg}{white} \fi % Beamer packages required both by presentation and article modes diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty index ee3ecd90647..1ca4ebc6aba 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty @@ -23,9 +23,9 @@ \newif\ifbmb@shadow \newbox\bmb@box \newbox\bmb@colorbox -\newbox\bmb@boxshadow -\newbox\bmb@boxshadowball -\newbox\bmb@boxshadowballlarge +\newdimen\bmb@boxwidth +\newdimen\bmb@boxheight +\newdimen\bmb@prevheight \newdimen\bmb@temp \newdimen\bmb@dima \newdimen\bmb@dimb @@ -110,11 +110,6 @@ \nointerlineskip% \vskip-0.5pt% \fi% - \ifbmb@shadow% - \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}% - \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}% - \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}% - \fi% \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}% \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}% \vskip2pt% @@ -126,49 +121,66 @@ \def\endbeamerboxesrounded{% \end{minipage}\egroup% - \wd\bmb@box=\bmb@width% \bmb@temp=\dp\bmb@box% \advance\bmb@temp by.5pt% \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}% \dp\bmb@box=0pt% - \bmb@temp=\wd\bmb@box% + \bmb@boxwidth=\bmb@width% + \bmb@boxheight=\ht\bmb@box% + \advance\bmb@boxheight by4bp% + \advance\bmb@boxheight by\bmb@prevheight% + \ifbmb@shadow% + \pgfdeclareradialshading{bmb@shadowball}{\pgfpointorigin} + {% + color(0bp)=(pgftransparent!50); + color(4bp)=(pgftransparent!100) + }% + \pgfdeclareradialshading{bmb@shadowballlarge}{\pgfpointorigin} + {% + color(0bp)=(pgftransparent!0); + color(8bp)=(pgftransparent!100) + }% + \pgfdeclarehorizontalshading{bmb@shadowhorz}{\bmb@boxheight-6bp} + {% + color(0bp)=(pgftransparent!0); + color(8bp)=(pgftransparent!100) + }% + \pgfdeclareverticalshading{bmb@shadowvert}{\bmb@boxwidth-4bp} + {% + color(0bp)=(pgftransparent!100); + color(8bp)=(pgftransparent!0) + }% + \pgfdeclarefading{bmb@shadowmask} + {% + \begin{pgfpicture} + \pgftext[at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowball}} + \pgftext[at=\pgfpoint{\bmb@boxwidth}{8bp}]{\pgfuseshading{bmb@shadowballlarge}} + \pgftext[at=\pgfpoint{\bmb@boxwidth+4bp}{\bmb@boxheight+2bp}]{\pgfuseshading{bmb@shadowball}} + \pgftext[left, at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowvert}} + \pgftext[base, at=\pgfpoint{\bmb@boxwidth+4bp}{8bp}]{\pgfuseshading{bmb@shadowhorz}} + % + % clipping is needed because shadow is typeset on top of box + \begin{pgfscope} + \pgfsetcolor{black} + \pgfpathrectangle{\pgfpoint{4bp}{8bp}}{\pgfpoint{\bmb@boxwidth-0.2bp}{\bmb@boxheight-2bp}} + \pgfusepath{fill} + \end{pgfscope} + \end{pgfpicture}% + }% + \fi% + \bmb@temp=\bmb@width% \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp% \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp% \hbox{% \begin{pgfpicture}{0bp}{0bp}{0bp}{0bp} \ifbmb@shadow% - {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}} - \begin{pgfscope} - {% - \advance\bmb@temp by-1bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}% - \pgfusepath{clip} - }% - {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}} - \end{pgfscope} - \begin{pgfscope} - \advance\bmb@temp by-4bp% - \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}} - \pgfusepath{clip} - {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}% - \end{pgfscope} - \begin{pgfscope} - \advance\bmb@temp by 4bp% - \bmb@dima=\ht\bmb@box% - \advance\bmb@dima by\bmb@prevheight% - \advance\bmb@dima by 4bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}} - \pgfusepath{clip} - \advance\bmb@dima by-4bp% - {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}} - \advance\bmb@dima by-1bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}} - \pgfusepath{clip} - \advance\bmb@temp by4bp% - {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}% - \pgftransformrotate{90}% - \pgftext[left,base]{\box\bmb@boxshadow}}% - \end{pgfscope} + \begin{pgfscope} + \pgfpathrectangle{\pgfpoint{0bp}{-7bp}} + {\pgfpoint{\bmb@boxwidth+8bp}{\bmb@boxheight+6bp}} + \pgfsetfading{bmb@shadowmask}{% + \pgftransformshift{\pgfpoint{0.5\bmb@boxwidth+4.2bp}{0.5\bmb@boxheight-4bp}}} + \pgfusepath{fill} + \end{pgfscope} \fi% \unhbox\bmb@colorbox% \pgfpathqmoveto{-4bp}{1bp} @@ -184,42 +196,6 @@ \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}} \pgfusepath{fill} } - \ifbmb@shadow% - { - \color{black!50!bg} - \pgfsetlinewidth{0pt} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{-.5bp}} - \bmb@dima=\ht\bmb@box% - \advance\bmb@dima by\bmb@prevheight% - \advance\bmb@dima by 1bp% - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \bmb@temp=\bmb@dima - \advance\bmb@dima by 1bp% - \color{black!31!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1bp% - \advance\bmb@temp by 1bp% - \color{black!19!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1bp% - \advance\bmb@temp by 1bp% - \color{black!6!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1.5bp% - \advance\bmb@temp by 1bp% - \color{bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - } - \fi \end{pgfpicture}% \box\bmb@box% }% @@ -231,17 +207,7 @@ \egroup% of \vbox\bgroup } -% % Shadings -% - -% Shadows -\pgfdeclareradialshading[black,bg]{bmb@shadowball}{\pgfpointorigin}{% - color(0bp)=(black!50!bg); color(4bp)=(bg)} -\pgfdeclareradialshading[black,bg]{bmb@shadowballlarge}{\pgfpointorigin}{% - color(0bp)=(black!50!bg); color(4bp)=(black!50!bg); color(8bp)=(bg)} -\pgfdeclareverticalshading[black,bg]{bmb@shadow}{200cm}{% - color(0bp)=(bg); color(4bp)=(black!50!bg); color(8bp)=(black!50!bg)} % Transition line \pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty index 9d037024411..3d649127044 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty @@ -108,9 +108,8 @@ \fi% } - \mode - + { \colorlet{fg}{black} \colorlet{bg}{white} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty index 2ef9d6966c3..4dc2c7ba130 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty @@ -198,7 +198,7 @@ \ifx\beamer@action\beamer@default \xdef\beamer@decodefound{\beamer@spec}% \else - \xdef\beamer@decaction{{\beamer@action<\beamer@spec>}}% + \xdef\beamer@decaction{\beamer@decaction{\beamer@action<\beamer@spec>}}% \fi} \def\beamer@currentaction{default} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty index d68e0c0c15d..d83218620ba 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty @@ -131,6 +131,8 @@ \ifx\beamer@nexttoken\mode\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\common\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\presentation\let\next=\beamer@stopoutsidemode\fi + \ifx\beamer@nexttoken\include\let\next=\beamer@stopoutsidemode\fi + \ifx\beamer@nexttoken\input\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\begin\let\next=\beamer@checkbeginframe\fi \ifx\beamer@nexttoken\end\let\next=\beamer@checkenddoc\fi \next} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty index 6dc040785b6..b0cc196c31b 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty @@ -82,7 +82,7 @@ \edef\beamer@origrmargin{\Gm@rmargin}% \def\Gm@lmargin{1cm}% \def\Gm@rmargin{1cm}% - \textwidth=10.8cm% + \textwidth=\dimexpr\paperwidth-\Gm@lmargin-\Gm@rmargin\relax% \hsize=\textwidth% \@arrayparboxrestore% \vskip-\headheight% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index 986fafea7e2..9193f5ca45d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty @@ -194,7 +194,7 @@ \addtocontents{nav}{\protect\headcommand{\protect\beamer@sectionpages{\the\beamer@sectionstartpage}{\the\beamer@tempcount}}}% \addtocontents{nav}{\protect\headcommand{\protect\beamer@subsectionpages{\the\beamer@subsectionstartpage}{\the\beamer@tempcount}}}% \ifblank{#1}{}{% - \addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c@section}{#1}{\the\c@page}{\lastsection}{\the\c@part}}}% + \addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c@section}{#1}{\the\c@page}{\secname}{\the\c@part}}}% }% \beamer@sectionstartpage=\c@page% \beamer@subsectionstartpage=\c@page% diff --git a/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty index 46ba9eb8845..acc9216b8ce 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty @@ -171,7 +171,7 @@ \setbeamercolor{quotation}{} \setbeamercolor{quote}{parent=quotation} -\setbeamercolor{page number in head/foot}{parent=palette secondary} +\setbeamercolor{page number in head/foot}{} \setbeamercolor{qed symbol}{parent=structure} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty index a72c3738e63..e7bae709365 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty @@ -32,7 +32,7 @@ \end{beamercolorbox}% \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}% \usebeamerfont{date in head/foot}\insertshortdate{}\hspace*{2em} - \usebeamertemplate{page number in head/foot}\hspace*{2ex} + \usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}\hspace*{2ex} \end{beamercolorbox}}% \vskip0pt% } diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty index 548243c8995..b4a9717a5b2 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty @@ -26,7 +26,7 @@ \hfill% {\usebeamerfont{institute in head/foot}\usebeamercolor[fg]{institute in head/foot}\insertshortinstitute% \ifbeamertemplateempty{page number in head/foot}{}{\qquad}% - \usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% + \usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} @@ -44,7 +44,7 @@ \hfill% {\usebeamerfont{author in head/foot}\usebeamercolor[fg]{author in head/foot}\insertshortauthor% \ifbeamertemplateempty{page number in head/foot}{}{\qquad}% - \usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% + \usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} @@ -62,7 +62,7 @@ \hfill% {\usebeamerfont{institute in head/foot}\usebeamercolor[fg]{institute in head/foot}\insertshortinstitute% \ifbeamertemplateempty{page number in head/foot}{}{\qquad}% - \usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% + \usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}% }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} @@ -82,7 +82,7 @@ \end{beamercolorbox}% \begin{beamercolorbox}[ht=2.5ex,dp=1.125ex,% leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% - {\usebeamerfont{title in head/foot}\insertshorttitle}\hfill{\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}}% + {\usebeamerfont{title in head/foot}\insertshorttitle}\hfill{\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}}% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} \end{beamercolorbox} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty index 03bbad214c8..80db372d414 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty @@ -12,30 +12,33 @@ \useoutertheme{split} - \setbeamercolor{frametitle}{parent=subsection in head/foot} \setbeamercolor{frametitle right}{parent=section in head/foot} - \pgfdeclarehorizontalshading[frametitle.bg,frametitle right.bg]{beamer@frametitleshade}{\paperheight}{% color(0pt)=(frametitle.bg); - color(\paperwidth)=(frametitle right.bg)} + color(\paperwidth)=(frametitle right.bg) +} -\AtBeginDocument{ - \pgfdeclareverticalshading{beamer@topshade}{\paperwidth}{% - color(0pt)=(bg); - color(4pt)=(black!50!bg)} +\pgfdeclareverticalshading{beamer@topshade}{2\paperwidth}{% + color(0pt)=(pgftransparent!100); + color(8pt)=(pgftransparent!0) } +\pgfdeclarefading{beamer@topshadowmask}{\pgfuseshading{beamer@topshade}} + \addtobeamertemplate{headline} {} {% - \vskip-0.2pt - \pgfuseshading{beamer@topshade} + \vskip0pt + \begin{pgfpicture} + \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{4pt}}% + \pgfsetfading{beamer@topshadowmask}{}% + \pgfusepath{fill}% + \end{pgfpicture} \vskip-2pt } - \defbeamertemplate*{frametitle}{shadow theme} {% \nointerlineskip% @@ -63,23 +66,26 @@ \beamer@tempdim=\ht\beamer@tempbox% \advance\beamer@tempdim by 2pt% \begin{pgfpicture}{0pt}{0pt}{\paperwidth}{\beamer@tempdim} - \usebeamercolor{frametitle right} - \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}} - \pgfusepath{clip} - \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}} + \begin{pgfscope} + \pgfsetfillcolor{black}% + \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{8pt}}% + \pgfsetfading{beamer@topshadowmask}{}% + \pgfusepath{fill}% + \end{pgfscope} + \begin{pgfscope} + \usebeamercolor{frametitle right}% + \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}}% + \pgfusepath{clip}% + \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}}% + \end{pgfscope} \end{pgfpicture} \hskip-\paperwidth% \box\beamer@tempbox% }% \hskip-\Gm@rmargin% }% - \nointerlineskip - \vskip-0.2pt - \hbox to\textwidth{\hskip-\Gm@lmargin\pgfuseshading{beamer@topshade}\hskip-\Gm@rmargin} - \vskip-2pt + \vskip-2pt } - - \mode diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty index a9d821a44ac..c8aff5287ba 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty @@ -68,7 +68,7 @@ \usebeamerfont{author in head/foot}\insertshortauthor \end{beamercolorbox}% \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% - \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot} + \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot} \end{beamercolorbox}}% \vskip0pt% } -- cgit v1.2.3