diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-21 22:48:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-21 22:48:59 +0000 |
commit | 7e5007eab3107fa4ad6a70beb002fe0bb541ef52 (patch) | |
tree | d292f73c876265db3b6b8d910b3be7772d614bf8 /Master | |
parent | 5452f31177703a5cefb54841ad54a94d3043304f (diff) |
beamer (21jan22)
git-svn-id: svn://tug.org/texlive/trunk@61684 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
22 files changed, 283 insertions, 92 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md index 35d499eb0b0..cc44d05103a 100644 --- a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md @@ -8,6 +8,27 @@ a major and minor version only. ## [Unreleased] +## [v3.65] + +### Added + +- adding new `onlytextwidth` class option to use this key for all `columns` environments by default (see #731) +- adding new stretchable frame option `s` (see #696) +- adding user-accessible commands for `\beamersidebarwidth` and `\beamerheadheight` (see #537) +- allow custom values for `aspectratio` option (see #549) + +### Fixed + +- using `gray` colormodel for the delcarartion of fadings (workaround for #718) +- fixed bullet colour of alerted items for custom item colour (see #735) +- workaround to make miniframes clickable in xelatex (see #332) +- added missing encoding value to multimedia sound macro (see #607) +- imporoved problem with shadow of blocks without title (see #647) +- reduced artefacts in poppler based viewers for shadow blocks (see #647) +- workaround to make `\framezoom` clickable in xelatex (see #619) +- exclude invisible frames from being counted (see #592) +- fixed cut off miniframes for 8pt and 9pt (see #752) + ## [v3.64] ### Added @@ -165,7 +186,8 @@ 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.64...HEAD +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.65...HEAD +[v3.65]: https://github.com/josephwright/beamer/compare/v3.64...v3.65 [v3.64]: https://github.com/josephwright/beamer/compare/v3.63...v3.64 [v3.63]: https://github.com/josephwright/beamer/compare/v3.62...v3.63 [v3.62]: https://github.com/josephwright/beamer/compare/v3.61...v3.62 diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf Binary files differindex 09da4c74c6a..18854724fbf 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf +++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf 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 Binary files differindex 95425d5d642..944799cbdd0 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 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 Binary files differindex caadeb41cc2..49ed6ecdff1 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 diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex index de4449ad7da..60848464323 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex @@ -146,6 +146,8 @@ A presentation consists of a series of frames. Each frame consists of a series o \item \declare{|b|}, \declare{|c|}, \declare{|t|} will cause the frame to be vertically aligned at the bottom/center/top. This overrides the global placement policy, which is governed by the class options |t| and |c|. \item + \declare{|s|} will cause the content of the frame to be distributed vertically across the whole frame. For a reasonable usage of the option, the user has to add ``stretchable'' material to the frame content, e.g. |\vfill| or similar macros. + \item \declare{|noframenumbering|} tells \beamer\ not to step the |framenumber| counter for this frame. \item \declare{|fragile|\opt{|=singleslide|}} tells \beamer\ that the frame contents is ``fragile.'' This means that the frame contains text that is not ``interpreted as usual.'' For example, this applies to verbatim text, which is, obviously, interpreted somewhat differently from normal text. @@ -293,7 +295,99 @@ Each frame consists of several components: \item some frame contents. \end{enumerate} -A frame need not have all of these components. Usually, the first three components are automatically setup by the theme you are using. +A frame need not have all of these components. Usually, the first three components are automatically setup by the theme you are using. +Figure \ref{fig:framelayers} shows an overview of the order in which the different components are drawn. + +\begin{figure}[htbp] +% the following code is based on https://gist.githubusercontent.com/loopspace/c37dd788b217f2e963587278c3532f73/raw/f6e4708f36f661193ea7aed3cba7d389226658cc/beamerframe.tex +\begin{tikzpicture}[z={(0.97,0)},x={(.55,.4)}] + +% colour palette generated by mycolor.space to match beamer's beamer@blendedblue +\definecolor{fc_col1}{HTML}{3333b3} +\definecolor{fc_col2}{HTML}{b1a3d9} +\definecolor{fc_col3}{HTML}{fffade} +\definecolor{fc_col4}{HTML}{68baa5} +\definecolor{fc_col5}{HTML}{ae0000} + +\colorlet{base}{fc_col3} +\colorlet{background canvas}{base} +\colorlet{logo bg}{fc_col1} +\colorlet{sidebar left}{fc_col4} +\colorlet{sidebar right}{fc_col4} +\colorlet{section in sidebar}{fc_col5} +\colorlet{logo fg}{white} +\colorlet{footline}{fc_col2} +\colorlet{navigation symbols}{fc_col1} + +\pgfmathsetmacro{\bepgw}{12.8} +\pgfmathsetmacro{\bepgh}{9.6} +\newcommand{\component}[3][1]{% +\path (#2) [draw,<-,thick] -- (#2 |- 0,-\bepgh-#1,0) node[below,text width=2cm,align=center] (#3) {#3}; +\stepcounter{zlayer}} +\newcounter{zlayer} +\setcounter{zlayer}{0} +\def\zlayer{\the\value{zlayer}} + +\foreach \z in {0,...,10} { + \draw[gray,ultra thick] (0,-\bepgh,\z) -- (\bepgw,-\bepgh,\z) -- (\bepgw,0,\z); +} + +% background canvas +\fill[background canvas] (0,0,\zlayer) -- ++(\bepgw,0,0) -- ++(0,-\bepgh,0) -- ++(-\bepgw,0,0) -- cycle; +\component[1]{1,-\bepgh,\zlayer}{background canvas} + +% background +\draw[gray] \foreach \x in {0,...,\bepgw} \foreach \y in {0,...,\bepgh} {(\x,0,\zlayer) -- (\x,-\bepgh,\zlayer) (0,-\y,\zlayer) -- (\bepgw,-\y,\zlayer)}; +\component[2]{1,-\bepgh,\zlayer}{background} + +% left sidebar +\fill[sidebar left] (0,0,\zlayer) -- ++(2,0,0) -- ++(0,-\bepgh,0) -- ++(-2,0,0) -- cycle; +\component[3]{1,-\bepgh,\zlayer}{sidebar canvas left} + +% section in sidebar +\node[yslant=.7,right,align=left,text=section in sidebar,font=\sffamily] at (0,-.45*\bepgh,\zlayer) (a section in sidebar) {First slide \\ Second slide \\ Third slide}; +\component[1]{1,-\bepgh,\zlayer}{section in sidebar} + +% right sidebar +\fill[sidebar right] (\bepgw,0,\zlayer) -- ++(-2,0,0) -- ++(0,-\bepgh,0) -- ++(2,0,0) -- cycle; +\component[2]{1,-\bepgh,\zlayer}{sidebar canvas right} + +% section in right sidebar +\node[yslant=.7,left,align=right,text=section in sidebar,font=\sffamily] at (\bepgw,-.45*\bepgh,\zlayer) (a section in right sidebar) {First slide \\ Second slide \\ Third slide}; +\component[3]{1,-\bepgh,\zlayer}{section in right sidebar} + +%navigation +\node[yslant=.7,above left,align=right,text=navigation symbols,font=\sffamily] at (\bepgw,-\bepgh,\zlayer) (navigation) {Navigation symbols}; +\component[1]{1,-\bepgh,\zlayer}{navigation symbols} + +% logo +\fill[logo bg] (0,0,\zlayer) -- ++(2,0,0) -- ++(0,-2,0) -- ++(-2,0,0) -- cycle; +\node[yslant=.7,text=logo fg,align=right,font=\sffamily] at (1,-1,\zlayer) {your\\ logo\\ here}; +\component[2]{1,-\bepgh,\zlayer}{logo} + +% headline +\fill[footline] (0,0,\zlayer) -- ++(\bepgw,0,0) -- ++(0,-1,0) -- ++(-\bepgw,0,0) -- cycle; +\node[yslant=.7,text=logo fg,align=left,font=\sffamily] at (1.5,-0.5,\zlayer) {Headline}; +\component[3]{1,-\bepgh,\zlayer}{headline} + +% content +\node[yslant=.7,left,align=left,text=black,font=\sffamily] at (3,-.45*\bepgh,\zlayer) (a section in right sidebar) {Content}; +\component[1]{1,-\bepgh,\zlayer}{frame content} + +% footline +\fill[footline] (0,-\bepgh,\zlayer) -- ++(\bepgw,0,0) -- ++(0,.5,0) -- ++(-\bepgw,0,0) -- cycle; +\component[2]{1,-\bepgh,\zlayer}{footline} + +\addtocounter{zlayer}{-1} + +\foreach \z in {0,...,\zlayer} { + \draw[gray,ultra thick] (0,-\bepgh,\z) -- (0,0,\z) -- (\bepgw,0,\z); +} + +\end{tikzpicture} +\caption{Diagram of the order in which the different frame components are drawn (Image originally created by \href{https://tex.stackexchange.com/a/27302}{Andrew Stacey})} +\label{fig:framelayers} +\end{figure} \subsubsection{The Headline and Footline} @@ -530,6 +624,8 @@ Adding a sidebar of a certain size, say 1\,cm, will make the main text 1\,cm nar Internally, the sidebars are typeset by showing them as part of the headline. The \beamer\ class keeps track of six dimensions, three for each side: the variables |\beamer@leftsidebar| and |\beamer@rightsidebar| store the (horizontal) sizes of the side bars, the variables |\beamer@leftmargin| and |\beamer@rightmargin| store the distance between sidebar and text, and the macros |\Gm@lmargin| and |\Gm@rmargin| store the distance from the edge of the paper to the edge of the text. Thus the sum |\beamer@leftsidebar| and |\beamer@leftmargin| is exactly |\Gm@lmargin|. Thus, if you wish to put some text right next to the left sidebar, you might write |\hskip-\beamer@leftmargin| to get there. +For convenience, the width of the sidebar and the height of its headline are accessible through the macros |\beamersidebarwidth| and |\beamerheadheight|, respectively. + \begin{element}{sidebar left}\yes\yes\yes \colorfontparents{sidebar} The template is used to typeset the left sidebar. As mentioned above, the size of the left sidebar is set using the command @@ -1152,6 +1248,17 @@ To change ``paper size'' and aspect ratio, you can use the following class optio Sets aspect ratio to 3:2, and frame size to 135\,mm by 90\,mm. \end{classoption} +\begin{classoption}{aspectratio=xxxx} + Allows the user to set their own aspect ratio. For the height of the resulting frame, the default value of 96\,mm is used and the width will be calculated accordingly to match the desired aspect ratio. + + The custom aspect ratio allows for two to four digits and will be interpreted as shown in the following examples: + \begin{itemize} + \item two digits: |aspectratio=42| as 4:2 + \item three digits: |aspectratio=137| as 13:7 (e.g. always in landscape format) + \item four digits: |aspectratio=1024| as 10:24 + \end{itemize} +\end{classoption} + Aside from using these options, you should refrain from changing the ``paper size.'' However, you \emph{can} change the size of the left and right margins, which default to 1\,cm. To change them, you should use the following command: \begin{command}{\setbeamersize\marg{options}} @@ -1197,3 +1304,5 @@ You can also specify the number of slides in the frame ``by hand.'' To do so, yo This command will create a frame containing four slides. The first will contain the text ``This is slide number~1,'' the second ``This is slide number~2,'' the third ``This is slide number~4,'' and the fourth ``This is slide number~5.'' A useful specification is just |<0>|, which causes the frame to have no slides at all. For example, |\begin{frame}<handout:0>| causes the frame to be suppressed in the handout version, but to be shown normally in all other versions. Another useful specification is |<beamer>|, which causes the frame to be shown normally in |beamer| mode, but to be suppressed in all other versions. + +Frames which are hidden with |<0>| behave like the |noframenumbering| option and will not be counted for the number of frames (this only applies if no mode is specified, e.g. not for |<all:0>|). diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex index 845ecda4dac..1f58012eac0 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex @@ -948,7 +948,9 @@ The main environment for creating columns is called |columns|. Inside this envir \item \declare{|c|} will cause the columns to be centered vertically relative to each other. Default, unless the global option |t| is used. \item - \declare{|onlytextwidth|} is the same as |totalwidth=\textwidth|. + \declare{|onlytextwidth|} is the same as |totalwidth=\textwidth|. This option can also be set for the whole document with the |onlytextwidth| class option: + \begin{classoption}{onlytextwidth} + \end{classoption} \item \declare{|t|} will cause the first lines of the columns to be aligned. Default if global option |t| is used. \item diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex index 728741b3174..eb9a23170dc 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex @@ -271,35 +271,20 @@ In addition to these modes, \beamer\ recognizes the following names for modes se \end{itemize} \begin{center} - \begin{pgfpicture} - \pgftransformshift{\pgfpoint{0cm}{0cm}} - \pgfnode{rectangle}{center}{|all|}{allnode}{} - \pgftransformshift{\pgfpoint{-2cm}{-1.25cm}} - \pgfnode{rectangle}{center}{|presentation|}{presentationnode}{} - \pgftransformshift{\pgfpoint{4cm}{0cm}} - \pgfnode{rectangle}{center}{|article|}{articlenode}{} - \pgftransformshift{\pgfpoint{-7cm}{-1.5cm}} - \pgfnode{rectangle}{center}{|beamer|}{beamernode}{} - \pgftransformshift{\pgfpoint{2cm}{0cm}} - \pgfnode{rectangle}{center}{|second|}{secondnode}{} - \pgftransformshift{\pgfpoint{2cm}{0cm}} - \pgfnode{rectangle}{center}{|handout|}{handoutnode}{} - \pgftransformshift{\pgfpoint{2cm}{0cm}} - \pgfnode{rectangle}{center}{|trans|}{transnode}{} - \pgfpathmoveto{\pgfpointanchor{allnode}{south west}} - \pgfpathlineto{\pgfpointanchor{presentationnode}{north}} - \pgfpathmoveto{\pgfpointanchor{allnode}{south east}} - \pgfpathlineto{\pgfpointanchor{articlenode}{north}} - \pgfpathmoveto{\pgfpointanchor{presentationnode}{south west}} - \pgfpathlineto{\pgfpointanchor{beamernode}{north}} - \pgfpathmoveto{\pgfpointadd{\pgfpointanchor{presentationnode}{south}}{\pgfpoint{-0.3cm}{0cm}}} - \pgfpathlineto{\pgfpointanchor{secondnode}{north}} - \pgfpathmoveto{\pgfpointadd{\pgfpointanchor{presentationnode}{south}}{\pgfpoint{0.3cm}{0cm}}} - \pgfpathlineto{\pgfpointanchor{handoutnode}{north}} - \pgfpathmoveto{\pgfpointanchor{presentationnode}{south east}} - \pgfpathlineto{\pgfpointanchor{transnode}{north}} - \pgfusepath{stroke} - \end{pgfpicture} + \begin{tikzpicture}[ + every node/.style={draw,anchor=base,font=\ttfamily\strut}, + level 1/.style={sibling distance=50mm}, + level 2/.style={sibling distance=20mm} + ] + \node {all} + child {node {presentation} + child {node {beamer}} + child {node {second}} + child {node {handout}} + child {node {trans}} + } + child {node {article}}; + \end{tikzpicture} \end{center} Depending on the current mode, you may wish to have certain text inserted only in that mode. For example, you might wish a certain frame or a certain table to be left out of your article version. In some situations, you can use the |\only| command for this purpose. However, the command |\mode|, which is described in the following, is much more powerful than |\only|. diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-notes.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-notes.tex index a54dc4ecff0..2fef37f1bfb 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-notes.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-notes.tex @@ -101,7 +101,7 @@ The following element dictates how the note pages are rendered: \itemoption{plain}{} Just inserts the note text, no fancy hints. \itemoption{lined}{\oarg{number}} - Instead of printing the note text, this option fills the note page with lines on which the audience can write their own notes on. \meta{number} specifies how many lines will be shown, the default is 6 lines. + Instead of printing the note text, this option fills the note page with lines on which the audience can write their own notes on. \meta{number} specifies how many lines will be shown, the default is 6 lines. For a more sophisticated interface, the \href{https://www.ctan.org/pkg/handoutwithnotes}{|handoutwithnotes|} package can be used. \end{templateoptions} The following two inserts are useful for note pages: \begin{itemize} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex index 57a8546f9b4..c3d770701cd 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex @@ -545,6 +545,13 @@ This section explains how to define new commands that are overlay specification- \end{verbatim} \end{command} +In a similar way |\NewDocumentCommand|, |\NewDocumentEnvironment| etc. can be used to define overlay aware commands and environments. The overlay argument can be specified via |d<>| (without default value) or |D<>{}| (with default value) type arguments. + +\example +\begin{verbatim} +\NewDocumentCommand{\makeblue}{D<>{.-} m}{{\color<#1>{blue}#2}} +\end{verbatim} + The following two commands can be used to ensure that a certain counter is automatically reset on subsequent slides of a frame. This is necessary for example for the equation count. You might want this count to be increased from frame to frame, but certainly not from overlay slide to overlay slide. For equation counters and footnote counters (you should not use footnotes), these commands have already been invoked. \begin{command}{\resetcounteronoverlays\marg{counter name}} diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf Binary files differindex 4a307329c02..6ef87a6ab64 100644 --- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf +++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex index 3ddbee05e13..46002a15dfa 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.64} +\def\beamerugversion{3.65} \def\beamerugpgfversion{3.1.7} \def\beamerugxcolorversion{2.00} @@ -28,7 +28,7 @@ \usepackage[pdfborder={0 0 0},bookmarksnumbered]{hyperref} \usepackage[left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry} \usepackage{translator} - +\usepackage{tikz} \input{beamerug-macros} 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 |