diff options
Diffstat (limited to 'macros/latex/contrib/beamer')
17 files changed, 109 insertions, 16 deletions
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md index d18dfe19aa..7d5020ab7b 100644 --- a/macros/latex/contrib/beamer/CHANGELOG.md +++ b/macros/latex/contrib/beamer/CHANGELOG.md @@ -8,6 +8,17 @@ a major and minor version only. ## [Unreleased] +## [v3.57] + +### Changed + +- More patch for `paralist` package (see #539) + +### Fixed + +- Replace `\mode` with `\only` (see #543) +- Reset the width of color box in case of change in `\hsize` + ## [v3.56] ### Changed @@ -70,9 +81,10 @@ 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.56...HEAD +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.57...HEAD +[v3.57]: https://github.com/josephwright/beamer/compare/v3.56...v3.57 +[v3.56]: https://github.com/josephwright/beamer/compare/v3.55...v3.56 [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/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls index fd632ab15c..f3564e183c 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} - [2019/07/23 v3.56 A class for typesetting presentations] + [2019/09/29 v3.57 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 8889a66dac..2972dd7fb0 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} - [2019/07/23 v3.56 beamer input in article mode] + [2019/09/29 v3.57 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/beamerbasecolor.sty b/macros/latex/contrib/beamer/base/beamerbasecolor.sty index 099df8c845..6818db39bd 100644 --- a/macros/latex/contrib/beamer/base/beamerbasecolor.sty +++ b/macros/latex/contrib/beamer/base/beamerbasecolor.sty @@ -184,6 +184,7 @@ \ifdim\beamer@colbox@colseps>\z@\vskip\beamer@colbox@colseps\fi% \fi% \egroup\color@endgroup\egroup% + \wd\beamer@tempbox=\beamer@colbox@wd% \ifx\beamer@colbox@ht\@empty\else\ht\beamer@tempbox=\beamer@colbox@ht\fi% \ifx\beamer@colbox@dp\@empty\else\dp\beamer@tempbox=\beamer@colbox@dp\fi% \ifbeamer@colbox@rounded% diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty index 182a5f8873..adf021aae7 100644 --- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty +++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty @@ -107,7 +107,7 @@ \begin{actionenv}#2% \def\insertblocktitle{#1}% \par% - \mode<presentation>{%\usebeamerfont{block}% + \only<presentation>{%\usebeamerfont{block}% \setbeamercolor{local structure}{parent=alerted text}}% \usebeamertemplate{block alerted begin}} {\par% @@ -118,7 +118,7 @@ \begin{actionenv}#2% \def\insertblocktitle{#1}% \par% - \mode<presentation>{%\usebeamerfont{block}% + \only<presentation>{%\usebeamerfont{block}% \setbeamercolor{local structure}{parent=example text}}% \usebeamertemplate{block example begin}} {\par% diff --git a/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty b/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty index 7853b36d70..b10e4325ab 100644 --- a/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty +++ b/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty @@ -9,7 +9,7 @@ \mode<presentation> -\if@plnewitem +\if@plnewenum \def\enumerate{% \ifnum \@enumdepth >\tw@ \@toodeep @@ -42,6 +42,45 @@ \raggedright% \beamer@firstlineitemizeunskip% } +\fi +\def\compactenum{% + \ifnum \@enumdepth >\tw@ + \@toodeep + \else + \advance\@enumdepth \@ne + \edef\@enumctr{enum\romannumeral\the\@enumdepth}% + \advance\@itemdepth \@ne% + \fi + \def\@enum@widestlabel{7}% + \beamer@computepref\@enumdepth% + \expandafter\edef\csname label\@enumctr\endcsname{\noexpand\usebeamertemplate{enumerate \beameritemnestingprefix item}}% + \@ifnextchar[{\beamer@@cenum@}{\beamer@compactenum@}} +\def\beamer@@cenum@[{\@ifnextchar<{\beamer@cenumdefault[}{\beamer@@@cenum@[}} +\def\beamer@cenumdefault[#1]{\def\beamer@defaultospec{#1}% + \@ifnextchar[{\beamer@@@cenum@}{\beamer@compactenum@}} +\def\beamer@@@cenum@[#1]{\@enumlabel@{\beamer@compactenum@}[[#1]} % Here a token is gobbled in paralist package +\def\beamer@compactenum@{% + \beamer@computepref\@itemdepth% + \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}% + \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}% + \@adjust@enum@labelwidth + \expandafter\list\csname label\@enumctr\endcsname{% + \usecounter{\@enumctr}% + \parsep\plparsep + \itemsep\plitemsep + \topsep\pltopsep + \partopsep\plpartopsep + \labelwidth + \csname leftmargin\romannumeral\@listdepth\endcsname + \advance\labelwidth-\labelsep + \let\makelabel\enumlabel}% + \beamer@cramped% + \raggedright% + \beamer@firstlineitemizeunskip% +} +\def\endcompactenum{\ifhmode\par\fi\endlist} + +\if@plnewitem \def\itemize{% \ifnum \@itemdepth >\tw@ \@toodeep @@ -71,6 +110,39 @@ \beamer@firstlineitemizeunskip% } \fi +\def\compactitem{% + \ifnum \@itemdepth >\tw@ + \@toodeep + \else + \advance\@itemdepth\@ne + \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% + \fi + \beamer@computepref\@itemdepth% + \expandafter\edef\csname\@itemitem\endcsname{\noexpand\usebeamertemplate{itemize \beameritemnestingprefix item}}% + \@ifnextchar[{\beamer@@citem@}{\beamer@compactitem@}}% +\def\beamer@@citem@[{\@ifnextchar<{\beamer@citemdefault[}{\beamer@@@citem@[}} +\def\beamer@citemdefault[#1]{\def\beamer@defaultospec{#1}% + \@ifnextchar[{\beamer@@@citem@}{\beamer@compactitem@}} +\def\beamer@@@citem@[#1]{\@itemlabel@{\beamer@compactitem@}[#1]} +\def\beamer@compactitem@{% + \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}% + \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}% + \@adjust@item@labelwidth + \expandafter\list\csname\@itemitem\endcsname{% + \parsep\plparsep + \itemsep\plitemsep + \topsep\pltopsep + \partopsep\plpartopsep + \labelwidth + \csname leftmargin\romannumeral\@listdepth\endcsname + \advance\labelwidth-\labelsep + \let\makelabel\itemlabel}% + \beamer@cramped% + \raggedright% + \beamer@firstlineitemizeunskip% +} +\def\endcompactitem{\ifhmode\par\fi\endlist} + \if@plflushright \def\enumlabel#1{{\usebeamerfont*{enumerate \beameritemnestingprefix item}% \usebeamercolor[fg]{enumerate \beameritemnestingprefix item}\hss#1}} diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty index c8aff5287b..ad003c9aef 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty @@ -68,7 +68,7 @@ \usebeamerfont{author in head/foot}\insertshortauthor \end{beamercolorbox}% \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% - \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot} + \usebeamerfont{title in head/foot}\insertshorttitle\nobreak\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot} \end{beamercolorbox}}% \vskip0pt% } diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf Binary files differindex ae559eef43..ab417b4578 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf Binary files differindex c0a13a7eb7..4bf5fa4cbd 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf Binary files differindex 7ae9582058..730113c37a 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex b/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex index 37c01c0bb4..535562600f 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex @@ -79,10 +79,10 @@ When using certain packages or classes together with the |beamer| class, extra o If you wish to emulate the |foils| class using \beamer, please see Section~\ref{section-foiltex}. \end{class} -\begin{package}{{fontenc}|[|\declare{|T1,EU1,EU2|}|]|} - Use the |T1| option \emph{only} with fonts that have outline fonts available in the T1 encoding like |times| or the |lmodern| fonts. In a standard installation standard Computer Modern fonts (the fonts Donald Knuth originally designed and which are used by default) are \emph{not} available in the T1 encoding. Using this option with them will result in very poor rendering of your presentation when viewed with \pdf\ viewer applications like Acrobat, |xpdf|, |evince| or |okular|. To use the Computer Modern fonts with the T1 encoding, use the package |lmodern|. See also Section~\ref{section-font-encoding}. This applies both to |latex|+|dvips| and |pdflatex| +\begin{package}{{fontenc}|[|\declare{|T1,TU|}|]|} + Use the |T1| option \emph{only} with fonts that have outline fonts available in the T1 encoding like |times| or the |lmodern| fonts. In a standard installation standard Computer Modern fonts (the fonts Donald Knuth originally designed and which are used by default) are \emph{not} available in the T1 encoding. Using this option with them will result in very poor rendering of your presentation when viewed with \pdf\ viewer applications like Acrobat, |xpdf|, |evince| or |okular|. To use the Computer Modern fonts with the T1 encoding, make sure you have installed |cm-super| package in your \TeX\ distribution, or use Latin Modern fonts provided by |lmorden| instead. See also Section~\ref{section-font-encoding}. This applies both to |latex|+|dvips| and |pdflatex|. - Use the |EU1| option with |xelatex|, and |EU2| option with |lualatex|. Note that |xelatex| and |luatex| support OpenType fonts, and font encodings work very different compared to |pdflatex|. Again, see Section~\ref{section-font-encoding} for more information. + The newest version of \LaTeXe\ kernel has introduced TU encoding for |xelatex| and |lualatex|. Note that |xelatex| and |lualatex| support OpenType fonts, and font encodings work very different compared to |pdflatex|. Again, see Section~\ref{section-font-encoding} for more information. \end{package} \begin{package}{{fourier}} @@ -168,7 +168,13 @@ When using certain packages or classes together with the |beamer| class, extra o \begin{package}{{paralist}} \beamernote - \beamer\ automatically patches list-related commands using |beamerpatchparalist| package at the beginning of document. + \beamer\ automatically patches list-related commands using |beamerpatchparalist| package at the beginning of document. Besides, \beamer\ also supports using |compactitem| and |compactenum| environments with overlays, just like the usage of |enumerate| environments: +\begin{verbatim} +\begin{compactitem}[<+->][$\bullet$] + \item Alpha + \item Bravo +\end{compactitem} +\end{verbatim} \end{package} \begin{package}{{pdfpages}} diff --git a/macros/latex/contrib/beamer/doc/beamerug-elements.tex b/macros/latex/contrib/beamer/doc/beamerug-elements.tex index 60f6fcb0ad..b3ac8910c9 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-elements.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-elements.tex @@ -96,7 +96,7 @@ In the following examples the color theme |seahorse| is used. Since the default \begin{outerthemeexample}{infolines} This theme installs a headline showing the current section and the current subsection. It installs a footline showing the author's name, the institution, the presentation's title, the current date, and a frame count. This theme uses only little space. - The colors used in the headline and footline are drawn from |palette primary|, |palette secondary|, and |primary tertiary| (see Section~\ref{section-colors} for details on how to change these). + The colors used in the headline and footline are drawn from |palette primary|, |palette secondary|, and |palette tertiary| (see Section~\ref{section-colors} for details on how to change these). \end{outerthemeexample} \begin{outerthemeexample}[\oarg{options}]{miniframes} diff --git a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex index b1490c7ddb..a001e152d7 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex @@ -164,7 +164,7 @@ To select the T1 encoding, use \verb|\usepackage[T1]{fontenc}|. Thus, if you hav \end{verbatim} to get beautiful outline fonts and correct hyphenation. Note, however, that certain older versions of the LM~bundle did not include correct glyphs for ligatures like ``fi,'' which may cause trouble. Double check that all ligatures are displayed correctly and, if not, update your installation. -Everything mentioned above applies to |pdflatex| and |latex|+|dvips|. Unlike those engines, |xelatex| and |lualatex| support OpenType fonts, and that means that you can use system fonts in your documents relatively easy. Details will eventually be documented in this manual. For now, you can take a look at the documentation for the |fontspec| package which supports both engines. Also, note that when you use |lualatex| or |xelatex| with EU2 or EU1 encoding, respectively, by default you get OpenType Latin Modern fonts. +Everything mentioned above applies to |pdflatex| and |latex|+|dvips|. Unlike those engines, |xelatex| and |lualatex| support OpenType fonts, and that means that you can use system fonts in your documents relatively easy. Details will eventually be documented in this manual. For now, you can take a look at the documentation for the |fontspec| package which supports both engines. Also, note that when you use |lualatex| or |xelatex| with TU encoding, respectively, by default you get OpenType Latin Modern fonts. \subsection{Changing the Fonts Used for Different Elements of a Presentation} diff --git a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex index e08211badd..bc961c2bf0 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex @@ -614,7 +614,7 @@ In |article| mode, theorems are automatically numbered. By specifying the class You can define new environments using the following command: \begin{command}{\newtheorem\opt{|*|}\marg{environment name}\oarg{numbered same as}\marg{head text}\oarg{number within}} - This command is used exactly the same way as in the |amsthm| package (as a matter of fact, it is the command from that package), see its documentation. The only difference is that environments declared using this command are overlay specification-aware in \beamer\ and that, when typeset, are typeset according to \beamer's templates. + This command is used exactly the same way as in the |amsthm| package (as a matter of fact, it is the command from that package). For example, the two optional arguments, \meta{numbered same as} and \meta{number within}, are mutually exclusive; see the documentation of |amsthm| for details. The only difference is that environments declared using this command are overlay specification-aware in \beamer\ and that, when typeset, are typeset according to \beamer's templates. \articlenote Environments declared using this command are also overlay specification-aware in |article| mode. diff --git a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex index 5058b954ab..e454665631 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex @@ -311,6 +311,8 @@ The second flavor of the |\mode| command takes no argument. ``No argument'' mean \emph{Note:} When a \TeX\ file ends, \TeX\ must not be in the gobbling state. Switch this state off using |\mode| on one line and |<all>| on the next. + \emph{Note:} The behavior of |\mode| command is different inside a frame: instead of line-wise gobbling, it puts every subsequent tokens inside a ``comment box'' until another |\mode| command is encountered. Some commands may cause errors in this situation, including the assignment of global variables and |\mode| of the first flavor, since they are not actually ``gobbled''. Please use |\mode| command \emph{of any flavor} outside frames. + \example \begin{verbatim} \mode<article> diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf Binary files differindex f8f5a0142a..26156e2632 100644 --- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf +++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex index b10edcbd31..9fe25be46f 100644 --- a/macros/latex/contrib/beamer/doc/beameruserguide.tex +++ b/macros/latex/contrib/beamer/doc/beameruserguide.tex @@ -13,7 +13,7 @@ \documentclass{ltxdoc} -\def\beamerugversion{3.56} +\def\beamerugversion{3.57} \def\beamerugpgfversion{1.00} \def\beamerugxcolorversion{2.00} |