diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-21 23:34:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-21 23:34:07 +0000 |
commit | 9ec5a0dd78d3a039a20d046c083e33a1e52cb377 (patch) | |
tree | 7f9f0e91867f9515c03563e92a0dfb7382fb361f /Master/texmf-dist/tex/latex/beamer | |
parent | c97246252f045d55b53d33ed13cb8ab54b22ce0b (diff) |
beamer (21feb18)
git-svn-id: svn://tug.org/texlive/trunk@46705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
31 files changed, 72 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index 3ff46d2613b..ea7f71450fc 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -11,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesClass{beamer} - [2018/01/27 v3.49 A class for typesetting presentations] + [2018/02/20 v3.50 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 2bc1b867b0a..ae77083abf5 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -11,7 +12,7 @@ % See the file doc/licenses/LICENSE for more details. \ProvidesPackage{beamerarticle} - [2018/01/27 v3.49 beamer input in article mode] + [2018/02/20 v3.50 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 a0f627f3372..965691b6e4a 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty index dab26bf59cf..37256614625 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty @@ -2,6 +2,7 @@ % Copyright 2010 by Vedran Mileti\'c % Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright % Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -553,8 +554,6 @@ {\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin} % Framenumbers in footline -\defbeamertemplate{page number in head/foot}{default}{} - \defbeamertemplate{page number in head/foot}{framenumber}{\insertframenumber} \defbeamertemplate{page number in head/foot}{totalframenumber}{\insertframenumber\,/\,\inserttotalframenumber} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty index dd0259b0501..9d037024411 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty index d11cd5dbf54..064046da488 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty index 15a19c8fbf7..2ef9d6966c3 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty index 5f9e6781598..2f24502810b 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty index 488db443f78..e8af2264193 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty @@ -1,7 +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 +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty index e58c7460cff..66f6e5314cf 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty @@ -2,6 +2,7 @@ % Copyright 2010 by Vedran Mileti\'c % Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright % Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty index 4a3f298ff75..f2322ee936d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty @@ -1,7 +1,6 @@ % 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 +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty index da3584cba0e..672e03520f5 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty index 57dfffeeaba..d68e0c0c15d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2016,2017 by Joseph Wright +% Copyright 2016 +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty index ff077bd4087..59886007c41 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasenavigation.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty index faf7d52ad14..6dc040785b6 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty index 5fff9c8eb9b..dd36e7419be 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty @@ -1,7 +1,6 @@ % Copyright 2003--2007 by Till Tantau -% Copyright 2010 by Vedran Mileti\'c % Copyright 2010--2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index 7c5d8cd356f..986fafea7e2 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -371,13 +371,14 @@ \newif\ifbeamer@inappendix \newcommand<>\beamer@appendix{} +\def\beamer@resetappendix{\global\let\appendix\beamer@appendix} \newcommand<>\appendix{% \beamer@inappendixtrue% \only#1{\part{\appendixname}% \immediate\write\@auxout{\string\@writefile{nav}% {\noexpand\headcommand{\noexpand\gdef\noexpand\insertmainframenumber{\the\c@framenumber}}}}% \addtocontents{nav}{\protect\headcommand{\protect\beamer@appendixpages{\the\c@page}}}% - \global\let\appendix\beamer@appendix}% + \beamer@resetappendix}% } \def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty index 50ce2961506..067c69f99ca 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau -% Copyright 2010 by Vedran Mileti\'c % Copyright 2010,2015 by Vedran Mileti\'c, Joseph Wright % Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty index cf591367cda..6618b7e1f56 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty @@ -1,7 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty index 4f7db093b61..8017e8ada31 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty @@ -1,7 +1,8 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2016 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty index 31870918715..46ba9eb8845 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamercolorthemedefault.sty @@ -1,5 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017--2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -170,7 +171,7 @@ \setbeamercolor{quotation}{} \setbeamercolor{quote}{parent=quotation} -\setbeamercolor{page number in head/foot}{fg=fg!50!bg} +\setbeamercolor{page number in head/foot}{parent=palette secondary} \setbeamercolor{qed symbol}{parent=structure} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerfontthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerfontthemedefault.sty index b962b0b31dc..b1bbfc640e1 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerfontthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerfontthemedefault.sty @@ -1,5 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017--2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -35,6 +36,8 @@ \setbeamerfont{date in head/foot}{} \setbeamerfont{date in sidebar}{} +\setbeamerfont{page number in head/foot}{} + \setbeamerfont{part name}{size=\LARGE} \setbeamerfont{part title}{size=\LARGE,parent=title} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty index 487ce2a04f9..6dd4455ecdb 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty @@ -1,6 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemerounded.sty b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemerounded.sty index 2c339daadc4..6d742fc12e7 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemerounded.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemerounded.sty @@ -19,5 +19,7 @@ \setbeamertemplate{sections/subsections in toc}[ball] \setbeamertemplate{title page}[default][colsep=-4bp,rounded=true,shadow=\beamer@themerounded@shadow] \setbeamertemplate{part page}[default][colsep=-4bp,rounded=true,shadow=\beamer@themerounded@shadow] +\setbeamertemplate{section page}[default][colsep=-4bp,rounded=true,shadow=\beamer@themerounded@shadow] +\setbeamertemplate{subsection page}[default][colsep=-4bp,rounded=true,shadow=\beamer@themerounded@shadow] \mode<all> diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty index 2caaa430361..253313c2c95 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty @@ -1,5 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -93,8 +94,9 @@ {\color{fg!#1!bg}\usebeamertemplate{subsubsection in head/foot}} - - +% Page numbers in head/foot +\defbeamertemplate*{page number in head/foot}{default} +{} % Headline and footline diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty index 01f67aecaea..a72c3738e63 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty @@ -1,6 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017 by Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -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} + \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 a753cb2a63e..548243c8995 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthememiniframes.sty @@ -24,7 +24,10 @@ leftskip=.3cm,rightskip=.3cm plus1fil]{author in head/foot}% \leavevmode{\usebeamerfont{author in head/foot}\insertshortauthor}% \hfill% - {\usebeamerfont{institute in head/foot}\usebeamercolor[fg]{institute in head/foot}\insertshortinstitute}% + {\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}% + }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} \end{beamercolorbox} @@ -39,7 +42,10 @@ leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% \leavevmode{\usebeamerfont{title in head/foot}\insertshorttitle}% \hfill% - {\usebeamerfont{author in head/foot}\usebeamercolor[fg]{author in head/foot}\insertshortauthor}% + {\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}% + }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} \end{beamercolorbox} @@ -54,7 +60,10 @@ leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% \leavevmode{\usebeamerfont{title in head/foot}\insertshorttitle}% \hfill% - {\usebeamerfont{institute in head/foot}\usebeamercolor[fg]{institute in head/foot}\insertshortinstitute}% + {\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}% + }% \end{beamercolorbox}% \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot} \end{beamercolorbox} @@ -73,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}% + {\usebeamerfont{title in head/foot}\insertshorttitle}\hfill{\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/beamerouterthemesidebar.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty index bcb80c36429..0b456525d0f 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty @@ -1,5 +1,6 @@ % Copyright 2007 by Till Tantau % Copyright 2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesplit.sty index 7f26c4d4d71..a9d821a44ac 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 + \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot} \end{beamercolorbox}}% \vskip0pt% } diff --git a/Master/texmf-dist/tex/latex/beamer/beamerpatchparalist.sty b/Master/texmf-dist/tex/latex/beamer/beamerpatchparalist.sty index a4cf82cf4bb..7853b36d704 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerpatchparalist.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerpatchparalist.sty @@ -1,3 +1,12 @@ +% Copyright 2017,2018 by Louis Stuart, Joseph Wright +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/licenses/LICENSE for more details. + \mode<presentation> \if@plnewitem diff --git a/Master/texmf-dist/tex/latex/beamer/multimedia.sty b/Master/texmf-dist/tex/latex/beamer/multimedia.sty index d090434ebde..5a0f21a01dd 100644 --- a/Master/texmf-dist/tex/latex/beamer/multimedia.sty +++ b/Master/texmf-dist/tex/latex/beamer/multimedia.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017,2018 by Louis Stuart, Joseph Wright % % This file may be distributed and/or modified % @@ -18,6 +19,7 @@ \RequirePackage{ifpdf} \ifx\directlua\@undefined + \let\beamer@pdfpageattr\pdfpageattr \let\beamer@pdfobj\pdfobj \let\beamer@pdfrefobj\pdfrefobj \let\beamer@pdflastobj\pdflastobj @@ -25,6 +27,7 @@ \let\beamer@pdfstartlink\pdfstartlink \let\beamer@pdfendlink\pdfendlink \else % + \edef\beamer@pdfpageattr{\pdfvariable pageattr} \protected\def\beamer@pdfobj{\pdfextension obj } \protected\def\beamer@pdfrefobj{\pdfextension refobj } \protected\def\beamer@pdflastobj{\numexpr\pdffeedback lastobj\relax} |