diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-23 20:58:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-23 20:58:24 +0000 |
commit | 1e117ae6b120f68ddf2359444b8a322ae1a9f724 (patch) | |
tree | d9c42149bee737a980bd744c5cea99795885f88c | |
parent | 8eaa9a04c65e9be9a95c628900ee62eb9db112eb (diff) |
beamer (23jul19)
git-svn-id: svn://tug.org/texlive/trunk@51711 c570f23f-e606-0410-a88d-b1316a301751
15 files changed, 47 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md index a6a41dec271..d18dfe19aab 100644 --- a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md @@ -8,6 +8,18 @@ a major and minor version only. ## [Unreleased] +## [v3.56] + +### Changed + +- Improved parser for overlays + +### Fixed + +- Add missing commands with overlay specification (see #525) +- Replace fixed text width in `inmargin` theme (see #529) +- Treatment of `+` and `.` overlay specifiations (see #538) + ## [v3.55] ### Fixed @@ -58,8 +70,9 @@ 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.55...HEAD +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.56...HEAD [v3.55]: https://github.com/josephwright/beamer/compare/v3.54...v3.55 +[v3.55]: https://github.com/josephwright/beamer/compare/v3.55...v3.56 [v3.54]: https://github.com/josephwright/beamer/compare/v3.53...v3.54 [v3.53]: https://github.com/josephwright/beamer/compare/v3.52...v3.53 [v3.52]: https://github.com/josephwright/beamer/compare/v3.51...v3.52 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 24ebb1b2d23..ae559eef438 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 d1df71e7fda..c0a13a7eb79 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 75514f081b2..7ae95820585 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 d1352279c29..b045c4b8fec 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex @@ -1102,7 +1102,7 @@ The main background is drawn on top of the background canvas. It can be used to places a grid on the background. The following \meta{grid options} may be given: \begin{itemize} \item - \declare{|step=|\meta{dimension}} specifies the distance between grid lines. The default is 0.5cm. + \declare{|step=|\meta{dimension}} specifies the distance between grid lines. The default is 0.5\,cm. \item \declare{|color=|\meta{color}} specifies the color of the grid lines. The default is 10\% foreground. \end{itemize} @@ -1112,28 +1112,28 @@ The main background is drawn on top of the background canvas. It can be used to \subsection{Frame and Margin Sizes} -The size of a frame is actually the ``paper size'' of a \beamer\ presentation, and it is variable. By default, it amounts to 128mm by 96mm. The aspect ratio of this size is 4:3, which is exactly what most beamers offer these days. It is the job of the presentation program (like |acroread|, |xpdf|, |okular| or |evince|) to display the slides at full screen size. The main advantage of using a small ``paper size'' is that you can use all your normal fonts at their natural sizes. In particular, inserting a graphic with 11pt labels will result in reasonably sized labels during the presentation. +The size of a frame is actually the ``paper size'' of a \beamer\ presentation, and it is variable. By default, it amounts to 128\,mm by 96\,mm. The aspect ratio of this size is 4:3, which is exactly what most beamers offer these days. It is the job of the presentation program (like |acroread|, |xpdf|, |okular| or |evince|) to display the slides at full screen size. The main advantage of using a small ``paper size'' is that you can use all your normal fonts at their natural sizes. In particular, inserting a graphic with 11pt labels will result in reasonably sized labels during the presentation. To change ``paper size'' and aspect ratio, you can use the following class options: \begin{classoption}{aspectratio=1610} - Sets aspect ratio to 16:10, and frame size to 160mm by 100mm. + Sets aspect ratio to 16:10, and frame size to 160\,mm by 100\,mm. \end{classoption} \begin{classoption}{aspectratio=169} - Sets aspect ratio to 16:9, and frame size to 160mm by 90mm. + Sets aspect ratio to 16:9, and frame size to 160\,mm by 90\,mm. \end{classoption} \begin{classoption}{aspectratio=149} - Sets aspect ratio to 14:9, and frame size to 140mm by 90mm. + Sets aspect ratio to 14:9, and frame size to 140\,mm by 90\,mm. \end{classoption} \begin{classoption}{aspectratio=141} - Sets aspect ratio to 1.41:1, and frame size to 148.5mm by 105mm. + Sets aspect ratio to 1.41:1, and frame size to 148.5\,mm by 105\,mm. \end{classoption} \begin{classoption}{aspectratio=54} - Sets aspect ratio to 5:4, and frame size to 125mm by 100mm. + Sets aspect ratio to 5:4, and frame size to 125\,mm by 100\,mm. \end{classoption} \begin{classoption}{aspectratio=43} @@ -1141,10 +1141,10 @@ To change ``paper size'' and aspect ratio, you can use the following class optio \end{classoption} \begin{classoption}{aspectratio=32} - Sets aspect ratio to 3:2, and frame size to 135mm by 90mm. + Sets aspect ratio to 3:2, and frame size to 135\,mm by 90\,mm. \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 1cm. To change them, you should use the following command: +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}} The following \meta{options} can be given: diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex index 4b3b7aa5622..7eea250dc5f 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex @@ -121,7 +121,7 @@ The syntax of (basic) overlay specifications is the following: They are comma-se commands documented here are \emph{all} fragile even if the \LaTeXe{} kernel versions are not. -For the following commands, adding an overlay specification causes the command to be simply ignored on slides that are not included in the specification: |\textbf|, |\textit|, |\textsl|, |\textrm|, |\textsf|, |\color|, |\alert|, |\structure|. If a command takes several arguments, like |\color|, the specification should directly follow the command as in the following example (but there are exceptions to this rule): +For the following commands, adding an overlay specification causes the command to be simply ignored on slides that are not included in the specification: |\textbf|, |\textit|, |\textmd|, |\textnormal|, |\textrm|, |\textsc|, |\textsf|, |\textsl|, |\texttt|, |\textup|, |\emph|; |\color|, |\textcolor|; |\alert|, |\structure|. If a command takes several arguments, like |\color|, the specification should directly follow the command as in the following example (but there are exceptions to this rule): \begin{verbatim} \begin{frame} \color<2-3>[rgb]{1,0,0} This text is red on slides 2 and 3, otherwise black. @@ -774,3 +774,5 @@ In the following example, each time an item is uncovered, the specified text is \item What is the \alert<.>{matrix}? \end{itemize} \end{verbatim} + +The expansions of the |+|-sign and the |.|-sign are no less than zero. This prevents errors when encountering large negative offsets, for example |<+(-7)->| is expanded to |<0->| rather than |<-6->|. diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf Binary files differindex cc133ca6d7b..f8f5a0142a4 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 d04755456c3..b10edcbd315 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.55} +\def\beamerugversion{3.56} \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 f714632305e..fd632ab15cb 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/12/02 v3.55 A class for typesetting presentations] + [2019/07/23 v3.56 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 ed933f2a1a2..8889a66dac4 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/12/02 v3.55 beamer input in article mode] + [2019/07/23 v3.56 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/beamerbasedecode.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty index 4dc2c7ba130..02456ff1c25 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty @@ -26,6 +26,7 @@ % all of the lines here have to be terminated with "%". The two-step % setup for \beamer@@@temp makes sure everything is expanded and removes % all of the spaces at this stage. +\newbox\beamer@decode@box \begingroup \catcode`\|=\active \catcode`\:=\active @@ -38,7 +39,7 @@ \catcode`\ =\active \xdef\beamer@masterdecode#1{% \noexpand\beamer@localanotherslidefalse% -\setbox0=\hbox{% +\setbox\beamer@decode@box=\hbox{% \unexpanded{% \ifnum\catcode`\|=\active\edef|{\string|}\fi% \ifnum\catcode`\:=\active\edef:{\string:}\fi% @@ -177,8 +178,10 @@ {\beamer@relnumber}{\beamer@relnumber(0)}} \def\beamer@relnumber(#1){% \beamer@plusencounteredtrue + \@tempcnta=\numexpr #1 + \value{beamerpauses}\relax% + \ifnum\@tempcnta<0\@tempcnta=0\fi% \edef\beamer@spec - {\beamer@spec\number\numexpr #1 + \value{beamerpauses}\relax}% + {\beamer@spec\number\@tempcnta}% \beamer@@decodeplus} \def\beamer@decodedot{% @@ -190,8 +193,10 @@ \kernel@ifnextchar(%) {\beamer@relnumberdot}{\beamer@relnumberdot(0)}} \def\beamer@relnumberdot(#1){% + \@tempcnta=\numexpr #1 + \value{beamerpauses} -1\relax% + \ifnum\@tempcnta<0\@tempcnta=0\fi% \edef\beamer@spec - {\beamer@spec\number\numexpr #1 + \value{beamerpauses} -1\relax}% + {\beamer@spec\number\@tempcnta}% \beamer@@decodedot} \def\beamer@@decodefound{% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty index ff4597cfd3b..5da51c7ef28 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty @@ -493,6 +493,7 @@ \def\gobble@onslide@@aux<#1>{\@firstofone} \def\beamer@donoframe{% \beamer@slideinframe=1\relax% + \global\c@beamerpauses=1\relax% \setbox\beamer@tempbox\vbox\bgroup% \beamer@inframetrue% \beamer@framenotesbegin% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty index dd36e7419be..9b7d9268a0e 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty @@ -617,9 +617,14 @@ { \renewcommand<>{\textbf}{\only#1{\beameroriginal{\textbf}}} \renewcommand<>{\textit}{\only#1{\beameroriginal{\textit}}} - \renewcommand<>{\textsl}{\only#1{\beameroriginal{\textsl}}} - \renewcommand<>{\textsf}{\only#1{\beameroriginal{\textsf}}} + \renewcommand<>{\textmd}{\only#1{\beameroriginal{\textmd}}} + \renewcommand<>{\textnormal}{\only#1{\beameroriginal{\textnormal}}} \renewcommand<>{\textrm}{\only#1{\beameroriginal{\textrm}}} + \renewcommand<>{\textsc}{\only#1{\beameroriginal{\textsc}}} + \renewcommand<>{\textsf}{\only#1{\beameroriginal{\textsf}}} + \renewcommand<>{\textsl}{\only#1{\beameroriginal{\textsl}}} + \renewcommand<>{\texttt}{\only#1{\beameroriginal{\texttt}}} + \renewcommand<>{\textup}{\only#1{\beameroriginal{\textup}}} } \renewcommand<>{\hypertarget}[2]{\only#3{\beameroriginal{\hypertarget}{#1}{#2}}} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty index 63a55123fbb..66d56f94ee1 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty @@ -261,7 +261,7 @@ \fi \providecommand\and{\unskip, } - \providecommand\inst[1]{\textsuperscript{#1}} + \providecommand\inst[1]{} } diff --git a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemeinmargin.sty b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemeinmargin.sty index 94cea68673f..534d3cd9d78 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemeinmargin.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemeinmargin.sty @@ -32,7 +32,7 @@ \newcommand\beamer@putleft[2]{% \hbox to 0pt{\hss\vtop{% \normalsize% - \@tempdima=.25\paperwidth% + \@tempdima=\beamer@leftsidebar% \advance\@tempdima by-3ex% \hsize=\@tempdima% \leftskip=0pt plus 1fill% |