summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-21 22:48:59 +0000
committerKarl Berry <karl@freefriends.org>2022-01-21 22:48:59 +0000
commit7e5007eab3107fa4ad6a70beb002fe0bb541ef52 (patch)
treed292f73c876265db3b6b8d910b3be7772d614bf8 /Master/texmf-dist/tex/latex/beamer
parent5452f31177703a5cefb54841ad54a94d3043304f (diff)
beamer (21jan22)
git-svn-id: svn://tug.org/texlive/trunk@61684 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls18
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerarticle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty45
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty20
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty20
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty31
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty19
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty7
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty14
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/multimedia.sty2
11 files changed, 123 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index ed9def11566..2a831704f5a 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}
- [2021/10/18 v3.64 A class for typesetting presentations]
+ [2022/01/21 v3.65 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
@@ -88,6 +88,7 @@
\newif\ifbeamer@frameswithnotesonly
\newif\ifbeamer@ignorenonframe
\newif\ifbeamer@autopdfinfo
+\newif\ifbeamer@onlytextwidth
% Option management
\RequirePackage{beamerbaseoptions}
@@ -107,6 +108,7 @@
\beamer@frameswithnotesonlyfalse
\beamer@ignorenonframefalse
\beamer@autopdfinfotrue
+\beamer@onlytextwidthfalse
\DeclareOptionBeamer{usepdftitle}[true]{\csname beamer@autopdfinfo#1\endcsname}
\DeclareOptionBeamer{envcountsect}{\beamer@countsecttrue}
@@ -169,6 +171,8 @@
\lccode`\~=\count@
\catcode\count@=\active
\lowercase{\def~{\kern1ex}}}}}
+
+\DeclareOptionBeamer{onlytextwidth}{\beamer@onlytextwidthtrue}
% obsolete options
\DeclareOptionBeamer{notes}[show]{\csname beamer@notesaction@#1\endcsname}
@@ -322,6 +326,14 @@
\else\ifnum#1=141 %
\setlength\beamer@paperwidth{14.85cm}%
\setlength\beamer@paperheight{10.50cm}%
+ \else
+ \setlength\beamer@paperheight{9.60cm}%
+ \ifnum#1<1000%
+ \pgfmathparse{(#1-mod(#1,10))/10.0/mod(#1,10)}%
+ \else%
+ \pgfmathparse{(#1-mod(#1,100))/100.0/mod(#1,100)}%
+ \fi%
+ \setlength\beamer@paperwidth{\pgfmathresult\beamer@paperheight}%
\fi\fi\fi\fi\fi\fi\fi\fi
}
@@ -338,6 +350,9 @@
% Process Options
%
+% before processing beamer options for \pgfmathparse
+\RequirePackage{pgfcore}
+
\ExecuteOptionsBeamer{c}
\ProcessOptionsBeamer
@@ -348,7 +363,6 @@
\beamer@filterclassoptions
% Low-level graphic drawing and advanced color support.
-\RequirePackage{pgfcore}
\RequirePackage{xxcolor}
% Normally loaded by hyperref but to be on the safe side ...
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
index e58341d73ed..2d21347c2c0 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}
- [2021/10/18 v3.64 beamer input in article mode]
+ [2022/01/21 v3.65 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 fa406004908..cf53f9544a9 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
@@ -142,7 +142,7 @@
color(0bp)=(pgftransparent!0);
color(8bp)=(pgftransparent!100)
}%
- \pgfdeclarehorizontalshading{bmb@shadowhorz\the\bmb@boxheight}{\bmb@boxheight-6bp}
+ \pgfdeclarehorizontalshading{bmb@shadowhorz\the\bmb@boxheight}{\bmb@boxheight-5.5bp}
{%
color(0bp)=(pgftransparent!0);
color(8bp)=(pgftransparent!100)
@@ -152,24 +152,31 @@
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}%
- \hskip4bp%
- }%
+ \begingroup%
+ \selectcolormodel{gray}
+ \pgfdeclarefading{bmb@shadowmask\the\bmb@boxwidth\the\bmb@boxheight}
+ {%
+ \begin{pgfpicture}
+ \pgftext[at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowball}}% bottom left shadow
+ \ifdim\bmb@boxheight>9.5bp%
+ \pgftext[at=\pgfpoint{\bmb@boxwidth}{8bp}]{\pgfuseshading{bmb@shadowballlarge}}% bottom right shadow
+ \pgftext[at=\pgfpoint{\bmb@boxwidth+4bp}{\bmb@boxheight+2bp}]{\pgfuseshading{bmb@shadowball}}% top right shadow
+ \pgftext[base, at=\pgfpoint{\bmb@boxwidth+4bp}{7.5bp}]{\pgfuseshading{bmb@shadowhorz\the\bmb@boxheight}}% right edge shadow
+ \else%
+ \pgftext[at=\pgfpoint{\bmb@boxwidth}{4bp}]{\pgfuseshading{bmb@shadowball}}% right shadow
+ \fi%
+ \pgftext[left, at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowvert\the\bmb@boxwidth}}% bottom edge
+ %
+ % clipping is needed because shadow is typeset on top of box
+ \begin{pgfscope}
+ \pgfsetcolor{black}
+ \pgfpathrectangle{\pgfpoint{4bp}{8.1bp}}{\pgfpoint{\bmb@boxwidth}{\bmb@boxheight-2bp}}
+ \pgfusepath{fill}
+ \end{pgfscope}
+ \end{pgfpicture}%
+ \hskip4bp%
+ }%
+ \endgroup%
\fi%
\bmb@temp=\bmb@width%
\bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index 83393f62dff..9c8b7932f94 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -84,23 +84,23 @@
\beamer@thc@prepcolor%
\beamer@thc@docolor{#2}%
\ifx\beamer@thc@fg\@empty%
- \@namelet{\string\color@ temp@fg}{\string\color@ fg}%
+ \colorlet{temp@fg}{fg}%
\else%
\colorlet{temp@fg}{\csname beamer@thc@fg\endcsname}%
\fi%
\ifx\beamer@thc@bg\@empty%
- \@namelet{\string\color@ temp@bg}{\string\color@ bg}%
+ \colorlet{temp@bg}{bg}%
\else%
\colorlet{temp@bg}{\csname beamer@thc@bg\endcsname}%
\fi%
- \@namelet{\string\color@ parent.fg}{\string\color@ fg}%
- \@namelet{\string\color@ parent.bg}{\string\color@ bg}%
- \@namelet{\string\color@ fg}{\string\color@ temp@fg}%
- \@namelet{\string\color@ bg}{\string\color@ temp@bg}%
- \begingroup%
- \global\@namelet{\string\color@ #2.fg}{\string\color@ temp@fg}%
- \global\@namelet{\string\color@ #2.bg}{\string\color@ temp@bg}%
- \endgroup%
+ \colorlet{parent.fg}{fg}%
+ \colorlet{parent.bg}{bg}%
+ \colorlet{fg}{temp@fg}%
+ \colorlet{bg}{temp@bg}%
+ \globalcolorstrue
+ \colorlet{#2.fg}{temp@fg}%
+ \colorlet{#2.bg}{temp@bg}%
+ \globalcolorsfalse
\def\beamer@temp{#1}%
\ifx\beamer@temp\@empty%
\else%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index bda14b5d5a9..1bbc1b9e5b8 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -270,6 +270,12 @@
\beamer@frametopskipautobreak=\beamer@frametopskip\relax%
\beamer@framebottomskipautobreak=\beamer@framebottomskip\relax%
}
+\define@key{beamerframe}{s}[true]{% stretch
+ \beamer@frametopskip=0pt\relax%
+ \beamer@framebottomskip=0pt plus 0.001fill\relax%
+ \beamer@frametopskipautobreak=\beamer@frametopskip\relax%
+ \beamer@framebottomskipautobreak=\beamer@framebottomskip\relax%
+}
\newif\ifbeamer@noframenumbering
@@ -405,6 +411,8 @@
\def\beamer@defaultospec{#2}%
\@ifnextchar[{\beamer@@@@frame<#1>}{\beamer@@@@frame<#1>[]}}
+\def\beamer@testzero{0}
+
\newdimen\framewidth
\def\beamer@frame<#1>{
\@ifnextchar[{\beamer@@@frame<#1>}{\beamer@@@frame<#1>[]}}
@@ -434,12 +442,14 @@
\setkeys{beamerframe}{environment=frame}%
\setkeys{beamerframe}{#2}%
\beamer@frametemplate%
- \ifbeamer@noframenumbering%
- \ifbeamer@isfragile%Fragile frames will be processed twice
- \stepcounter{framenumber}%
- \fi%
- \else%
+ \ifbeamer@isfragile%Fragile frames will be processed twice
\stepcounter{framenumber}%do not set \label here - it interferes with AtBegin*
+ \else%
+ \ifx\beamer@whichframes\beamer@testzero\else
+ \ifbeamer@noframenumbering\else%
+ \stepcounter{framenumber}%do not set \label here - it interferes with AtBegin*
+ \fi%
+ \fi%
\fi%
{\let\@elt\beamer@savecounter\beamer@overlaycounterresets}
\gdef\beamer@framestartpage{}%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
index d4437e81fe6..a5cc88164e9 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
@@ -205,19 +205,24 @@
\newenvironment<>{columns}[1][]{%
\begin{actionenv}#2%
- \def\beamer@colentrycode{%
- \hbox to\textwidth\bgroup%
- \leavevmode%
- \hskip-\beamer@leftmargin%
- \nobreak%
- \beamer@tempdim=\textwidth%
- \advance\beamer@tempdim by\beamer@leftmargin%
- \advance\beamer@tempdim by\beamer@rightmargin%
- \hbox to\beamer@tempdim\bgroup%
- \hbox{}\hfill\ignorespaces}%
- \def\beamer@colexitcode{\egroup%
- \nobreak%
- \hskip-\beamer@rightmargin\egroup}%
+ \ifbeamer@onlytextwidth
+ \def\beamer@colentrycode{\hbox to\textwidth\bgroup\ignorespaces}%
+ \def\beamer@colexitcode{\unskip\egroup}
+ \else%
+ \def\beamer@colentrycode{%
+ \hbox to\textwidth\bgroup%
+ \leavevmode%
+ \hskip-\beamer@leftmargin%
+ \nobreak%
+ \beamer@tempdim=\textwidth%
+ \advance\beamer@tempdim by\beamer@leftmargin%
+ \advance\beamer@tempdim by\beamer@rightmargin%
+ \hbox to\beamer@tempdim\bgroup%
+ \hbox{}\hfill\ignorespaces}%
+ \def\beamer@colexitcode{\egroup%
+ \nobreak%
+ \hskip-\beamer@rightmargin\egroup}%
+ \fi%
\ifbeamer@centered\setkeys{beamer@col}{c}\else\setkeys{beamer@col}{t}\fi%
\setkeys{beamer@col}{#1}%
\par%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
index 94ab6414823..0cac2fd8ad6 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
@@ -50,8 +50,23 @@
\setkeys{beamerzoom}{#3}%
\only<#1>{%
{\hypersetup{pdfhighlight={/P},pdfborder={0 0 \beamer@zoomborderwidth}}%
- \global\setbox\@tempboxa=\vbox{\hyperlink{\beamer@labelzoomed}{\vbox to #7{\hbox
- to#6{\hfil}\vfil}}}}%
+ \global\setbox\@tempboxa=\vbox{\hyperlink{\beamer@labelzoomed}{%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \vbox to #7{%
+ \hbox to#6{\hfil}%
+ \vfil%
+ }%
+ \else%
+ \begingroup%
+ \normalsize%
+ \begin{pgfpicture}{0pt}{0pt}{#6}{#7}%
+ \pgfsetfillopacity{0}
+ \pgftext[x=0cm,y=3pt]{.}
+ \pgftext[x=#6,y=\dimexpr#7-\baselineskip+3pt]{.}
+ \end{pgfpicture}%
+ \endgroup%
+ \fi%
+ }}}%
\ht\@tempboxa=0pt%
\wd\@tempboxa=0pt%
\dp\@tempboxa=0pt%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
index 6dd4455ecdb..72ffd67c735 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
@@ -210,9 +210,10 @@
% Alerted text
-\defbeamertemplate*{alerted text begin}{default}{\setbeamercolor{local structure}{parent=alerted text}}
-
-
+\defbeamertemplate*{alerted text begin}{default}{%
+ \setbeamercolor{local structure}{parent=alerted text}%
+ \setbeamercolor{item}{fg=alerted text.fg}%
+}
% Structured text
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty
index dac39b1ffb0..3113bfb92ad 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemedefault.sty
@@ -18,16 +18,26 @@
{mini frame,mini frame in current section,mini frame in current subsection}
{}
+\newcommand{\beamer@xelatex@fixminiframes}{%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \else
+ \pgfsetfillopacity{0}
+ \pgftext[x=0cm,y=0.0cm]{.}
+ \pgftext[x=0.1cm,y=0.1cm]{.}
+ \fi
+}
+
\defbeamertemplate*{mini frame}{default}
{%
\begin{pgfpicture}{0pt}{0pt}{0.1cm}{0.1cm}
\pgfpathcircle{\pgfpoint{0.05cm}{0.05cm}}{0.05cm}
\pgfusepath{fill,stroke}
+ \beamer@xelatex@fixminiframes
\end{pgfpicture}%
}
[action]
{
- \setbeamersize{mini frame size=.14cm,mini frame offset=.03cm}
+ \setbeamersize{mini frame size=.14cm,mini frame offset=-0.01cm}
}
\defbeamertemplate*{mini frame in current section}{default}
@@ -35,6 +45,7 @@
\begin{pgfpicture}{0pt}{0pt}{0.1cm}{0.1cm}
\pgfpathcircle{\pgfpoint{0.05cm}{0.05cm}}{0.05cm}
\pgfusepath{stroke}
+ \beamer@xelatex@fixminiframes
\end{pgfpicture}%
}
@@ -43,6 +54,7 @@
\begin{pgfpicture}{0pt}{0pt}{0.1cm}{0.1cm}
\pgfpathcircle{\pgfpoint{0.05cm}{0.05cm}}{0.05cm}
\pgfusepath{stroke}
+ \beamer@xelatex@fixminiframes
\end{pgfpicture}%
}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty
index 8c3f835cbf2..97ed4f5d4e0 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemesidebar.sty
@@ -11,7 +11,9 @@
\let\beamer@storesize\@currsize
\newdimen\beamer@sidebarwidth
+\def\beamersidebarwidth{\beamer@sidebarwidth}
\newdimen\beamer@headheight
+\def\beamerheadheight{\beamer@headheight}
\usebeamerfont{frametitle}
\beamer@sidebarwidth=2.5\baselineskip
\beamer@headheight=2.5\baselineskip
diff --git a/Master/texmf-dist/tex/latex/beamer/multimedia.sty b/Master/texmf-dist/tex/latex/beamer/multimedia.sty
index 5a0f21a01dd..b5ca8ebaadd 100644
--- a/Master/texmf-dist/tex/latex/beamer/multimedia.sty
+++ b/Master/texmf-dist/tex/latex/beamer/multimedia.sty
@@ -231,7 +231,7 @@
\else%
\ifmm@inline%
\beamer@pdfobj stream
- attr {/Type /Sound \mm@r\space \mm@c\space \mm@b\space}
+ attr {/Type /Sound \mm@r\space \mm@c\space \mm@b\space \mm@e\space}
file {#3}%
\beamer@pdfrefobj \beamer@pdflastobj%
\else