summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-02 21:14:31 +0000
committerKarl Berry <karl@freefriends.org>2018-09-02 21:14:31 +0000
commit9583cf8867af613f1621b137c8c6d333b7a778d6 (patch)
tree068604e86fa3ae45161962b9f750bb7b84c35620
parent3f5c36c82f7e0184c17f0d2674d6bb0618cb1aeb (diff)
beamer (2sep18)
git-svn-id: svn://tug.org/texlive/trunk@48547 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/beamer/CHANGELOG.md11
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdfbin194232 -> 151133 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdfbin352674 -> 360756 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdfbin324224 -> 324224 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.pdfbin1642186 -> 1610968 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.tex2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerarticle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty142
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty20
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty4
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty46
12 files changed, 131 insertions, 98 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
index e004a7a055e..6da02fb898d 100644
--- a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
@@ -8,9 +8,15 @@ a major and minor version only.
## [Unreleased]
+## [v3.52]
+
+### Fixed
+- Behaviour of `\inst` (see #489)
+- Incorrect shadows when using DVI routes (see #492)
+
## [v3.51]
-## Changed
+### Changed
- Add `\include` and `\input` to commands respected in 'skipping' mode
- Dynamically calculate note page size (see #487)
@@ -22,5 +28,6 @@ a major and minor version only.
- Support for `noxcolor` with `beamerarticle` (see #483)
- Treatment of mixed overlay/alert specifications
-[Unreleased]: https://github.com/josephwright/beamer/compare/v3.51...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.52...HEAD
+[v3.52]: https://github.com/josephwright/beamer/compare/v3.51...v3.52
[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 cd742e46d7a..4eb253ceb01 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
Binary files 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 aa766cdc22e..97638d999b4 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
Binary files 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 aee8350b4ce..282d0cbcc93 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
index a8a384735d0..19b3b01df60 100644
--- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
index 17e38de2534..d74363a7088 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.51}
+\def\beamerugversion{3.52}
\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 c8c06eaa4e2..1e9f3fd47b0 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/08/22 v3.51 A class for typesetting presentations]
+ [2018/09/02 v3.52 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 900545fda81..89c0fdf1bd5 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/08/22 v3.51 beamer input in article mode]
+ [2018/09/02 v3.52 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/beamerbaseboxes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
index 1ca4ebc6aba..ee3ecd90647 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
-\newdimen\bmb@boxwidth
-\newdimen\bmb@boxheight
-\newdimen\bmb@prevheight
+\newbox\bmb@boxshadow
+\newbox\bmb@boxshadowball
+\newbox\bmb@boxshadowballlarge
\newdimen\bmb@temp
\newdimen\bmb@dima
\newdimen\bmb@dimb
@@ -110,6 +110,11 @@
\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%
@@ -121,66 +126,49 @@
\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@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@temp=\wd\bmb@box%
\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%
- \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}
+ {\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}
\fi%
\unhbox\bmb@colorbox%
\pgfpathqmoveto{-4bp}{1bp}
@@ -196,6 +184,42 @@
\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%
}%
@@ -207,7 +231,17 @@
\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 3d649127044..8d21e3246c3 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -148,7 +148,6 @@
\newif\ifbeamer@colbox@rounded
\newif\ifbeamer@colbox@ignorebg
-\newdimen\beamer@bg@ht \newdimen\beamer@bg@wd \newdimen\beamer@bg@dp
\newenvironment{beamercolorbox}[2][]{%
\def\beamer@vmode{\leavevmode}%
@@ -208,17 +207,16 @@
\box\beamer@tempbox%
\fi%
\else%
- \beamer@bg@ht=\ht\beamer@tempbox\relax\beamer@bg@dp=\dp\beamer@tempbox\relax\beamer@bg@wd=\wd\beamer@tempbox\relax%
\setbox\beamer@tempbox=\hbox{%
- \if@tempswa%
- \ifdim\beamer@colbox@colseps>\z@%
- \advance\beamer@bg@wd\beamer@colbox@colseps\advance\beamer@bg@wd\beamer@colbox@colseps%
-% \advance\beamer@bg@ht\beamer@colbox@colseps\advance\beamer@bg@dp\beamer@colbox@colseps%
- \hskip-\beamer@colbox@colseps\fi%
- \usebeamercolor{\beamer@colbox@color}%
- \rlap{\color@begingroup\color{bg}\vrule\@width\beamer@bg@wd\@height\beamer@bg@ht\@depth\beamer@bg@dp\color@endgroup}%
- \ifdim\beamer@colbox@colseps>\z@\hskip\beamer@colbox@colseps\fi%
- \fi\box\beamer@tempbox}%
+ \usebeamercolor{\beamer@colbox@color}%
+ \hskip-\beamer@colbox@colseps%
+ \fboxsep=\z@\colorbox{bg}{%
+ \hskip\beamer@colbox@colseps%
+ \box\beamer@tempbox%
+ \hskip\beamer@colbox@colseps%
+ }%
+ \hskip-\beamer@colbox@colseps%
+ }%
\ifdim\wd\beamer@tempbox>\textwidth%
\setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@leftmargin\relax}%
\fi%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
index 067c69f99ca..63a55123fbb 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
@@ -237,7 +237,7 @@
\def\beamer@shortinstitute{#1}}
\institute{}
-\def\beamer@instinst#1{{\donotcoloroutermaths$^{#1}$}\ignorespaces}
+\def\beamer@instinst#1{\textsuperscript{#1}\ignorespaces}
\def\beamer@andinst{\\[1em]}
\newcommand\insertshortinstitute[1][]{%
@@ -261,7 +261,7 @@
\fi
\providecommand\and{\unskip, }
- \providecommand\inst[1]{$^{#1}$}
+ \providecommand\inst[1]{\textsuperscript{#1}}
}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty
index 80db372d414..03bbad214c8 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeshadow.sty
@@ -12,33 +12,30 @@
\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)}
-\pgfdeclareverticalshading{beamer@topshade}{2\paperwidth}{%
- color(0pt)=(pgftransparent!100);
- color(8pt)=(pgftransparent!0)
+\AtBeginDocument{
+ \pgfdeclareverticalshading{beamer@topshade}{\paperwidth}{%
+ color(0pt)=(bg);
+ color(4pt)=(black!50!bg)}
}
-\pgfdeclarefading{beamer@topshadowmask}{\pgfuseshading{beamer@topshade}}
-
\addtobeamertemplate{headline}
{}
{%
- \vskip0pt
- \begin{pgfpicture}
- \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{4pt}}%
- \pgfsetfading{beamer@topshadowmask}{}%
- \pgfusepath{fill}%
- \end{pgfpicture}
+ \vskip-0.2pt
+ \pgfuseshading{beamer@topshade}
\vskip-2pt
}
+
\defbeamertemplate*{frametitle}{shadow theme}
{%
\nointerlineskip%
@@ -66,26 +63,23 @@
\beamer@tempdim=\ht\beamer@tempbox%
\advance\beamer@tempdim by 2pt%
\begin{pgfpicture}{0pt}{0pt}{\paperwidth}{\beamer@tempdim}
- \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}
+ \usebeamercolor{frametitle right}
+ \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}}
+ \pgfusepath{clip}
+ \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}}
\end{pgfpicture}
\hskip-\paperwidth%
\box\beamer@tempbox%
}%
\hskip-\Gm@rmargin%
}%
- \vskip-2pt
+ \nointerlineskip
+ \vskip-0.2pt
+ \hbox to\textwidth{\hskip-\Gm@lmargin\pgfuseshading{beamer@topshade}\hskip-\Gm@rmargin}
+ \vskip-2pt
}
+
+
\mode
<all>