summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-12-15 03:01:41 +0000
committerNorbert Preining <norbert@preining.info>2020-12-15 03:01:41 +0000
commit2e0b1124510825b03d99a6bfbf50dc2a8391a635 (patch)
tree6ebb25de75664b553d91d7335dec42590ba22002 /macros/latex/contrib/beamer/base
parent5fc9e4626c1b64fd01838f967954fc43a268398e (diff)
CTAN sync 202012150301
Diffstat (limited to 'macros/latex/contrib/beamer/base')
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls2
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseboxes.sty146
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecolor.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasefont.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty24
-rw-r--r--macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty7
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty46
8 files changed, 103 insertions, 128 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 376c5d7aa9..c776f7d4d3 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}
- [2020/07/22 v3.59 A class for typesetting presentations]
+ [2020/11/26 v3.60 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 90b6b97afc..8cc1969bc6 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}
- [2020/07/22 v3.59 beamer input in article mode]
+ [2020/11/26 v3.60 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/beamerbaseboxes.sty b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
index ee3ecd9064..566393c88f 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
+++ b/macros/latex/contrib/beamer/base/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\the\bmb@boxheight}{\bmb@boxheight-6bp}
+ {%
+ color(0bp)=(pgftransparent!0);
+ color(8bp)=(pgftransparent!100)
+ }%
+ \pgfdeclareverticalshading{bmb@shadowvert\the\bmb@boxwidth}{\bmb@boxwidth-4bp}
+ {%
+ color(0bp)=(pgftransparent!100);
+ color(8bp)=(pgftransparent!0)
+ }%
+ \pgfdeclarefading{bmb@shadowmask\the\bmb@boxwidth\the\bmb@boxheight}
+ {%
+ \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\the\bmb@boxwidth}}
+ \pgftext[base, at=\pgfpoint{\bmb@boxwidth+4bp}{8bp}]{\pgfuseshading{bmb@shadowhorz\the\bmb@boxheight}}
+ %
+ % 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\the\bmb@boxwidth\the\bmb@boxheight}{%
+ \pgftransformshift{\pgfpoint{0.5\bmb@boxwidth+6bp}{0.5\bmb@boxheight-4bp}}}
+ \pgfusepath{fill}
+ \end{pgfscope}
\fi%
\unhbox\bmb@colorbox%
\pgfpathqmoveto{-4bp}{1bp}
@@ -179,47 +191,11 @@
{\pgfpoint{\the\bmb@dimb}{-1.2bp}}%
{\pgfpoint{\the\bmb@dimb}{1bp}}%
{
- \bmb@dima=\ht\bmb@box%
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \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}
+ \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+ \pgfusepath{fill}
}
- \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/macros/latex/contrib/beamer/base/beamerbasecolor.sty b/macros/latex/contrib/beamer/base/beamerbasecolor.sty
index 6818db39bd..83393f62df 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecolor.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecolor.sty
@@ -214,7 +214,7 @@
\hskip-\beamer@colbox@colseps%
}\fi%
\ifdim\wd\beamer@tempbox>\textwidth%
- \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@leftmargin\relax}%
+ \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@rightmargin\relax}%
\fi%
\box\beamer@tempbox%
\fi%
diff --git a/macros/latex/contrib/beamer/base/beamerbasefont.sty b/macros/latex/contrib/beamer/base/beamerbasefont.sty
index 1a611e3f92..01fdd9b6bb 100644
--- a/macros/latex/contrib/beamer/base/beamerbasefont.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasefont.sty
@@ -176,7 +176,7 @@
<3><4><5><6><7><8><9>cmssbx10%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmssbx10%
}{}
-
+\DeclareFontShape{OT1}{cmss}{b}{n}{<->ssub * cmss/bx/n}{}
\newcommand*{\beamer@font@check}{%
\def\beamer@cmr{cmr}%
diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
index c0d85832b5..453275f6b4 100644
--- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
@@ -503,19 +503,23 @@
\mode<presentation>{\setbeamertemplate{bibliography item}{\insertbiblabel}}}
\csappto{blx@filehook@postload@authoryear.bbx}{%
\mode<presentation>{%
- \newlength{\beamer@bibiconwidth}
- \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}
- \setlength{\labelwidth}{-\beamer@bibiconwidth}
- \addtolength{\labelwidth}{2\labelsep}
- \addtolength{\bibhang}{\labelsep}
+ \pretocmd{\bibsetup}{%
+ \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<presentation>{%
- \newlength{\beamer@bibiconwidth}
- \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}
- \setlength{\labelwidth}{-\beamer@bibiconwidth}
- \addtolength{\labelwidth}{2\labelsep}
- \addtolength{\bibhang}{\labelsep}
+ \pretocmd{\bibsetup}{%
+ \newlength{\beamer@bibiconwidth}%
+ \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}%
+ \setlength{\labelwidth}{-\beamer@bibiconwidth}%
+ \addtolength{\labelwidth}{2\labelsep}%
+ \addtolength{\bibhang}{\labelsep}%
+ }{}{}%
}}
diff --git a/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty b/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty
index 534d3cd9d7..276dab1075 100644
--- a/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty
+++ b/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty
@@ -52,11 +52,10 @@
{\leavevmode%
\inserttocsubsubsection\par\vskip.5ex}
-
\def\inserttitleindicator{}
-\def\insertauthorindicator{Who?}
-\def\insertinstituteindicator{From?}
-\def\insertdateindicator{When?}
+\def\insertauthorindicator{\translate{Who?}}
+\def\insertinstituteindicator{\translate{From?}}
+\def\insertdateindicator{\translate{When?}}
\defbeamertemplate*{title page}{inmargin}
{
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty
index 9e4385341d..de2c9775cb 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/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%
@@ -61,23 +64,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
<all>