diff options
Diffstat (limited to 'Master')
31 files changed, 121 insertions, 79 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md index e777a34e1fe..9bd02c2667b 100644 --- a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md @@ -8,6 +8,21 @@ a major and minor version only. ## [Unreleased] +## [v3.54] + +## Changed + +- Add the instructions of `proof begin` and `proof end` template +- Patch for `paralist` package + +### Fixed + +- Wrong frame number by `noframenumbering` option (see #450) +- Missing `nokeywords` option in the article mode +- Vertical glues by `allowframebreak` option (see #325) +- Typos and bad boxes in the documentation (see #491, #504 and #505) +- Revert the addition of `\input` and `\include` + ## [v3.53] ### Fixed @@ -34,7 +49,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.53...HEAD +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.54...HEAD +[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 [v3.51]: https://github.com/josephwright/beamer/compare/v3.50...v3.51 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 7e55b01334a..327a991e0c6 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 0bb9f6613dd..296dc250fae 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 2efe2db6360..d02cbe8a6e1 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/beamerexample-seminar.tex b/Master/texmf-dist/doc/latex/beamer/beamerexample-seminar.tex index 98ba9cbefa0..10f3407d41c 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerexample-seminar.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-seminar.tex @@ -111,7 +111,7 @@ much information, in some sense or another. But what does ``too much'' mean? (\sref{too_much}, bottom) It might just mean that people cannot process all the information they receive. That is certainly true for everyone. A claim that is much stronger, and that is implicit when people complain about -informaton overload, is that people {\em should} receive less information, by +information overload, is that people {\em should} receive less information, by some criterion. % CHANGED: Added \frame @@ -183,7 +183,7 @@ and ruffling through the papers. \begin{itemize} {\overlay1\item When could {\blue there be overload} in networks?} - \item What mechanims make the receivers and senders better off? + \item What mechanism make the receivers and senders better off? \item How does the welfare {\red of the senders} and receivers depend on the cost of communication? \end{itemize} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-color.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-color.tex index 3364d7887b6..47945b89220 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-color.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-color.tex @@ -148,7 +148,7 @@ A ``complete'' color theme is a color theme that completely specifies all colors \subsubsection{Inner Color Themes} -Inner color themes only specify the colors of elements used in inner themes. Most noticably, they specify the colors used for blocks. They can be used together with other (color) themes. If they are used to change the inner colors installed by a presentation theme or another color theme, they should obviously be specified \emph{after} the other theme has been loaded. Inner color themes happen to have flower names. +Inner color themes only specify the colors of elements used in inner themes. Most noticeably, they specify the colors used for blocks. They can be used together with other (color) themes. If they are used to change the inner colors installed by a presentation theme or another color theme, they should obviously be specified \emph{after} the other theme has been loaded. Inner color themes happen to have flower names. \begin{colorthemeexample}{lily} This theme is mainly used to \emph{uninstall} any block colors setup by another theme, restoring the colors used in the |default| theme. In particular, using this theme will remove all background colors for blocks. @@ -510,7 +510,7 @@ This command allows you to specify in a quite general way how a covered item sho \item \declare{|invisible|} is the default and causes covered text to ``completely disappear''. \item - \declare{|transparent|}\opt{|=|\meta{opaqueness}} causes covered text to be typset in a ``transparent'' way. By default, this means that 85\% of the background color is mixed into all colors or that the \meta{opaqueness} of the text is 15\%. You can specify a different \meta{percentage}, where |0| means ``totally transparent'' and |100| means ``totally opaque.'' + \declare{|transparent|}\opt{|=|\meta{opaqueness}} causes covered text to be typeset in a ``transparent'' way. By default, this means that 85\% of the background color is mixed into all colors or that the \meta{opaqueness} of the text is 15\%. You can specify a different \meta{percentage}, where |0| means ``totally transparent'' and |100| means ``totally opaque.'' Unfortunately, this value is kind of ``specific'' to every projector. What looks good on your screen need not look good during a presentation. \item diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-compatibility.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-compatibility.tex index b57de26d828..37c01c0bb43 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-compatibility.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-compatibility.tex @@ -161,11 +161,16 @@ When using certain packages or classes together with the |beamer| class, extra o \end{package} \begin{package}{{musixtex}} - When using MusiX\TeX\ to typeset musical scores, you have to have $\varepsilon$-\TeX extensions enabled. Most modern distributions enable that by default both in |pdflatex| and |latex|. However, if you have an older distribution, the document must be compiled with |pdfelatex| or |elatex| instead of |pdflatex| or |latex|. + When using MusiX\TeX\ to typeset musical scores, you have to have $\varepsilon$-\TeX\ extensions enabled. Most modern distributions enable that by default both in |pdflatex| and |latex|. However, if you have an older distribution, the document must be compiled with |pdfelatex| or |elatex| instead of |pdflatex| or |latex|. Inside a |music| environment, the |\pause| is redefined to match MusiX\TeX's definition (a rest during one quarter of a whole). You can use the |\beamerpause| command to create overlays in this environment. \end{package} +\begin{package}{{paralist}} + \beamernote + \beamer\ automatically patches list-related commands using |beamerpatchparalist| package at the beginning of document. +\end{package} + \begin{package}{{pdfpages}} Commands like |\includepdf| only work \emph{outside} frames as they produce pages ``by themselves.'' You may also wish to say \begin{verbatim} @@ -215,7 +220,7 @@ When using certain packages or classes together with the |beamer| class, extra o \begin{package}{{textpos}} \beamernote - \beamer\ automatically installs a white background behind everything, unless you install a different background template. Because of this, you must use the |overlay| option when using |textpos|, so that it will place boxes \emph{in front of} everything. Alternatively, you can install an empty background template, but this may result in an incorrect display in certain situtations with older versions of the Acrobat Reader. + \beamer\ automatically installs a white background behind everything, unless you install a different background template. Because of this, you must use the |overlay| option when using |textpos|, so that it will place boxes \emph{in front of} everything. Alternatively, you can install an empty background template, but this may result in an incorrect display in certain situations with older versions of the Acrobat Reader. \end{package} \begin{package}{{ucs}} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-elements.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-elements.tex index 3eec9adcc78..60f6fcb0add 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-elements.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-elements.tex @@ -15,7 +15,7 @@ This section discusses the inner and outer themes that are available in \beamer. These themes install certain \emph{templates} for the different elements of a presentation. The template mechanism is explained at the end of the section. -Before we plunge into the details, let us agree on some terminology for this section. In \beamer, an \emph{element} is part of a presentation that is potentially typeset in some special way. Examples of elements are frame titles, the author's name, or the footnote sign. The appearance of every element is governed by a \emph{template} for this element. Appropriate templates are installed by inner and outer themes, where the \emph{inner} themes only install templates for elements that are typically ``inside the main text,'' while \emph{outer} themes install templates for elements ``around the main text.'' Thus, from the templates's point of view, there is no real difference between inner and outer themes. +Before we plunge into the details, let us agree on some terminology for this section. In \beamer, an \emph{element} is part of a presentation that is potentially typeset in some special way. Examples of elements are frame titles, the author's name, or the footnote sign. The appearance of every element is governed by a \emph{template} for this element. Appropriate templates are installed by inner and outer themes, where the \emph{inner} themes only install templates for elements that are typically ``inside the main text,'' while \emph{outer} themes install templates for elements ``around the main text.'' Thus, from the templates' point of view, there is no real difference between inner and outer themes. \subsection{Inner Themes} @@ -271,7 +271,7 @@ In |article| mode, most of the template mechanism is switched off and has no eff Here are a few hints that might be helpful when you wish to set a template: \begin{itemize} \item - Usually, you might wish to copy code from an existing template. The code often takes care of some things that you may not yet have thought about. The default inner and outer themes might be useful starting points. Also, the file |beamerbaseauxtemplates.sty| contains interesting ``auxilliary'' templates. + Usually, you might wish to copy code from an existing template. The code often takes care of some things that you may not yet have thought about. The default inner and outer themes might be useful starting points. Also, the file |beamerbaseauxtemplates.sty| contains interesting ``auxiliary'' templates. \item When copying code from another template and when inserting this code in the preamble of your document (not in another style file), you may have to ``switch on'' the at-character (|@|). To do so, add the command |\makeatletter| before the |\setbeamertemplate| command and the command |\makeatother| afterward. \item @@ -456,7 +456,7 @@ The \beamer-template mechanism implements a simple form of inheritance via \emph %% The following command has the same effect as the three commands below: \setbeamertemplate{itemize items}[circle] -\setbeamertemplate{itemite item}[circle] % actually, the ``empty'' argument is added +\setbeamertemplate{itemize item}[circle] % actually, the ``empty'' argument is added \setbeamertemplate{itemize subitem}[circle] \setbeamertemplate{itemize subsubitem}[circle] \end{verbatim} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-emulation.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-emulation.tex index 09a68911538..0e2f6d551e0 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-emulation.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-emulation.tex @@ -21,7 +21,7 @@ A useful effect of using an emulation layer is that you get access to all the fe \subsection{Prosper, HA-Prosper and Powerdot} \label{section-prosper} -The package |beamerprosper| maps the commands of the \prosper\ package, developed by Fr\'ed\'eric Goualard, to \beamer\ commands. Also, some commands of the \textsc{ha}-\prosper\ and \textsc{powerdot} packages, developed by Hendri Adriaens, are mapped to \beamer\ commands. \emph{These mappings cannot perfectly emulate all of Prosper!} Rather, these mappings are intended as an aid when porting parts of presentations created using \prosper\ to \beamer. \emph{No styles are implemented that mimick Prosper styles.} Rather, the normal \beamer\ themes must be used (although, one could implement \beamer\ themes that mimicks existing \prosper\ styles; we have not done that and do not intend to). +The package |beamerprosper| maps the commands of the \prosper\ package, developed by Fr\'ed\'eric Goualard, to \beamer\ commands. Also, some commands of the \textsc{ha}-\prosper\ and \textsc{powerdot} packages, developed by Hendri Adriaens, are mapped to \beamer\ commands. \emph{These mappings cannot perfectly emulate all of Prosper!} Rather, these mappings are intended as an aid when porting parts of presentations created using \prosper\ to \beamer. \emph{No styles are implemented that mimic Prosper styles.} Rather, the normal \beamer\ themes must be used (although, one could implement \beamer\ themes that mimics existing \prosper\ styles; we have not done that and do not intend to). The workflow for creating a \beamer\ presentation that uses \prosper\ code is the following: \begin{enumerate} @@ -50,7 +50,7 @@ There are, unfortunately, quite a few places where you may run into problems: \item If you use |pstricks| commands, you will either have to stick to using |latex| and |dvips| or will have to work around them using, for example, |pgf|. Porting lots of |pstricks| code is bound to be difficult, if you wish to switch over to |pdflatex|, so be warned. You can read more about that in Section~\ref{section-graphics} that talks about graphics. \item - If the file cannot be compiled because some \prosper\ command is not implemented, you will have to delete this command and try to mimick its behavior using some \beamer\ command. + If the file cannot be compiled because some \prosper\ command is not implemented, you will have to delete this command and try to mimic its behavior using some \beamer\ command. \end{itemize} \begin{package}{{beamerprosper}} @@ -59,7 +59,7 @@ There are, unfortunately, quite a few places where you may run into problems: This package takes the following options: \begin{itemize} \item - \declare{|framesassubsections|} causes each frame to create its own subsection with the frame title as subsection name. This behavior mimicks \textsc{ha}-\textsc{prosper}'s behavior. In a long talk this will create way too many subsections. + \declare{|framesassubsections|} causes each frame to create its own subsection with the frame title as subsection name. This behavior mimics \textsc{ha}-\textsc{prosper}'s behavior. In a long talk this will create way too many subsections. \end{itemize} \articlenote @@ -167,7 +167,7 @@ In the following, the effects of \prosper\ commands in \beamer\ are listed. \end{environment} \begin{command}{\overlays\marg{number}\marg{slide environment}} - This will put the \meta{slide environment} into a frame that does not have the |fragile| option and which can hence contain overlayed text. The \meta{number} is ignored since the number of necessary overlays is computed automatically by \beamer. + This will put the \meta{slide environment} into a frame that does not have the |fragile| option and which can hence contain overlaid text. The \meta{number} is ignored since the number of necessary overlays is computed automatically by \beamer. \example The following code fragments have the same effect: @@ -353,7 +353,7 @@ There are, unfortunately, numerous places where you may run into problems: \item If you use |pstricks| commands, you will either have to stick to using |latex| and |dvips| or will have to work around them using, for example, |pgf|. Porting lots of |pstricks| code is bound to be difficult, if you wish to switch over to |pdflatex|, so be warned. \item - If the file cannot be compiled because some \seminar\ command is not implemented, you will have to delete this command and try to mimick its behavior using some \beamer\ command. + If the file cannot be compiled because some \seminar\ command is not implemented, you will have to delete this command and try to mimic its behavior using some \beamer\ command. \end{itemize} \begin{package}{{beamerseminar}} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex index 2791a0617d0..d1352279c29 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex @@ -142,6 +142,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{|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. If a frame contains fragile text, different internal mechanisms are used to typeset the frame to ensure that inside the frame the character codes can be reset. The price of switching to another internal mechanism is that either you cannot use overlays or an external file needs to be written and read back (which is not always desirable). @@ -399,7 +401,7 @@ The appearance of the headline and footline is determined by the following templ \iteminsert{\insertsubsectionnavigation}\marg{width} Inserts a vertical navigation bar containing all subsections of the current section, with the current subsection highlighted. - \iteminsert{\insertsubsectionnavigationhorizontal}\marg{width}\marg{left insert}\marg{right insert} + \iteminsert{\insertsubsectionnavigationhorizontal}\marg{width}\marg{left insert}\marg{right insert}\newline See |\insertsectionnavigationhorizontal|. \iteminsert{\insertverticalnavigation}\marg{width} @@ -465,7 +467,7 @@ The appearance of the headline and footline is determined by the following templ \iteminsert{\insertdocumentendpage} Inserts the page number of the last page of the document (including the appendix). - \iteminsert{\usebeamertemplate*\{page number in head/foot\}} inserts a customisable template which e.g. inserts the current and total number of frames. + \item |\usebeamertemplate*{page number in head/foot}| inserts a customisable template which e.g.\ inserts the current and total number of frames. \end{itemize} \end{element} @@ -490,28 +492,28 @@ The appearance of the headline and footline is determined by the following templ \end{templateoptions} The same inserts as for headlines can be used. + +\end{element} - \begin{element}{page number in head/foot}\yes\yes\yes - These \beamer-color and -font are used to typeset the page number or frame number in the footline. +\begin{element}{page number in head/foot}\yes\yes\yes + These \beamer-color and -font are used to typeset the page number or frame number in the footline. + + The \beamer-template provides a convenient way to format the page or frame number in the footline. It is used by the |infolines| outer theme and the |page number| and |frame number| footline themes. It can also be used with the |miniframes| and |split| outer themes, but for them it is set to empty as default. + + \begin{templateoptions} + \itemoption{default}{} The default option is empty. - The \beamer-template provides a convenient way to format the page or frame number in the footline. It is used by the |infolines| outer theme and the |page number| and |frame number| footline themes. It can also be used with the |miniframes| and |split| outer themes, but for them it is set to empty as default. + \itemoption{framenumber}{} This option inserts the current frame number. - \begin{templateoptions} - \itemoption{default}{} The default option is empty. - - \itemoption{framenumber}{} This option inserts the current frame number. - - \itemoption{totalframenumber}{} In addition to the current frame number, this option also shows the total number of frames. - - \itemoption{appendixframenumber}{} This options replicates the behaviour of the |appendixnumberbeamer| package. In the main part before the |\appendix| command the current frame number and the total number of frames in the main part is displayed. In the appendix only the frame number within the appendix and the total number of frames in the appendix are shown. - - \itemoption{pagenumber}{} Shows the current page number. - - \itemoption{totalpagenumber}{} In addition to the current page number also the total page number is displayed. - - \end{templateoptions} - - \end{element} + \itemoption{totalframenumber}{} In addition to the current frame number, this option also shows the total number of frames. + + \itemoption{appendixframenumber}{} This options replicates the behaviour of the |appendixnumberbeamer| package. In the main part before the |\appendix| command the current frame number and the total number of frames in the main part is displayed. In the appendix only the frame number within the appendix and the total number of frames in the appendix are shown. + + \itemoption{pagenumber}{} Shows the current page number. + + \itemoption{totalpagenumber}{} In addition to the current page number also the total page number is displayed. + \end{templateoptions} + \end{element} \subsubsection{The Sidebars} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-guidelines.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-guidelines.tex index 7327232eee4..0aef255f405 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-guidelines.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-guidelines.tex @@ -357,7 +357,7 @@ However, there are reasons for using font families other than Computer Modern: A small selection of alternatives to Computer Modern: \begin{itemize} \item - Latin Modern is a Computer Modern derivate that provides more characters, so it's not considered a real alternative. It's recommended over Computer Modern, though. + Latin Modern is a Computer Modern derivative that provides more characters, so it's not considered a real alternative. It's recommended over Computer Modern, though. \item Helvetica is an often used alternative. However, Helvetica also tends to look boring (since we see it everywhere) and it has a very large x-height (the height of the letter~x in comparison to a letter like~M). A large x-height is usually considered good for languages (like English) that use uppercase letters seldom and not-so-good for languages (like German) that use uppercase letters a lot. (We have never been quite convinced by the argument for this, though.) Be warned: the x-height of Helvetica is so different from the x-height of Times that mixing the two in a single line looks strange. The packages for loading Times and Helvetica provide options for fixing this, though. \item @@ -365,7 +365,7 @@ A small selection of alternatives to Computer Modern: \item Times is a possible alternative to Computer Modern. Its main disadvantage is that it is a serif font, which requires a high-resolution projector. Naturally, it also used very often, so we all know it very well. \item - DejaVu, a derivate of Bitstream Vera is also a very good and free alternative. TrueType version that comes with OpenOffice.org is complicated to get to work with \TeX, but |arev| \LaTeX\ package provides an easy way to use Type 1 version named Bera. It has both sans-serif and serif versions; |arev| provides both. + DejaVu, a derivative of Bitstream Vera is also a very good and free alternative. TrueType version that comes with OpenOffice.org is complicated to get to work with \TeX, but |arev| \LaTeX\ package provides an easy way to use Type 1 version named Bera. It has both sans-serif and serif versions; |arev| provides both. \end{itemize} Families that you should \emph{not} use for normal text include: diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-interaction.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-interaction.tex index 1ed306ddc8d..59e40801bd8 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-interaction.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-interaction.tex @@ -288,7 +288,8 @@ Anticipated zooming is necessary when you have a very complicated graphic that y By default, the button is clickable, but it will not be indicated in any special way. You can draw a border around the button by using the following \meta{option}: \begin{itemize} \item - \declare{|border|}\opt{|=|\meta{width in pixels}} will draw a border around the specified button area. The default width is 1 pixel. The color of this button is the |linkbordercolor| of |hyperref|. \beamer\ sets this color to a 50\% gray by default. To change this, you can use the command |\hypersetup{linkbordercolor={|\meta{red}| |\meta{green}| |\meta{blue}|}}|, where \meta{red}, \meta{green}, and \meta{blue} are values between 0 and 1. + \declare{|border|}\opt{|=|\meta{width in pixels}} will draw a border around the specified button area. The default width is 1 pixel. The color of this button is the |linkbordercolor| of |hyperref|. \beamer\ sets this color to a 50\% gray by default.\newline + To change this, you can use the command |\hypersetup{linkbordercolor={|\meta{red}| |\meta{green}| |\meta{blue}|}}|, where \meta{red}, \meta{green}, and \meta{blue} are values between 0 and 1. \end{itemize} When you press the button created in this way, the viewer application will hyperjump to the first of the frames specified by the \meta{zoomed overlay specification}. For the slides to which this overlay specification applies, the following happens: diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-license.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-license.tex index 4b2a2694dfc..c3f3eff3961 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-license.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-license.tex @@ -290,7 +290,7 @@ terminates your license, and (b) permanently, if the copyright holder fails to n Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. -Termination of your rights under this section does not terminate the licenses of parties who have received copise or rights from you under this License. If your rights have been terminated and not permanently reinstated, receipt of a copy of some or all of the same material does not give you any rights to use it. +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, receipt of a copy of some or all of the same material does not give you any rights to use it. \subsubsection{Future Revisions of this License} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex index af2c9154e9f..e08211badd3 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-localstructure.tex @@ -326,7 +326,7 @@ The \beamer\ class predefines commands and environments for highlighting text. U \end{element} \begin{element}{local structure}\no\yes\no - This color should be used to typeset structural elements that change their color according to the ``local environment.'' For example, an item ``button'' in an |itemize| environment changes its color according to circumstances. If it is used inside an example block, it should have the |example text| color; if it is currently ``alerted'' it should have the |alerted text| color. This color is setup by certain environments to have the color that should be used to typset things like item buttons. Since the color used for items, |item|, inherits from this color by default, items automatically change their color according to the current situation. + This color should be used to typeset structural elements that change their color according to the ``local environment.'' For example, an item ``button'' in an |itemize| environment changes its color according to circumstances. If it is used inside an example block, it should have the |example text| color; if it is currently ``alerted'' it should have the |alerted text| color. This color is setup by certain environments to have the color that should be used to typeset things like item buttons. Since the color used for items, |item|, inherits from this color by default, items automatically change their color according to the current situation. If you write your own environment in which the item buttons and similar structural elements should have a different color, you should change the color |local structure| inside these environments. \end{element} @@ -715,7 +715,7 @@ In the |article| version, the package |amsthm| sometimes clashes with the docume This will expand to the name of the environment to be typeset (like ``Theorem'' or ``Corollary''). \iteminsert{\inserttheoremnumber} - This will expand to the number of the current theorem preceeded by a space or to nothing, if the current theorem does not have a number. + This will expand to the number of the current theorem preceded by a space or to nothing, if the current theorem does not have a number. \iteminsert{\inserttheoremaddition} This will expand to the optional argument given to the environment or will be empty, if there was no optional argument. @@ -729,6 +729,18 @@ In the |article| version, the package |amsthm| sometimes clashes with the docume Inserted at the end of a theorem. \end{element} +\begin{element}{proof begin}\yes\no\no + Inserted at the beginning of a |proof| environment. This template behaves like a normal |block begin| template by default. + + \begin{itemize} + \iteminsert{\insertproofname} + This will expand to the proof name, followed by a period most of the time. + \end{itemize} +\end{element} + +\begin{element}{proof end}\yes\no\no + Inserted at the end of a |proof| environment. +\end{element} \subsection{Framed and Boxed Text} @@ -1035,7 +1047,7 @@ Inside |{verbatim}| environments you obviously cannot use commands like |\alert< \subsection{Abstract} -The |{abstract}| environment is overlay specificiation-aware in \beamer: +The |{abstract}| environment is overlay specification-aware in \beamer: \begin{environment}{{abstract}\sarg{action specification}} You can use this environment to typeset an abstract. diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex index 3d2ed9ca277..f7580a1ff21 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex @@ -54,12 +54,12 @@ \item\extractcommand#1@\par\topsep=0pt} \def\endcommand{\endlist} \def\extractcommand#1#2@{\strut\declare{\texttt{\string#1}}#2% - \index{\stripcommand#1@\protect\myprintocmmand{\stripcommand#1}}} + \index{\stripcommand#1@\protect\myprintcommand{\stripcommand#1}}} %\let\textoken=\command %\let\endtextoken=\endcommand -\def\myprintocmmand#1{\texttt{\char`\\#1}} +\def\myprintcommand#1{\texttt{\char`\\#1}} \def\example{\par\smallskip\noindent\textit{Example: }} \def\themeauthor{\par\smallskip\noindent\textit{Theme author: }} @@ -183,7 +183,7 @@ \def\endtemplateinserts{\end{itemize}} \def\iteminsert#1{\item {\texttt{\declare{\string#1}}}% - \index{Inserts!\stripcommand#1@\protect\myprintocmmand{\stripcommand#1}}} + \index{Inserts!\stripcommand#1@\protect\myprintcommand{\stripcommand#1}}} \newcommand\opt[1]{{\color{black!50!green}#1}} \renewcommand\oarg[1]{\opt{{\ttfamily[}\meta{#1}{\ttfamily]}}} @@ -261,7 +261,7 @@ %\def\extractcommand#1#2\@@{% % \translatormanualentryheadline{\declare{\texttt{\string#1}}#2}% % \removeats{#1}% -% \index{\strippedat @\protect\myprintocmmand{\strippedat}}} +% \index{\strippedat @\protect\myprintcommand{\strippedat}}} \renewenvironment{environment}[1]{ diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex index db041fa2fc3..5058b954ab8 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-nonpresentation.tex @@ -92,7 +92,13 @@ The package |beamerarticle| defines virtually all of \beamer's commands in a way \end{verbatim} \end{package} -There is one remaining problem: While the |article| version can easily \TeX\ the whole file, even in the presence of commands like |\frame<2>|, we do not want the special article text to be inserted into our original \beamer\ presentation. That means, we would like all text \emph{between} frames to be suppressed. More precisely, we want all text except for commands like |\section| and so on to be suppressed. This behavior can be enforced by specifying the option |ignorenonframetext| in the presentation version. The option will insert a |\mode*| at the beginning of your presentation. +There is one remaining problem: While the |article| version can easily \TeX\ the whole file, even in the presence of commands like |\frame<2>|, we do not want the special article text to be inserted into our original \beamer\ presentation. That means, we would like all text \emph{between} frames to be suppressed. More precisely, we want all text except for commands like |\section| and so on to be suppressed. This behavior can be enforced by specifying the option |ignorenonframetext| in the presentation version. + +\begin{classoption}{ignorenonframetext} + Cause |beamer| to ignore (almost) all texts and commands outside frames in the |presentation| mode. The option will insert a |\mode*| at the beginning of your presentation. + + \emph{Note:} When using |\include| or |\input| commands, conversions of modes must be controlled manually. See Section~\ref{section-mode-details} for details. +\end{classoption} The following example shows a simple usage of the |article| mode: diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex index 5803b8d41b2..4b3b7aa5622 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-overlays.tex @@ -403,7 +403,7 @@ To solve this problem, you can use two environments: |overlayarea| and |overprin Some text for the first slide.\\ Possibly several lines long. \onslide<2| handout:0> - Replacement on the second slide. Supressed for handout. + Replacement on the second slide. Suppressed for handout. \end{overprint} \end{verbatim} @@ -728,7 +728,7 @@ This will alert the current item when it is uncovered. For example, the first sp The |\pause| command also updates the counter |beamerpauses|. You can change this counter yourself using the normal \LaTeX\ commands |\setcounter| or |\addtocounter|. -Any occurence of a |+|-sign may be followed by an +Any occurrence of a |+|-sign may be followed by an \emph{offset} in round brackets. This offset will be added to the value of |beamerpauses|. Thus, if |beamerpauses| is 2, then |<+(1)->| expands to diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-themes.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-themes.tex index 544ebc589b0..3d54536d28b 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-themes.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-themes.tex @@ -60,7 +60,7 @@ A presentation theme dictates for every single detail of a presentation what it When Till started naming the presentation themes, he soon ran out of ideas on how to call them. Instead of giving them more and more cumbersome names, he decided to switch to a different naming convention: Except for two special cases, all presentation themes are named after cities. These cities happen to be cities in which or near which there was a conference or workshop that he attended or that a co-author of his attended. -All themes listed without author mentioned were developed by Till. If a theme has not been developped by us (that is, if someone else is to blame), this is indicated with the theme. We have sometimes slightly changed or ``corrected'' submitted themes, but we still list the original authors. +All themes listed without author mentioned were developed by Till. If a theme has not been developed by us (that is, if someone else is to blame), this is indicated with the theme. We have sometimes slightly changed or ``corrected'' submitted themes, but we still list the original authors. \begin{themeexample}{default} As the name suggests, this theme is installed by default. It is a sober no-nonsense theme that makes minimal use of color or font variations. This theme is useful for all kinds of talks, except for very long talks. @@ -304,7 +304,7 @@ All themes listed without author mentioned were developed by Till. If a theme ha \begin{themeexample}{Luebeck} A variation on the |Copenhagen| theme. - L\"ubeck is a town in nothern Germany. It hosted the 41st Theorietag. + L\"ubeck is a town in northern Germany. It hosted the 41st Theorietag. \end{themeexample} \begin{themeexample}{Malmoe} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-tutorial.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-tutorial.tex index fecbffccc31..9dad541ac3e 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-tutorial.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-tutorial.tex @@ -167,9 +167,9 @@ The frame already looks quite nice, though, perhaps a bit colorful. However, Euc \end{itemize} \end{verbatim} -By showing them incrementally, he hopes to focus the audience's attention on the item he is currently talking about. On second thought, he deletes the |\pause| stuff once more since in simple cases like the above the pausing is rather silly. Indeed, Euclids has noticed that good presentations make use of this uncovering mechanism only in special circumstances. +By showing them incrementally, he hopes to focus the audience's attention on the item he is currently talking about. On second thought, he deletes the |\pause| stuff once more since in simple cases like the above the pausing is rather silly. Indeed, Euclid has noticed that good presentations make use of this uncovering mechanism only in special circumstances. -Euclid finds that he can also add a |\pause| between the definition and the example. So, |\pause|s seem to transcede environments, which Euclid finds quite useful. After some experimentation he finds that |\pause| only does not work in |align| environments. He immediately writes an email about this to \beamer's author, but receives a polite answer stating that the implementation of |align| does wicked things and there is no fix for this. Also, Euclid is pointed to the last part of the user's guide, where a workaround is described. +Euclid finds that he can also add a |\pause| between the definition and the example. So, |\pause|s seem to transcend environments, which Euclid finds quite useful. After some experimentation he finds that |\pause| only does not work in |align| environments. He immediately writes an email about this to \beamer's author, but receives a polite answer stating that the implementation of |align| does wicked things and there is no fix for this. Also, Euclid is pointed to the last part of the user's guide, where a workaround is described. \subsection{Using Overlay Specifications} @@ -354,7 +354,7 @@ On second thought, Euclid would prefer to uncover part of the algorithm stepwise \visible<4->{Note the use of \alert{\texttt{std::}}.} \end{frame} \end{verbatim} -The |\visible| command does nearly the same as |\uncover|. A difference occurs if the command |\setbeamercovered{transparent}| has been used to make covered text ``transparent'' instead, |\visible| still makes the text completely ``invisible'' on non-specified slides. Euclid has the feeling that the naming convention is a bit strange, but cannot quite pinpoint the problem. +The |\visible| command does nearly the same as |\uncover|. However one difference occurs if the command |\setbeamercovered{transparent}| has been used to make covered text ``transparent'' instead, |\visible| still makes the text completely ``invisible'' on non-specified slides. Euclid has the feeling that the naming convention is a bit strange, but cannot quite pinpoint the problem. \subsection{Changing the Way Things Look I: Theming} diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-twoscreens.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-twoscreens.tex index 2a5921a765d..79bf4572c05 100644 --- a/Master/texmf-dist/doc/latex/beamer/beamerug-twoscreens.tex +++ b/Master/texmf-dist/doc/latex/beamer/beamerug-twoscreens.tex @@ -12,13 +12,13 @@ \section{Taking Advantage of Multiple Screens} \label{section-twoscreens} -This section describes options provided by \beamer\ for taking advantage of computers that have more than one video output and can display different outputs on them. For such systems, one video output can be attached to a projector and the main presentation is shown there. The second video output is attached to a small extra monitor (or is just shown on the display of the computer) and shows, for example, special notes for you. Alternatively, the two outputs might be attached to two different projectors. One can then show the main presentation on the first projection and, say, the table of contents on the second. Or the second projection might show a version translated into a different language. Or the seoncd projection might always show the ``previous'' slide. Or \ldots---we are sure you can think of further useful things. +This section describes options provided by \beamer\ for taking advantage of computers that have more than one video output and can display different outputs on them. For such systems, one video output can be attached to a projector and the main presentation is shown there. The second video output is attached to a small extra monitor (or is just shown on the display of the computer) and shows, for example, special notes for you. Alternatively, the two outputs might be attached to two different projectors. One can then show the main presentation on the first projection and, say, the table of contents on the second. Or the second projection might show a version translated into a different language. Or the second projection might always show the ``previous'' slide. Or \ldots---we are sure you can think of further useful things. -The basic idea behind \beamer's support of two video outputs is the following: Using special options you can ask \beamer\ to create a \pdf-file in which the ``pages'' are unusually wide or high. By default, their height will still be 128mm, but their width will be 192mm (twice the usual default 96mm). These ``superwide'' pages will show the slides of the main presentation on the left and auxilliary material on the right (this can be switched using appropriate options, though hyperlinks will only work if the presentation is on the left and the second screen on the right). +The basic idea behind \beamer's support of two video outputs is the following: Using special options you can ask \beamer\ to create a \pdf-file in which the ``pages'' are unusually wide or high. By default, their height will still be 128mm, but their width will be 192mm (twice the usual default 96mm). These ``superwide'' pages will show the slides of the main presentation on the left and auxiliary material on the right (this can be switched using appropriate options, though hyperlinks will only work if the presentation is on the left and the second screen on the right). For the presentation you attach two screens to the system. The windowing system believes that the screen is twice as wide as it actually is. Everything the windowing system puts on the left half of this big virtual screen is redirected to the first video output, everything on the right half is redirected to the second video output. -When the presentation program displays the specially prepared superwide \beamer-presentation, exactly the left half of the screen will be filled with the main presentation, the right part is filled with the auxilliary material---voil\`a. Not all presentation programs support this special feature. For example, the Acrobat Reader 6.0.2 will only use one screen in fullscreen mode on MacOS~X. On the other hand, a program named PDF Presenter supports showing dual-screen presentations. Generally, you will have to find out for yourself whether your display program and system support showing superwide presentations stretching over two screens. +When the presentation program displays the specially prepared superwide \beamer-presentation, exactly the left half of the screen will be filled with the main presentation, the right part is filled with the auxiliary material---voil\`a. Not all presentation programs support this special feature. For example, the Acrobat Reader 6.0.2 will only use one screen in fullscreen mode on MacOS~X. On the other hand, a program named PDF Presenter supports showing dual-screen presentations. Generally, you will have to find out for yourself whether your display program and system support showing superwide presentations stretching over two screens. \beamer\ uses the package |pgfpages| to typeset two-screen presentations. Because of this, your first step when creating a two-screen presentation is to include this package: \begin{verbatim} @@ -38,7 +38,7 @@ The first way to use a second screen is to show the presentation on the main scr \subsection{Showing Second Mode Material on the Second Screen} -The second way to use the second screen is to show ``a different vesion'' of the presentation on the second screen. This different version might be a translation or it might just always be the current table of contents. +The second way to use the second screen is to show ``a different version'' of the presentation on the second screen. This different version might be a translation or it might just always be the current table of contents. To specify what is shown on the second screen, you can use a special \beamer-mode called |second|. This mode behaves similar to modes like |handout| or |beamer|, but its effect depends on the exact options used: diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf Binary files differindex 11d759ac2e3..9616c24836f 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 101614718a7..fc1680fb92a 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.53} +\def\beamerugversion{3.54} \def\beamerugpgfversion{1.00} \def\beamerugxcolorversion{2.00} @@ -188,7 +188,7 @@ The objective of the \beamer\ class is to simplify the creation of presentations You might wish to create a transparencies version of your talk as a fall-back. \end{itemize} -This part dicusses how \beamer\ helps you with the creation of the above. +This part discusses how \beamer\ helps you with the creation of the above. \include{beamerug-notes} \include{beamerug-transparencies} diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index 8e4302f997d..099829fd4d9 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/09/06 v3.53 A class for typesetting presentations] + [2018/09/20 v3.54 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 f824355c245..8675483053b 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/09/06 v3.53 beamer input in article mode] + [2018/09/20 v3.54 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/beamerbasearticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty index a32a3531994..6d784381e25 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty @@ -36,6 +36,7 @@ \DeclareOption{notheorems}{\beamer@blocksfalse} \DeclareOption{noamsthm}{\beamer@blocksfalse\beamer@amsfalse} \DeclareOption{noamssymb}{\beamer@amssymbfalse} +\DeclareOption{nokeywords}{\beamer@keywordsfalse} \DeclareOption{envcountsect}{\beamer@countsecttrue} \DeclareOption{activeospeccharacters}{\beamer@articleactivetrue} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty index 4dce70e9317..099df8c845b 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty @@ -108,13 +108,8 @@ \fi% } -\mode -<presentation> -{ - \colorlet{fg}{black} - \colorlet{bg}{white} -} - +\colorlet{fg}{black} +\colorlet{bg}{white} \mode <article> diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty index 064046da488..5699abe9f03 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty @@ -66,6 +66,7 @@ \renewcommand\theenumiii{\@arabic\c@enumiii}% }% \AtBeginDocument{% Allow for paralist loading + \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{} % \let\labelitemi\beamer@labelitemi % \let\labelitemii\beamer@labelitemii % \let\itemize\beamer@itemize diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty index e8af2264193..a4e742f2a5d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty @@ -272,7 +272,6 @@ } \newif\ifbeamer@noframenumbering -\beamer@noframenumberingfalse \define@key{beamerframe}{noframenumbering}[true]{\beamer@noframenumberingtrue} @@ -423,6 +422,7 @@ \beamer@autobreakcount=0\relax% \beamer@autobreaklastheight=16000pt% \beamer@zoomcount=0\relax% + \beamer@noframenumberingfalse% \beamer@containsverbatimfalse% \beamer@isfragilefalse% \beamer@autobreakfalse% @@ -435,7 +435,9 @@ \setkeys{beamerframe}{#2}% \beamer@frametemplate% \ifbeamer@noframenumbering% - \beamer@noframenumberingfalse% + \ifbeamer@isfragile%Fragile frames will be processed twice + \stepcounter{framenumber}% + \fi% \else% \stepcounter{framenumber}%do not set \label here - it interferes with AtBegin* \fi% @@ -602,7 +604,7 @@ {\protect\headcommand{% \protect\beamer@framepages{\beamer@framestartpage}{\beamer@frameendpage}}}% \clearpage\beamer@notesactions% - } + }% } \def\beamer@reseteecodes{\gdef\beamer@entrycode{}\gdef\beamer@exitcode{}% \beamer@slideinframe=1\relax\beamer@resumemode} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty index 2c0f347c77b..94ab6414823 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty @@ -204,6 +204,7 @@ \global\setbox\beamer@splitbox=\box\voidb@x% \ifbeamer@autobreak% % Ok, frame was overful -> split it! + \splittopskip\baselineskip% \setbox\@tempboxa=\vsplit\beamer@framebox to\beamer@autobreakfactor\textheight% \global\setbox\beamer@splitbox=\box\beamer@framebox% \@tempdima=\ht\beamer@splitbox% @@ -249,7 +250,9 @@ \newtoks\beamer@framesubtitletoks \def\beamer@continueautobreak{% - \refstepcounter{framenumber}% + \ifbeamer@noframenumbering\else% + \refstepcounter{framenumber}% + \fi% \expandafter\beamer@frametitletoks\expandafter{\beamer@frametitle}% \expandafter\beamer@framesubtitletoks\expandafter{\beamer@shortframetitle}% \edef\beamer@callframetitle{\noexpand\frametitle[\the\beamer@framesubtitletoks]{\the\beamer@frametitletoks}}% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty index d83218620ba..d68e0c0c15d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty @@ -131,8 +131,6 @@ \ifx\beamer@nexttoken\mode\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\common\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\presentation\let\next=\beamer@stopoutsidemode\fi - \ifx\beamer@nexttoken\include\let\next=\beamer@stopoutsidemode\fi - \ifx\beamer@nexttoken\input\let\next=\beamer@stopoutsidemode\fi \ifx\beamer@nexttoken\begin\let\next=\beamer@checkbeginframe\fi \ifx\beamer@nexttoken\end\let\next=\beamer@checkenddoc\fi \next} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty index 6618b7e1f56..4587a7f0137 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty @@ -122,7 +122,7 @@ \fi% \def\inserttocsection{\hyperlink{Navigation#3}{#2}}% \beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@cs\else\beamer@toc@os\fi}% - { + {% \ifbeamer@pausesections\pause\fi% \ifx\beamer@toc@ooss\beamer@hidetext \vskip1.5em @@ -136,7 +136,7 @@ \par% }% }% - } + }% }% \beamer@restoreanother% } @@ -167,7 +167,7 @@ }% }}% \beamer@restoreanother% - } + }% \beamer@todo% \fi\fi% } |