texlive[44798] Master/texmf-dist: beamer (14jul17)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 15 00:16:30 CEST 2017
Revision: 44798
http://tug.org/svn/texlive?view=revision&revision=44798
Author: karl
Date: 2017-07-15 00:16:30 +0200 (Sat, 15 Jul 2017)
Log Message:
-----------
beamer (14jul17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beamer/doc/Makefile
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
trunk/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf
trunk/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf
trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls
trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty
trunk/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty
trunk/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
trunk/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
trunk/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty
trunk/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict
trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemedefault.pdf
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/Makefile 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/Makefile 2017-07-14 22:16:30 UTC (rev 44798)
@@ -14,7 +14,7 @@
colorthemes = default crane albatross seahorse whale dolphin \
rose orchid sidebartab lily structure dove seagull beetle fly wolverine spruce \
- beaver
+ beaver monarca
outerthemes = default infolines miniframes shadow sidebar smoothbars smoothtree split tree
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -128,7 +128,7 @@
\end{outerthemeexample}
\begin{outerthemeexample}[\oarg{options}]{sidebar}
- In this layout, a sidebar is shown that contains a small table of contents with the current section, subsection, or subsection highlighted. The frame title is vertically centered in a rectangular area at the top that always occupies the same amount of space in all frames. Finally, the logo is shown in the ``corner'' resulting from the sidebar and the frame title rectangle.
+ In this layout, a sidebar is shown that contains a small table of contents with the current section, subsection, or subsubsection highlighted. The frame title is vertically centered in a rectangular area at the top that always occupies the same amount of space in all frames. Finally, the logo is shown in the ``corner'' resulting from the sidebar and the frame title rectangle.
There are several ways of modifying the layout using the \meta{options}. If you set the width of the sidebar to 0pt, it is not shown, giving you a layout in which the frame title does not ``wobble'' since it always occupies the same amount of space on all slides. Conversely, if you set the height of the frame title rectangle to 0pt, the rectangular area is not used and the frame title is inserted normally (occupying as much space as needed on each slide).
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -258,6 +258,14 @@
\iteminsert{\insertdescriptionitem} inserts the text of the current description item.
\end{templateinserts}
\end{element}
+
+ \begin{element}{description body begin}\yes\no\no
+ This template is inserted at the beginning of a |description| environment. Furthermore, before this template is inserted, the \beamer-font and -color |description body| is used.
+ \end{element}
+
+ \begin{element}{description body end}\yes\no\no
+ This template is inserted at the end of a |description| environment.
+ \end{element}
\end{environment}
In order to simplify changing the color or font of items, the different kinds of items inherit from or just use the following ``general'' \beamer-color and fonts:
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2014,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -569,7 +570,7 @@
\only<3| handout:2>{Some text}
\end{verbatim}
-The vertical bar, which must be followed by a (white) space, separates the two different specifications |3| and |handout:2|. By writing a mode name before a colon, you specify that the following specification only applies to that mode. If no mode is given, as in |3|, the mode |beamer| is automatically added. For this reason, if you write |\only<3>{Text}| and you are in |handout| mode, the text will be shown on all slides since there is no restriction specified for handouts and since the |3| is the same as |beamer:3|.
+The vertical bar separates the two different specifications |3| and |handout:2|. By writing a mode name before a colon, you specify that the following specification only applies to that mode. If no mode is given, as in |3|, the mode |beamer| is automatically added. For this reason, if you write |\only<3>{Text}| and you are in |handout| mode, the text will be shown on all slides since there is no restriction specified for handouts and since the |3| is the same as |beamer:3|.
It is also possible to give an overlay specification that contains only a mode name (or several, separated by vertical bars):
\begin{verbatim}
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf 2017-07-14 22:16:30 UTC (rev 44798)
Property changes on: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemedefault.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2017 Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -12,7 +12,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.41}
+\def\beamerugversion{3.42}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
@@ -85,7 +85,7 @@
Copyright 2003--2007 by Till Tantau
Copyright 2010,2011 by Joseph Wright and Vedran Mileti\'c
-
+
Copyright 2016,2017 by Joseph Wright
\medskip
Modified: trunk/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016,2017 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,16 +11,13 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2017/01/23 v3.41 A class for typesetting presentations]
+ [2017/07/13 v3.42 A class for typesetting presentations]
-% Force e-TeX
-\RequirePackage{etoolbox}
-
+% Setup modes and check for article option
+% Also loads packages required by both beamer and beamerarticle
\RequirePackage{beamerbasemodes}
-% Setup modes and check for article option
-\beamer at transferifnecessary
-
+% For testing PDF versus DVI mode
\RequirePackage{ifpdf}
%
@@ -30,7 +27,6 @@
%
% Public
-\newdimen\headheight % Total height of the headline (including depth)
\newdimen\headdp % Depth of the headline
\newdimen\footheight % Height of the footline
\newdimen\sidebarheight % Height of the sidebars
@@ -78,7 +74,6 @@
\newcount\beamer at sectionadjust
\newcount\beamer at tocsectionnumber
-
\newif\ifbeamer at sansmath
\newif\ifbeamer at altmode
\newif\ifbeamer at notes
@@ -91,11 +86,9 @@
\newif\ifbeamer at ignorenonframe
\newif\ifbeamer at autopdfinfo
+% Option management
\RequirePackage{beamerbaseoptions}
-% For option management
-
-
%
%
% Document options
@@ -122,7 +115,6 @@
\DeclareOptionBeamer{t}{\beamer at centeredfalse}
\DeclareOptionBeamer{c}{\beamer at centeredtrue}
-
\DeclareOptionBeamer{leqno}{\input{leqno.clo}}
\DeclareOptionBeamer{fleqn}{\input{fleqn.clo}}
@@ -164,23 +156,17 @@
\def\beamer at hypercjk{}
\DeclareOptionBeamer{CJK}{\ExecuteOptionsBeamer{cjk}}
-\DeclareOptionBeamer{cjk}{
+\DeclareOptionBeamer{cjk}{%
\def\beamer at hypercjk{\hypersetup{CJKbookmarks=true}}
-
- \def\beamer at activecjk{
+ \def\beamer at activecjk{%
% Activate all >=128 characters.
- \count@=127
+ \count@=127 %
\@whilenum\count@<254 \do{%
- \advance\count@ by 1
+ \advance\count@ by 1 %
\lccode`\~=\count@
\catcode\count@=\active
- \lowercase{\def~{\kern1ex}}
- }
- }
-}
+ \lowercase{\def~{\kern1ex}}}}}
-
-
% obsolete options
\DeclareOptionBeamer{notes}[show]{\csname beamer at notesaction@#1\endcsname}
\def\beamer at notesaction@hide{%
@@ -199,36 +185,36 @@
\nofiles
}
\def\beamer at notesaction@onlyslideswithnotes{%
- \beamer at notestrue%
- \beamer at frameswithnotesonlytrue%
+ \beamer at notestrue
+ \beamer at frameswithnotesonlytrue
\nofiles
}
-\DeclareOptionBeamer{inrow}{
+\DeclareOptionBeamer{inrow}{%
\ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}}
\DeclareOptionBeamer{compressnotes}{%
\ClassWarning{beamer}{``compressnotes'' is obsolete. Use
\noexpand\setbeamertemplate{note page}[compressed] instead}
\AtBeginDocument{\beamertemplatenotecompress}}
-\DeclareOptionBeamer{notesonly}{
+\DeclareOptionBeamer{notesonly}{%
\ClassWarning{beamer}{``notesonly'' is obsolete. Use beamer option
``show only notes'' instead.}
\beamer at notesaction@only}
-\DeclareOptionBeamer{blue}{
+\DeclareOptionBeamer{blue}{%
\ClassWarning{beamer}{``blue'' is obsolete. Use color theme structure instead}
\def\beamer at loadlater{\usecolortheme[rgb={0.2,0.2,0.7}]{structure}}}
-\DeclareOptionBeamer{red}{
+\DeclareOptionBeamer{red}{%
\ClassWarning{beamer}{``red'' is obsolete. Use color theme structure instead}
\def\beamer at loadlater{\usecolortheme[rgb={0.7,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{blackandwhite}{
+\DeclareOptionBeamer{blackandwhite}{%
\ClassWarning{beamer}{``blackandwhite'' is obsolete. Use color theme structure instead}
\def\beamer at loadlater{\usecolortheme[rgb={0.2,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{brown}{
+\DeclareOptionBeamer{brown}{%
\ClassWarning{beamer}{``brown'' is obsolete. Use color theme structure instead}
\def\beamer at loadlater{\usecolortheme[rgb={0.66,0.4,0.166}]{structure}}}
-\DeclareOptionBeamer{slidescentered}{
+\DeclareOptionBeamer{slidescentered}{%
\ClassWarning{beamer}{``slidescentered'' is obsolete. Use ``c'' instead}
\beamer at centeredtrue}
-\DeclareOptionBeamer{slidestop}{
+\DeclareOptionBeamer{slidestop}{%
\ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead}
\beamer at centeredfalse}
\DeclareOptionBeamer{sans}{%
@@ -243,13 +229,13 @@
\def\mathfamilydefault{\rmdefault}
\beamer at sansmathfalse
}
-\DeclareOptionBeamer{mathsans}{
+\DeclareOptionBeamer{mathsans}{%
\ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``stillsansserifmath''}
\def\mathfamilydefault{\sfdefault}\beamer at sansmathtrue}
-\DeclareOptionBeamer{mathserif}{
+\DeclareOptionBeamer{mathserif}{%
\ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''}
\def\mathfamilydefault{\rmdefault}\beamer at sansmathfalse}
-\DeclareOptionBeamer{professionalfont}{
+\DeclareOptionBeamer{professionalfont}{%
\ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead}
\beamer at suppressreplacementstrue}
@@ -258,8 +244,6 @@
\def\mathfamilydefault{\sfdefault}
\beamer at sansmathtrue
-
-
\PassOptionsToPackage{bookmarks=true,%
bookmarksopen=true,%
pdfborder={0 0 0},%
@@ -276,13 +260,13 @@
\DeclareOptionBeamer{ucs}{%
\ifpdf
\PassOptionsToPackage{pdftex,unicode}{hyperref}
- \def\beamer at loaducs{
+ \def\beamer at loaducs{%
\RequirePackage[hyperref]{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
}
\else
- \def\beamer at loaducs{
+ \def\beamer at loaducs{%
\RequirePackage{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
@@ -292,10 +276,10 @@
\DeclareOptionBeamer{utf8x}{\ExecuteOptionsBeamer{ucs}%
\g at addto@macro\beamer at loaducs{\RequirePackage[utf8x]{inputenc}}%
}
-\DeclareOptionBeamer{utf8}{
- \ClassWarning{beamer}{This option works no longer loads ucs.}
- \RequirePackage[utf8]{inputenc}
- \PassOptionsToPackage{unicode}{hyperref}
+\DeclareOptionBeamer{utf8}{%
+ \ClassWarning{beamer}{This option works no longer loads ucs.}%
+ \RequirePackage[utf8]{inputenc}%
+ \PassOptionsToPackage{unicode}{hyperref}%
}
%
@@ -303,34 +287,34 @@
% Default value is set right after declaring width and height
% because it doesn't work otherwise.
%
-\newlength\beamer at paperwidth%
-\beamer at paperwidth 12.80cm%
-\newlength\beamer at paperheight%
-\beamer at paperheight 9.60cm%
+\newlength\beamer at paperwidth
+\setlength\beamer at paperwidth{12.80cm}
+\newlength\beamer at paperheight
+\setlength\beamer at paperheight{9.60cm}
\DeclareOptionBeamer{aspectratio}[43]{%
- \ifnum#1=1610%
- \beamer at paperwidth 16.00cm%
- \beamer at paperheight 10.00cm%
- \else\ifnum#1=169%
- \beamer at paperwidth 16.00cm%
- \beamer at paperheight 9.00cm%
- \else\ifnum#1=149%
- \beamer at paperwidth 14.00cm%
- \beamer at paperheight 9.00cm%
- \else\ifnum#1=54%
- \beamer at paperwidth 12.50cm%
- \beamer at paperheight 10.00cm%
- \else\ifnum#1=43%
- \beamer at paperwidth 12.80cm%
- \beamer at paperheight 9.60cm%
- \else\ifnum#1=32%
- \beamer at paperwidth 13.50cm%
- \beamer at paperheight 9.00cm%
- \else\ifnum#1=141%
- \beamer at paperwidth 14.85cm%
- \beamer at paperheight10.50cm%
- \fi\fi\fi\fi\fi\fi\fi%
+ \ifnum#1=1610 %
+ \setlength\beamer at paperwidth{16.00cm}%
+ \setlength\beamer at paperheight{10.00cm}%
+ \else\ifnum#1=169 %
+ \setlength\beamer at paperwidth{16.00cm}%
+ \setlength\beamer at paperheight{9.00cm}%
+ \else\ifnum#1=149 %
+ \setlength\beamer at paperwidth{14.00cm}%
+ \setlength\beamer at paperheight{9.00cm}%
+ \else\ifnum#1=54 %
+ \setlength\beamer at paperwidth{12.50cm}%
+ \setlength\beamer at paperheight{10.00cm}%
+ \else\ifnum#1=43 %
+ \setlength\beamer at paperwidth{12.80cm}%
+ \setlength\beamer at paperheight{9.60cm}%
+ \else\ifnum#1=32 %
+ \setlength\beamer at paperwidth{13.50cm}%
+ \setlength\beamer at paperheight{9.00cm}%
+ \else\ifnum#1=141 %
+ \setlength\beamer at paperwidth{14.85cm}%
+ \setlength\beamer at paperheight{10.50cm}%
+ \fi\fi\fi\fi\fi\fi\fi
}
\RequirePackage[%
@@ -355,28 +339,23 @@
% Filter class option list
\beamer at filterclassoptions
-
+% Low-level graphic drawing and advanced color support.
\RequirePackage{pgfcore}
-% We need only the core stuff.
-
\RequirePackage{xxcolor}
-% For color management (comes with pgf).
+% Normally loaded by hyperref but to be on the safe side ...
\RequirePackage{atbegshi}
-% Normally loaded by hyperref but to be on the safe side ...
\RequirePackage[implicit=false]{hyperref}
-% For hyperlinks
\hypersetup{pdfcreator={LaTeX with Beamer class}}
-% Coding stuff
+% Encoding stuff
\beamer at loaducs
\beamer at hypercjk
-
+% Beamer packages required both by presentation and article modes
\RequirePackage{beamerbaserequires}
-% Beamer packages required both by presentation and article modes
% Defaults
\normalfont
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016,2017 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,14 +11,12 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2017/01/23 v3.41 beamer input in article mode]
+ [2017/07/13 v3.42 beamer input in article mode]
-\RequirePackage{etoolbox}
-
+% Setup modes and check for article option
+% Also loads packages required by both beamer and beamerarticle
\RequirePackage{beamerbasemodes}
-% Setup modes and check for article option
-
\DeclareOption{utf8}{\PassOptionsToPackage{utf8}{beamerbasearticle}}
\DeclareOption{hyperref}{\PassOptionsToPackage{hyperref}{beamerbasearticle}}
\DeclareOption{noxcolor}{\PassOptionsToPackage{noxcolor}{beamerbasearticle}}
@@ -29,9 +27,8 @@
\DeclareOption{activeospeccharacters}{\PassOptionsToPackage{activeospeccharacters}{beamerbasearticle}}
\DeclareOption{nokeywords}{\PassOptionsToPackage{nokeywords}{beamerbasearticle}}
-\ProcessOptions
+\ProcessOptions\relax
-
\def\beamer at slide#1#2{\expandafter\gdef\csname beamer at slide#1\endcsname{#2}}
\beamer at inpresentationfalse
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -49,8 +49,8 @@
}
{}
+% Option management
\RequirePackage{beamerbaseoptions}
-% For option management
\ifbeamer at articleutf
\RequirePackage[utf8]{inputenc}
@@ -58,8 +58,6 @@
\ifbeamer at articlehyperref
\RequirePackage[pdfborder={0 0 0},bookmarksnumbered]{hyperref}
- % For hyperlinks
-
\hypersetup{pdfcreator={LaTeX with Beamer class (article mode)}}
\ifbeamer at articleutf
\hypersetup{unicode=true}
@@ -68,13 +66,11 @@
\ifbeamer at articlexcolor
\RequirePackage[override]{xcolor}
- % For color support
\fi
+% Beamer packages required both by presentation and article modes
\RequirePackage{beamerbaserequires}
-% Beamer packages required both by presentation and article modes
-
% Default article templates:
\defbeamertemplate<article>*{frame begin}{default}{}
\defbeamertemplate<article>*{frame end}{default}{}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -305,6 +305,8 @@
\def\underline#1{{\donotcoloroutermaths\beamer at orig@underline{#1}}}
% Fix $ usage in underline:
+ \let\beamer at orig@@textsubscript=\@textsubscript
+ \def\@textsubscript#1{{\donotcoloroutermaths\beamer at orig@@textsubscript{#1}}}
\let\beamer at orig@@textsuperscript=\@textsuperscript
\def\@textsuperscript#1{{\donotcoloroutermaths\beamer at orig@@textsuperscript{#1}}}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -16,6 +16,7 @@
%
%
% Hyperlink fix for problem with empty test in pdfmark.def
+% Note that this is redefined again later (for overlays)
%
%
\let\beamer at orighyperlink\hyperlink
@@ -51,35 +52,25 @@
%
\let\beamer at origdocument\document
\def\document{%
- \beamer at firstminutepatches%
- \endgroup%
-
+ \beamer at firstminutepatches
+ \endgroup
\AtBeginDocument{% fix spanish.ldf's meddling with < and >
%
% Fix spanish.ldf's meddling with < and >
%
- \@ifundefined{deactivatequoting}{}{\deactivatequoting}
-
+ \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
% Fix meddline with enumerate items
- \renewcommand\theenumi{\@arabic\c at enumi}
- \renewcommand\theenumii{\@arabic\c at enumii}
- \renewcommand\theenumiii{\@arabic\c at enumiii}
- }
+ \renewcommand\theenumi{\@arabic\c at enumi}%
+ \renewcommand\theenumii{\@arabic\c at enumii}%
+ \renewcommand\theenumiii{\@arabic\c at enumiii}%
+ }%
+ \begingroup
+ \beamer at origdocument
+ \beamer at lastminutepatches
+ \ifbeamer at ignorenonframe
+ \expandafter\mode\expandafter*%
+ \fi}
- \AtBeginDocument{% fix frenchb.ldf's meddling with itemize and :
- \let\labelitemi\beamer at labelitemi
- \let\labelitemii\beamer at labelitemii
- \let\itemize\beamer at itemize
- \let\list\beamer at list
- \let\@trivlist\beamer@@trivlist%
- \catcode`<=12\catcode`>=12}
-
- \begingroup\beamer at origdocument%
- \beamer at lastminutepatches%
- \ifbeamer at ignorenonframe%
- \expandafter\mode\expandafter*%
- \fi}
-
\mode
<article>
{
@@ -91,17 +82,14 @@
\g at addto@macro\beamer at lastminutepatches{%
\ifbeamer at articleactive
\else
- \catcode`<=12\catcode`>=12
+ \catcode`<=12 %
+ \catcode`>=12 %
\fi
}
}
-
\AtBeginDocument{\def\es at itemize#1#2#3#4{}}% fix spanish.ldf's with \itemize
-
-
-
%
% Fix for older versions of geometry
% We used to test \ifGm at compatii,
@@ -108,19 +96,18 @@
% but as of geometry v5.0, it is no longer provided.
%
\ifx\Gm at lmargin\@undefined
-\def\Gm at lmargin{\Geom at lmargin}\def\Gm at rmargin{\Geom at rmargin}
+ \def\Gm at lmargin{\Geom at lmargin}
+ \def\Gm at rmargin{\Geom at rmargin}
\else
-\geometry{includeheadfoot}
+ \geometry{includeheadfoot}
\fi
-
-
%
% Fix deluxetabular floats
%
-\AtBeginDocument{
+\AtBeginDocument{%
\def\@plano at float@#1{\begin{table}}
- \def\end at plano@float@{\end{table}}
+ \def\end at plano@float@{\end{table}}%
}
%
@@ -136,8 +123,8 @@
% Heiko's fix for correct generation of section* and subsection* bookmarks
%
\g at addto@macro\beamer at lastminutepatches{%
- \long\def\@LongEmpty{}
- \newcommand*{\org at beamer@section}{}
+ \long\def\@LongEmpty{}%
+ \newcommand*{\org at beamer@section}{}%
\let\org at beamer@section\beamer at section{}%
\let\org at writebookmark\Hy at writebookmark{}%
\long\def\beamer at section[#1]#2{%
@@ -151,8 +138,8 @@
\def\Hy at writebookmark##1##2##3##4##5{}%
\fi
\org at beamer@section[{#1}]{#2}%
- }
- \newcommand*{\org at beamer@subsection}{}
+ }%
+ \newcommand*{\org at beamer@subsection}{}%
\let\org at beamer@subsection\beamer at subsection{}%
\long\def\beamer at subsection[#1]#2{%
\let\Hy at writebookmark\org at writebookmark
@@ -165,7 +152,7 @@
\def\Hy at writebookmark##1##2##3##4##5{}%
\fi
\org at beamer@subsection[{#1}]{#2}%
- }
+ }%
}
%
@@ -204,9 +191,6 @@
\providecommand\ext at table{}
\providecommand\ext at figure{}
-
-
-
%
% Obsolete commands from old versions of beamer
%
@@ -213,6 +197,8 @@
\mode
<all>
{
+ \let\beamer at ifempty=\ifblank
+
\let\beamer at verb@egroup=\verb at egroup
\def\beamer at setb{\setbox0=\copy}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -9,51 +10,49 @@
%
% See the file doc/licenses/LICENSE for more details.
+% To track which slide we are on in a frame
\newcount\beamer at slideinframe
\newcount\beamer at minimum
+
+% Indicate whether another slide needs to be processed in this frame
\newif\ifbeamer at anotherslide
-\newif\ifbeamer at localanotherslide
+% Used to know that beamerpauses needs to be used in substitution
\newif\ifbeamer at plusencountered
-%
-%
-% Empty test
-%
-%
-\long\def\beamer at ifempty#1{\beamer at xifempty#1@@..\@nil}
-\long\def\beamer at xifempty#1#2@#3#4#5\@nil{%
- \ifx#3#4\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\let\beamer at ifnextchar=\@ifnextchar
-
-\def\beamer at stoptexts{| stop:0| }
-{
- \catcode`\|=13
- \catcode`\:=13
- \catcode`\,=13
- \catcode`\.=13
- \catcode`\+=13
- \catcode`\-=13
- \catcode`\(=13
- \catcode`\)=13
- \catcode`\ =13
-\gdef\beamer at masterdecode#1{% must be called within a group
-\ifnum\catcode`\|=13\edef|{\string|}\fi%
-\ifnum\catcode`\:=13\edef:{\string:}\fi%
-\ifnum\catcode`\,=13\edef,{\string,}\fi%
-\ifnum\catcode`\.=13\edef.{\string.}\fi%
-\ifnum\catcode`\+=13\edef+{\string+}\fi%
-\ifnum\catcode`\-=13\edef-{\string-}\fi%
-\ifnum\catcode`\(=13\edef({\string(}\fi%
-\ifnum\catcode`\)=13\edef){\string)}\fi%
-\ifnum\catcode`\ =13\edef {\string }\fi%
-\edef\beamer@@@temp{#1\beamer at stoptexts}%
-\beamer at localanotherslidefalse%
+% The main decoding macro tolerates a range of active characters, which
+% require a little set up. In particular, as an active space is allowed
+% 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.
+\begingroup
+ \catcode`\|=\active
+ \catcode`\:=\active
+ \catcode`\,=\active
+ \catcode`\.=\active
+ \catcode`\+=\active
+ \catcode`\-=\active
+ \catcode`\(=\active
+ \catcode`\)=\active
+ \catcode`\ =\active
+\xdef\beamer at masterdecode#1{%
\setbox0=\hbox{%
-\expandafter\beamer at decode\beamer@@@temp%
-\ifbeamer at localanotherslide\global\beamer at localanotherslidetrue\fi}%
+\unexpanded{%
+\ifnum\catcode`\|=\active\edef|{\string|}\fi%
+\ifnum\catcode`\:=\active\edef:{\string:}\fi%
+\ifnum\catcode`\,=\active\edef,{\string,}\fi%
+\ifnum\catcode`\.=\active\edef.{\string.}\fi%
+\ifnum\catcode`\+=\active\edef+{\string+}\fi%
+\ifnum\catcode`\-=\active\edef-{\string-}\fi%
+\ifnum\catcode`\(=\active\edef({\string(}\fi%
+\ifnum\catcode`\)=\active\edef){\string)}\fi%
+\ifnum\catcode`\ =\active\edef {\string }\fi}%
+\edef\noexpand\beamer@@@temp{#1\string|stop\string:0\string|}%
+\edef\noexpand\beamer@@@temp{\unexpanded{\expandafter\zap at space\beamer@@@temp}%
+\space\noexpand\@empty}%
+\unexpanded{\expandafter\beamer at decode\beamer@@@temp}}%
}%
-}
+\endgroup
% Sets dowhat to doif, if \beamer at slideinframe is in the specified
% interval. Example: 5-7,-3,9,11,13- would mean pages
@@ -64,22 +63,24 @@
\def\beamer at allsign{*}
+% The main decoding routine starts by initialising the starting a search
+% for everything up to "|": to allow for the simple case of overlays in
+% slides for presentations there is a need to insert "beamer:". Notice
+% that \beamer@@decodefind may be called multiple times, hence being set
+% up as an auxiliary.
\def\beamer at decode{%
- \beamer at plusencounteredfalse%
- \global\beamer at minimum=10000\relax%
+ \beamer at plusencounteredfalse
+ \global\beamer at minimum=10000\relax
\gdef\beamer at decaction{}%
- \gdef\beamer at decactionrev{}%
- \global\let\beamer at decodefound=\beamer at allsign%
+ \global\let\beamer at decodefound=\beamer at allsign
\beamer@@decodefind}
-\def\beamer@@decodefind#1|{%
- \beamer at ifnextchar\@undefined% get rid of spaces
- {\beamer@@@decodefind#1:|}{\beamer@@@decodefind#1:|}}
+\def\beamer@@decodefind#1|{\beamer@@@decodefind#1:|}
\def\beamer@@@decodefind#1:#2|{%
- \beamer at ifempty{#2}%
- {\beamer at decodefind beamer:#1:}%
- {\beamer at decodefind #1:#2}}
+ \ifblank{#2}%
+ {\beamer at decodefind beamer:#1:}%
+ {\beamer at decodefind #1:#2}}
-
+% A list of possible overlay modes
\def\beamer at default{default}
\def\beamer at articlemode{article}
\def\beamer at secondmode{second}
@@ -87,98 +88,93 @@
\def\beamer at presentationmode{presentation}
\def\beamer at modeall{all}
\def\beamer at ovmodestop{stop}
+
+% The main parsing function for each sub-part starts by splitting at any
+% "@" and then checking the spec for various cases: keywords, "+", ".".
+% After that, there is some cleanup to do before potentially looping.
\def\beamer at decodefind#1:#2:{%
\def\beamer at ovmode{#1}%
- \beameratdecodeaction{#2}%
- \expandafter\futurelet\expandafter\next\expandafter\beamer at checkcat\beamer at spec:%
+ \beamer at decodeaction{#2}%
+ \expandafter\futurelet\expandafter\next\expandafter
+ \beamer at checkcat\beamer at spec:%
\expandafter\beamer at decodeplus\beamer at spec+:%
\expandafter\beamer at decodedot\beamer at spec.:%
- \ifx\beamer at ovmode\beamer at ovmodestop%
+ \ifx\beamer at ovmode\beamer at ovmodestop
\expandafter\beamer@@decode\beamer at decodefound,!%
- \let\beamer at next=\relax%
- \ifbeamer at plusencountered\global\advance\c at beamerpauses by1\relax\fi%
+ \let\beamer at next=\relax
+ \ifbeamer at plusencountered\stepcounter{beamerpauses}\fi
\else
- \ifx\beamer at ovmode\beamer at currentmode%
- \beamer@@decodefound%
- \else%
- \ifx\beamer at ovmode\beamer at modeall%
- \beamer@@decodefound%
- \else%
- \ifx\beamer at ovmode\beamer at presentationmode%
- \ifx\beamer at currentmode\beamer at articlemode%
- \else%
- \beamer@@decodefound%
- \fi%
- \else%
- \ifx\beamer at ovmode\beamer at beamermode%
- \ifx\beamer at currentmode\beamer at secondmode%
- \beamer@@decodefound%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
- \let\beamer at next=\beamer@@decodefind%
- \fi%
+ \ifx\beamer at ovmode\beamer at currentmode
+ \beamer@@decodefound
+ \else
+ \ifx\beamer at ovmode\beamer at modeall
+ \beamer@@decodefound
+ \else
+ \ifx\beamer at ovmode\beamer at presentationmode
+ \ifx\beamer at currentmode\beamer at articlemode
+ \else
+ \beamer@@decodefound
+ \fi
+ \else
+ \ifx\beamer at ovmode\beamer at beamermode
+ \ifx\beamer at currentmode\beamer at secondmode
+ \beamer@@decodefound
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \let\beamer at next=\beamer@@decodefind
+ \fi
\beamer at next}
+% The aim here is to find any "<action>@" spec, and to split it off the
+% action from the rest. That uses a pretty stand search approach.
+\edef\beamer at decodeaction#1{%
+ \noexpand\beamer@@decodeaction#1\string @\string @:}
+\begingroup
+\edef\beamer@@@temp{%
+ \endgroup
+ \def\noexpand\beamer@@decodeaction##1\string @##2\string @##3:{%
+ \noexpand\ifblank{##2}%
+ {%
+ \def\noexpand\beamer at action{default}%
+ \def\noexpand\beamer at spec{##1}%
+ }%
+ {%
+ \def\noexpand\beamer at action{##1}%
+ \def\noexpand\beamer at spec{##2}%
+ }%
+ }%
+}%
+\beamer@@@temp
+
+% Search for the case where the specification is a keyword, and if it
+% is set the overlay mode and spec.
\def\beamer at checkcat#1:{%
\ifcat\next a%
\gdef\beamer at ovmode{#1}%
\ifx\beamer at decodefound\beamer at allsign
\gdef\beamer at decodefound{0}%
- \fi%
- \gdef\beamer at spec{1-}%
- \fi%
- }
-
-\def\beamer@@decodefound{%
- \ifx\beamer at action\beamer at default%
- \expandafter\gdef\expandafter\beamer at decodefound\expandafter{\beamer at spec}%
- \else
- \xdef\beamer at decaction{\beamer at decaction{\beamer at action<\beamer at spec>}}
- \xdef\beamer at decactionrev{{\beamer at action}\beamer at decactionrev}
+ \fi
+ \def\beamer at spec{1-}%
\fi}
-\def\beamer at currentaction{default}
-{
-\makeatother
-\gdef\beameratdecodeaction#1{%
- \beameratdecodeactionb#1@:}
-\gdef\beameratdecodeactionb#1@#2:{%
- \beameratdecodeactionc{#1}{#2}}
-\gdef\beameratgetridofat#1@{%
- \gdef\beameratspec{#1}%
-}
-}
-
-\def\beameratdecodeactionc#1#2{%
- \gdef\beamer at spec{#2}%
- \ifx\beamer at spec\@empty%
- \xdef\beamer at spec{#1}%
- \gdef\beamer at action{default}%
- \else%
- \xdef\beamer at action{#1}%
- \beameratgetridofat#2%
- \xdef\beamer at spec{\beameratspec}
- \fi%
-}
-
\def\beamer at decodeplus{%
\def\beamer at spec{}\beamer@@decodeplus}
\def\beamer@@decodeplus#1+#2:{%
- \edef\beamer at spec{\beamer at spec#1}% everything up to first +
- \beamer at ifempty{#2}{}
+ \edef\beamer at spec{\beamer at spec#1}% everything up to a +
+ \ifblank{#2}{}
{% ok, check if followed by number:
- \beamer at plusencounteredtrue%
+ \beamer at plusencounteredtrue
\beamer@@@decodeplus#2:}}
\def\beamer@@@decodeplus{%
- \beamer at ifnextchar({\beamer at relnumber}{\beamer at relnumber(0)}}
+ \kernel at ifnextchar(%)
+ {\beamer at relnumber}{\beamer at relnumber(0)}}
\def\beamer at relnumber(#1){%
- \beamer at plusencounteredtrue%
- \beamer at tempcount=#1\relax
- \advance\beamer at tempcount by\c at beamerpauses\relax%
- \edef\beamer at spec{\beamer at spec\the\beamer at tempcount}%
+ \beamer at plusencounteredtrue
+ \edef\beamer at spec
+ {\beamer at spec\number\numexpr #1 + \value{beamerpauses}\relax}%
\beamer@@decodeplus}
\def\beamer at decodedot{%
@@ -185,69 +181,111 @@
\def\beamer at spec{}\beamer@@decodedot}
\def\beamer@@decodedot#1.#2:{%
\edef\beamer at spec{\beamer at spec#1}% everything up to first .
- \beamer at ifempty{#2}{}{\beamer@@@decodedot#2:}}
+ \ifblank{#2}{}{\beamer@@@decodedot#2:}}
\def\beamer@@@decodedot{%
- \beamer at ifnextchar({\beamer at relnumberdot}{\beamer at relnumberdot(0)}}
+ \kernel at ifnextchar(%)
+ {\beamer at relnumberdot}{\beamer at relnumberdot(0)}}
\def\beamer at relnumberdot(#1){%
- \beamer at tempcount=#1\relax
- \advance\beamer at tempcount by\c at beamerpauses\relax%
- \advance\beamer at tempcount by-1\relax%
- \edef\beamer at spec{\beamer at spec\the\beamer at tempcount}%
+ \edef\beamer at spec
+ {\beamer at spec\number\numexpr #1 + \value{beamerpauses} -1\relax}%
\beamer@@decodedot}
+\def\beamer@@decodefound{%
+ \ifx\beamer at action\beamer at default
+ \xdef\beamer at decodefound{\beamer at spec}%
+ \else
+ \xdef\beamer at decaction{{\beamer at action<\beamer at spec>}}%
+ \fi}
+\def\beamer at currentaction{default}
+
\def\beamer at doifnotinframe{}
+
+% A set of macros to deal with what can form the basis of an action
+% spec once we know the basic shape: the key concepts are whether there
+% are more slides to do and how many there are in total.
\def\beamer@@decode{%
- \beamer at ifnextchar!%
+ \kernel at ifnextchar!%
{\beamer at decodeend}%
{%
- \beamer at ifnextchar*%
+ \kernel at ifnextchar*%
{\beamer at decodeall}{%
- \beamer at ifnextchar-%
+ \kernel at ifnextchar-%
{\beamer at decodeuntil}%
{\beamer at decodenumber}}}}
\def\beamer at decodeend!{}
\def\beamer at decodeall*,{%
- \ifnum1<\beamer at minimum\global\beamer at minimum=1\fi%
- \ifnum1>\beamer at slideinframe%
- \global\beamer at anotherslidetrue%
- \beamer at localanotherslidetrue%
- \fi%
- \gdef\beamer at doifnotinframe{\beamer at doifinframe}\beamer@@decode}
+ \ifnum1<\beamer at minimum
+ \global\beamer at minimum=1\relax
+ \fi
+ \ifnum1>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \gdef\beamer at doifnotinframe{\beamer at doifinframe}%
+ \beamer@@decode}
\def\beamer at decodeuntil-#1,{%
- \ifnum1<\beamer at minimum\global\beamer at minimum=1\fi%
- \ifnum#1>\beamer at slideinframe\global\beamer at anotherslidetrue\beamer at localanotherslidetrue\fi%
- \ifnum\beamer at slideinframe>#1\else\gdef\beamer at doifnotinframe{\beamer at doifinframe}\fi%
+ \ifnum1<\beamer at minimum
+ \global\beamer at minimum=1\relax
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \ifnum\beamer at slideinframe>#1\relax
+ \else
+ \gdef\beamer at doifnotinframe{\beamer at doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer at decodenumber#1{%
- \beamer at ifnextchar,%
+ \kernel at ifnextchar,%
{\beamer at decodeone{#1}}%
- {\beamer at ifnextchar-%
+ {\kernel at ifnextchar-%
{\beamer at decodenumberto{#1}}%
{\beamer at decodegobble{#1}}}}
\def\beamer at decodegobble#1#2{%
\beamer at decodenumber{#1#2}}
-\def\beamer at decodenumberto#1-{
- \beamer at ifnextchar,%
+\def\beamer at decodenumberto#1-{%
+ \kernel at ifnextchar,%
{\beamer at decodeto{#1}}%
{\beamer at decodebetween{#1}}}
\def\beamer at decodeto#1,{%
- \ifnum#1<\beamer at minimum\global\beamer at minimum=#1\fi%
- \ifnum#1>\beamer at slideinframe\global\beamer at anotherslidetrue\beamer at localanotherslidetrue\fi%
- \ifnum#1>\beamer at slideinframe\else\gdef\beamer at doifnotinframe{\beamer at doifinframe}\fi%
+ \ifnum#1<\beamer at minimum
+ \global\beamer at minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \else
+ \gdef\beamer at doifnotinframe{\beamer at doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer at decodebetween#1#2,{%
- \ifnum#1<\beamer at minimum\global\beamer at minimum=#1\fi%
- \ifnum#1>\beamer at slideinframe\global\beamer at anotherslidetrue\beamer at localanotherslidetrue\fi%
- \ifnum#2>\beamer at slideinframe\global\beamer at anotherslidetrue\beamer at localanotherslidetrue\fi%
- \ifnum#1>\beamer at slideinframe\else\ifnum#2<\beamer at slideinframe\else\gdef\beamer at doifnotinframe{\beamer at doifinframe}\fi\fi%
+ \ifnum#1<\beamer at minimum
+ \global\beamer at minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \ifnum#2>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \else
+ \ifnum#2<\beamer at slideinframe
+ \else
+ \gdef\beamer at doifnotinframe{\beamer at doifinframe}%
+ \fi
+ \fi
\beamer@@decode}
\def\beamer at decodeone#1,{%
- \ifnum#1<\beamer at minimum\global\beamer at minimum=#1\fi%
- \ifnum#1>\beamer at slideinframe\global\beamer at anotherslidetrue\beamer at localanotherslidetrue\fi%
- \ifnum#1=\beamer at slideinframe\gdef\beamer at doifnotinframe{\beamer at doifinframe}\fi%
+ \ifnum#1<\beamer at minimum
+ \global\beamer at minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer at slideinframe
+ \global\beamer at anotherslidetrue
+ \fi
+ \ifnum#1=\beamer at slideinframe
+ \gdef\beamer at doifnotinframe{\beamer at doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer at donow{\beamer at doifnotinframe}
-
-\def\beamer at saveanother{\let\beamer at savedif=\ifbeamer at anotherslide}
-\def\beamer at restoreanother{\global\let\ifbeamer at anotherslide=\beamer at savedif}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -10,13 +10,13 @@
%
% See the file doc/licenses/LICENSE for more details.
-\ifbeamer at amssymb
-\RequirePackage{amssymb}
% For \blacktriangleright; not explicitly required by article, but can cause
% weird situations if users find that symbols works in presentation, but not
% in article mode.
% However, some classes or font packages clash with amssymb, so allow to
% disable auto-loading optionally.
+\ifbeamer at amssymb
+ \RequirePackage{amssymb}
\fi
\mode
@@ -45,26 +45,28 @@
{\expandafter\def\csname beamer at thmfinherits@\beamer at temp\endcsname{%
\@for\@temp:={#1}\do{\expandafter\usebeamerfont\expandafter{\@temp}}}}
-\def\setbeamerfont{\@ifstar{\beamer at clearbeamerfont}{\beamer at setbeamerfont}}
+\newrobustcmd*\setbeamerfont{%
+ \@ifstar{\beamer at clearbeamerfont}{\beamer at setbeamerfont}}
\newcommand\beamer at clearbeamerfont[2]{%
- \def\beamer at temp{#1}
- \setkeys{beamerthm}{size={},shape={},series={},family={},parent={}}
- \setkeys{beamerthm}{#2}
+ \def\beamer at temp{#1}%
+ \setkeys{beamerthm}{size={},shape={},series={},family={},parent={}}%
+ \setkeys{beamerthm}{#2}%
}
\newcommand\beamer at setbeamerfont[2]{%
- \def\beamer at temp{#1}
- \setkeys{beamerthm}{#2}
+ \def\beamer at temp{#1}%
+ \setkeys{beamerthm}{#2}%
}
-\def\usebeamerfont{\@ifstar{\reset at font\beamer at usebeamerfont}{\beamer at usebeamerfont}}
+\newrobustcmd*\usebeamerfont{%
+ \@ifstar{\reset at font\beamer at usebeamerfont}{\beamer at usebeamerfont}}
\newcommand\beamer at usebeamerfont[1]{%
- \csname beamer at thmfinherits@#1\endcsname%
- \csname beamer at thmfsize@#1\endcsname%
- \csname beamer at thmfshape@#1\endcsname%
- \csname beamer at thmfseries@#1\endcsname%
- \csname beamer at thmffamily@#1\endcsname%
+ \csname beamer at thmfinherits@#1\endcsname
+ \csname beamer at thmfsize@#1\endcsname
+ \csname beamer at thmfshape@#1\endcsname
+ \csname beamer at thmfseries@#1\endcsname
+ \csname beamer at thmffamily@#1\endcsname
\selectfont}
@@ -74,7 +76,7 @@
%
\def\EC at family#1#2#3#4#5{%
\DeclareFontShape{#1}{#2}{#3}{#4}%
- {<5><6><7><8><9><10><10.95><12><14.4>%
+ {<3><4><5><6><7><8><9><10><10.95><12><14.4>%
<17.28><20.74><24.88><29.86><35.83><42.99><51.59>genb*#5}{}}
\EC at family{T1}{cmr}{m}{n}{ecrm}
\EC at family{T1}{cmr}{m}{sl}{ecsl}
@@ -87,18 +89,18 @@
\EC at family{T1}{cmr}{bx}{sc}{ecxc}
\EC at family{T1}{cmr}{m}{ui}{ecui}
\DeclareFontShape{OT1}{cmr}{m}{n}%
- {<5><6><7><8><9><10><12>gen*cmr%
+ {<3><4><5><6><7><8><9><10><12>gen*cmr%
<10.95>cmr10%
<14.4>cmr12%
<17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17}{}
\DeclareFontShape{OT1}{cmr}{m}{sl}%
- {<5><6><7>cmsl8%
+ {<3><4><5><6><7>cmsl8%
<8><9>gen*cmsl%
<10><10.95>cmsl10%
<12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12%
}{}
\DeclareFontShape{OT1}{cmr}{m}{it}%
- {<5><6><7>cmti7%
+ {<3><4><5><6><7>cmti7%
<8>cmti8%
<9>cmti9%
<10><10.95>cmti10%
@@ -105,28 +107,28 @@
<12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12%
}{}
\DeclareFontShape{OT1}{cmr}{m}{sc}%
- {<5><6><7><8><9><10><10.95><12>%
+ {<3><4><5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmcsc10%
}{}
\DeclareFontShape{OT1}{cmr}{m}{ui}
- {<5><6><7><8><9><10><10.95><12>%
+ {<3><4><5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmu10%
}{}
\DeclareFontShape{OT1}{cmr}{b}{n}
- {<5><6><7><8><9><10><10.95><12>%
+ {<3><4><5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmb10%
}{}
\DeclareFontShape{OT1}{cmr}{bx}{n}
- {<5><6><7><8><9>gen*cmbx%
+ {<3><4><5><6><7><8><9>gen*cmbx%
<10><10.95>cmbx10%
<12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbx12%
}{}
\DeclareFontShape{OT1}{cmr}{bx}{sl}
- {<5><6><7><8><9>%
+ {<3><4><5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10%
}{}
\DeclareFontShape{OT1}{cmr}{bx}{it}
- {<5><6><7><8><9>%
+ {<3><4><5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10%
}{}
\DeclareFontFamily{T1}{cmss}{}
@@ -137,13 +139,13 @@
\EC at family{T1}{cmss}{bx}{it}{ecso}
\EC at family{T1}{cmss}{bx}{sl}{ecso}
\DeclareFontShape{T1}{cmss}{sbc}{n}{%
- <5><6><7><8><9><10><10.95><12><14.4><17.28>%
+ <3><4><5><6><7><8><9><10><10.95><12><14.4><17.28>%
<20.74><24.88><29.86><35.83><42.99><51.59>%
ecssdc10
}{}
\DeclareFontShape{OT1}{cmss}{m}{n}
{%
- <5><6><7><8>cmss8%
+ <3><4><5><6><7><8>cmss8%
<9>cmss9%
<10><10.95>cmss10%
<12><14.4>cmss12%
@@ -151,7 +153,7 @@
}{}
\DeclareFontShape{OT1}{cmss}{m}{sl}
{%
- <5><6><7><8>cmssi8<9>cmssi9%
+ <3><4><5><6><7><8>cmssi8<9>cmssi9%
<10><10.95>cmssi10%
<12><14.4>cmssi12%
<17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmssi17%
@@ -158,7 +160,7 @@
}{}
\DeclareFontShape{OT1}{cmss}{m}{it}
{%
- <5><6><7><8>cmssi8<9>cmssi9%
+ <3><4><5><6><7><8>cmssi8<9>cmssi9%
<10><10.95>cmssi10%
<12><14.4>cmssi12%
<17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmssi17%
@@ -165,135 +167,135 @@
}{}
\DeclareFontShape{OT1}{cmss}{sbc}{n}
{%
- <5><6><7><8><9>cmssdc10%
+ <3><4><5><6><7><8><9>cmssdc10%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmssdc10%
}{}
\DeclareFontShape{OT1}{cmss}{bx}{n}
{%
- <5><6><7><8><9>cmssbx10%
+ <3><4><5><6><7><8><9>cmssbx10%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmssbx10%
}{}
\newcommand*{\beamer at font@check}{%
- \def\beamer at cmr{cmr}
- \edef\beamer at fmdef{\mathfamilydefault}
+ \def\beamer at cmr{cmr}%
+ \edef\beamer at fmdef{\mathfamilydefault}%
% supress for standard cm
\ifx\beamer at fmdef\beamer at cmr\beamer at suppressreplacementstrue\fi
% supress for mathtime serif and math minion serif
- \@ifpackageloaded{arevmath}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{hvmath}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{kpfonts}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lucidabr}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lmodern}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lucimatx}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathastext}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathpmnt}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathpple}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathtime}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mtpro}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mtpro2}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}
+ \@ifpackageloaded{arevmath}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{hvmath}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{kpfonts}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lucidabr}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lmodern}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lucimatx}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathastext}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathpmnt}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathpple}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathtime}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mtpro}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mtpro2}{\ifbeamer at sansmath\else\beamer at suppressreplacementstrue\fi}{}%
}
\AtBeginDocument{%
\beamer at font@check
\ifbeamer at suppressreplacements\else
\ifbeamer at sansmath
- \SetSymbolFont{operators}{normal}{OT1}{cmss}{\mddefault}{n}
+ \SetSymbolFont{operators}{normal}{OT1}{cmss}{\mddefault}{n}%
\ifx\mv at bold\@undefined
\else
- \SetSymbolFont{operators}{bold}{OT1}{cmss}{\bfdefault}{n}
+ \SetSymbolFont{operators}{bold}{OT1}{cmss}{\bfdefault}{n}%
\fi
\@ifpackageloaded{lmodern}
{%
- \SetSymbolFont{operators}{normal}{OT1}{\sfdefault}{\mddefault}{n}
+ \SetSymbolFont{operators}{normal}{OT1}{\sfdefault}{\mddefault}{n}%
\ifx\mv at bold\@undefined
\else
- \SetSymbolFont{operators}{bold}{OT1}{\sfdefault}{\bfdefault}{n}
+ \SetSymbolFont{operators}{bold}{OT1}{\sfdefault}{\bfdefault}{n}%
\fi
}%
{}%
\fi
- \DeclareSymbolFont{numbers}{\encodingdefault}{\mathfamilydefault}{\mddefault}{n}
- \DeclareSymbolFont{pureletters}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it}
- \SetMathAlphabet{\mathrm}{normal}{\encodingdefault}{\rmdefault}{\mddefault}{n}
- \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}
- \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{\mddefault}{n}
- \DeclareMathAlphabet{\mathit}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it}
- \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{\mddefault}{n}
+ \DeclareSymbolFont{numbers}{\encodingdefault}{\mathfamilydefault}{\mddefault}{n}%
+ \DeclareSymbolFont{pureletters}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it}%
+ \SetMathAlphabet{\mathrm}{normal}{\encodingdefault}{\rmdefault}{\mddefault}{n}%
+ \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}%
+ \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{\mddefault}{n}%
+ \DeclareMathAlphabet{\mathit}{\encodingdefault}{\mathfamilydefault}{\mddefault}{it}%
+ \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{\mddefault}{n}%
\ifx\mv at bold\@undefined\else
- \SetSymbolFont{numbers}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}
- \SetSymbolFont{pureletters}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it}
- \SetMathAlphabet{\mathrm}{bold}{\encodingdefault}{\rmdefault}{\bfdefault}{n}
- \SetMathAlphabet{\mathbf}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}
- \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}
- \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it}
- \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{\bfdefault}{n}
+ \SetSymbolFont{numbers}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}%
+ \SetSymbolFont{pureletters}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it}%
+ \SetMathAlphabet{\mathrm}{bold}{\encodingdefault}{\rmdefault}{\bfdefault}{n}%
+ \SetMathAlphabet{\mathbf}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{n}%
+ \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}%
+ \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\mathfamilydefault}{\bfdefault}{it}%
+ \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{\bfdefault}{n}%
\fi
-
- \DeclareMathSymbol{0}\mathalpha{numbers}{"30}
- \DeclareMathSymbol{1}\mathalpha{numbers}{"31}
- \DeclareMathSymbol{2}\mathalpha{numbers}{"32}
- \DeclareMathSymbol{3}\mathalpha{numbers}{"33}
- \DeclareMathSymbol{4}\mathalpha{numbers}{"34}
- \DeclareMathSymbol{5}\mathalpha{numbers}{"35}
- \DeclareMathSymbol{6}\mathalpha{numbers}{"36}
- \DeclareMathSymbol{7}\mathalpha{numbers}{"37}
- \DeclareMathSymbol{8}\mathalpha{numbers}{"38}
- \DeclareMathSymbol{9}\mathalpha{numbers}{"39}
-
- \DeclareMathSymbol{A}\mathalpha{pureletters}{"41}
- \DeclareMathSymbol{B}\mathalpha{pureletters}{"42}
- \DeclareMathSymbol{C}\mathalpha{pureletters}{"43}
- \DeclareMathSymbol{D}\mathalpha{pureletters}{"44}
- \DeclareMathSymbol{E}\mathalpha{pureletters}{"45}
- \DeclareMathSymbol{F}\mathalpha{pureletters}{"46}
- \DeclareMathSymbol{G}\mathalpha{pureletters}{"47}
- \DeclareMathSymbol{H}\mathalpha{pureletters}{"48}
- \DeclareMathSymbol{I}\mathalpha{pureletters}{"49}
- \DeclareMathSymbol{J}\mathalpha{pureletters}{"4A}
- \DeclareMathSymbol{K}\mathalpha{pureletters}{"4B}
- \DeclareMathSymbol{L}\mathalpha{pureletters}{"4C}
- \DeclareMathSymbol{M}\mathalpha{pureletters}{"4D}
- \DeclareMathSymbol{N}\mathalpha{pureletters}{"4E}
- \DeclareMathSymbol{O}\mathalpha{pureletters}{"4F}
- \DeclareMathSymbol{P}\mathalpha{pureletters}{"50}
- \DeclareMathSymbol{Q}\mathalpha{pureletters}{"51}
- \DeclareMathSymbol{R}\mathalpha{pureletters}{"52}
- \DeclareMathSymbol{S}\mathalpha{pureletters}{"53}
- \DeclareMathSymbol{T}\mathalpha{pureletters}{"54}
- \DeclareMathSymbol{U}\mathalpha{pureletters}{"55}
- \DeclareMathSymbol{V}\mathalpha{pureletters}{"56}
- \DeclareMathSymbol{W}\mathalpha{pureletters}{"57}
- \DeclareMathSymbol{X}\mathalpha{pureletters}{"58}
- \DeclareMathSymbol{Y}\mathalpha{pureletters}{"59}
- \DeclareMathSymbol{Z}\mathalpha{pureletters}{"5A}
-
- \DeclareMathSymbol{a}\mathalpha{pureletters}{"61}
- \DeclareMathSymbol{b}\mathalpha{pureletters}{"62}
- \DeclareMathSymbol{c}\mathalpha{pureletters}{"63}
- \DeclareMathSymbol{d}\mathalpha{pureletters}{"64}
- \DeclareMathSymbol{e}\mathalpha{pureletters}{"65}
- \DeclareMathSymbol{f}\mathalpha{pureletters}{"66}
- \DeclareMathSymbol{g}\mathalpha{pureletters}{"67}
- \DeclareMathSymbol{h}\mathalpha{pureletters}{"68}
- \DeclareMathSymbol{i}\mathalpha{pureletters}{"69}
- \DeclareMathSymbol{j}\mathalpha{pureletters}{"6A}
- \DeclareMathSymbol{k}\mathalpha{pureletters}{"6B}
- \DeclareMathSymbol{l}\mathalpha{pureletters}{"6C}
- \DeclareMathSymbol{m}\mathalpha{pureletters}{"6D}
- \DeclareMathSymbol{n}\mathalpha{pureletters}{"6E}
- \DeclareMathSymbol{o}\mathalpha{pureletters}{"6F}
- \DeclareMathSymbol{p}\mathalpha{pureletters}{"70}
- \DeclareMathSymbol{q}\mathalpha{pureletters}{"71}
- \DeclareMathSymbol{r}\mathalpha{pureletters}{"72}
- \DeclareMathSymbol{s}\mathalpha{pureletters}{"73}
- \DeclareMathSymbol{t}\mathalpha{pureletters}{"74}
- \DeclareMathSymbol{u}\mathalpha{pureletters}{"75}
- \DeclareMathSymbol{v}\mathalpha{pureletters}{"76}
- \DeclareMathSymbol{w}\mathalpha{pureletters}{"77}
- \DeclareMathSymbol{x}\mathalpha{pureletters}{"78}
- \DeclareMathSymbol{y}\mathalpha{pureletters}{"79}
- \DeclareMathSymbol{z}\mathalpha{pureletters}{"7A}
+%
+ \DeclareMathSymbol{0}\mathalpha{numbers}{"30}%
+ \DeclareMathSymbol{1}\mathalpha{numbers}{"31}%
+ \DeclareMathSymbol{2}\mathalpha{numbers}{"32}%
+ \DeclareMathSymbol{3}\mathalpha{numbers}{"33}%
+ \DeclareMathSymbol{4}\mathalpha{numbers}{"34}%
+ \DeclareMathSymbol{5}\mathalpha{numbers}{"35}%
+ \DeclareMathSymbol{6}\mathalpha{numbers}{"36}%
+ \DeclareMathSymbol{7}\mathalpha{numbers}{"37}%
+ \DeclareMathSymbol{8}\mathalpha{numbers}{"38}%
+ \DeclareMathSymbol{9}\mathalpha{numbers}{"39}%
+%
+ \DeclareMathSymbol{A}\mathalpha{pureletters}{"41}%
+ \DeclareMathSymbol{B}\mathalpha{pureletters}{"42}%
+ \DeclareMathSymbol{C}\mathalpha{pureletters}{"43}%
+ \DeclareMathSymbol{D}\mathalpha{pureletters}{"44}%
+ \DeclareMathSymbol{E}\mathalpha{pureletters}{"45}%
+ \DeclareMathSymbol{F}\mathalpha{pureletters}{"46}%
+ \DeclareMathSymbol{G}\mathalpha{pureletters}{"47}%
+ \DeclareMathSymbol{H}\mathalpha{pureletters}{"48}%
+ \DeclareMathSymbol{I}\mathalpha{pureletters}{"49}%
+ \DeclareMathSymbol{J}\mathalpha{pureletters}{"4A}%
+ \DeclareMathSymbol{K}\mathalpha{pureletters}{"4B}%
+ \DeclareMathSymbol{L}\mathalpha{pureletters}{"4C}%
+ \DeclareMathSymbol{M}\mathalpha{pureletters}{"4D}%
+ \DeclareMathSymbol{N}\mathalpha{pureletters}{"4E}%
+ \DeclareMathSymbol{O}\mathalpha{pureletters}{"4F}%
+ \DeclareMathSymbol{P}\mathalpha{pureletters}{"50}%
+ \DeclareMathSymbol{Q}\mathalpha{pureletters}{"51}%
+ \DeclareMathSymbol{R}\mathalpha{pureletters}{"52}%
+ \DeclareMathSymbol{S}\mathalpha{pureletters}{"53}%
+ \DeclareMathSymbol{T}\mathalpha{pureletters}{"54}%
+ \DeclareMathSymbol{U}\mathalpha{pureletters}{"55}%
+ \DeclareMathSymbol{V}\mathalpha{pureletters}{"56}%
+ \DeclareMathSymbol{W}\mathalpha{pureletters}{"57}%
+ \DeclareMathSymbol{X}\mathalpha{pureletters}{"58}%
+ \DeclareMathSymbol{Y}\mathalpha{pureletters}{"59}%
+ \DeclareMathSymbol{Z}\mathalpha{pureletters}{"5A}%
+%
+ \DeclareMathSymbol{a}\mathalpha{pureletters}{"61}%
+ \DeclareMathSymbol{b}\mathalpha{pureletters}{"62}%
+ \DeclareMathSymbol{c}\mathalpha{pureletters}{"63}%
+ \DeclareMathSymbol{d}\mathalpha{pureletters}{"64}%
+ \DeclareMathSymbol{e}\mathalpha{pureletters}{"65}%
+ \DeclareMathSymbol{f}\mathalpha{pureletters}{"66}%
+ \DeclareMathSymbol{g}\mathalpha{pureletters}{"67}%
+ \DeclareMathSymbol{h}\mathalpha{pureletters}{"68}%
+ \DeclareMathSymbol{i}\mathalpha{pureletters}{"69}%
+ \DeclareMathSymbol{j}\mathalpha{pureletters}{"6A}%
+ \DeclareMathSymbol{k}\mathalpha{pureletters}{"6B}%
+ \DeclareMathSymbol{l}\mathalpha{pureletters}{"6C}%
+ \DeclareMathSymbol{m}\mathalpha{pureletters}{"6D}%
+ \DeclareMathSymbol{n}\mathalpha{pureletters}{"6E}%
+ \DeclareMathSymbol{o}\mathalpha{pureletters}{"6F}%
+ \DeclareMathSymbol{p}\mathalpha{pureletters}{"70}%
+ \DeclareMathSymbol{q}\mathalpha{pureletters}{"71}%
+ \DeclareMathSymbol{r}\mathalpha{pureletters}{"72}%
+ \DeclareMathSymbol{s}\mathalpha{pureletters}{"73}%
+ \DeclareMathSymbol{t}\mathalpha{pureletters}{"74}%
+ \DeclareMathSymbol{u}\mathalpha{pureletters}{"75}%
+ \DeclareMathSymbol{v}\mathalpha{pureletters}{"76}%
+ \DeclareMathSymbol{w}\mathalpha{pureletters}{"77}%
+ \DeclareMathSymbol{x}\mathalpha{pureletters}{"78}%
+ \DeclareMathSymbol{y}\mathalpha{pureletters}{"79}%
+ \DeclareMathSymbol{z}\mathalpha{pureletters}{"7A}%
\fi
}
@@ -313,10 +315,9 @@
\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
+\newrobustcmd*\Tiny{\@setfontsize\Tiny{4}{5}}
+\newrobustcmd*\TINY{\@setfontsize\Tiny{3}{4}}
-\newcommand\Tiny{\@setfontsize\Tiny{4}{5}}
-\newcommand\TINY{\@setfontsize\Tiny{3}{4}}
-
\mode
<article>
{
@@ -323,10 +324,9 @@
\let\Tiny=\tiny
\let\TINY=\tiny
- \newcommand\setbeamerfont{\@ifstar{\@gobbletwo}{\@gobbletwo}}
- \newcommand\usebeamerfont{\@ifstar{\beamer at optgog}{\beamer at optgog}}
+ \newrobustcmd*\setbeamerfont{\@ifstar{\@gobbletwo}{\@gobbletwo}}
+ \newrobustcmd*\usebeamerfont{\@ifstar{\beamer at optgog}{\beamer at optgog}}
}
-
\mode
<all>
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -61,7 +62,7 @@
\fi%
\fi%
\global\c at beamerpauses=1\relax%
- \expandafter\beamer at ifempty\expandafter{\beamer at framestartpage}{%
+ \expandafter\ifblank\expandafter{\beamer at framestartpage}{%
\stepcounter{subsectionslide}%
\xdef\beamer at framestartpage{\the\c at page}% only first time
}{\clearpage\beamer at notesactions}% cleanup from previous slide
@@ -365,7 +366,7 @@
\beamer at copewithframeenv}
\def\beamer at checkforverbatim#1containsverbatim#2\relax{%
- \beamer at ifempty{#2}%
+ \ifblank{#2}%
{\beamer at checkforfragile#1fragile\relax}
{% contains verbatim
\endgroup% end environment
@@ -372,7 +373,7 @@
\expandafter\beamer at framecommand\beamer at frameoptions\bgroup}%
}
\def\beamer at checkforfragile#1fragile#2\relax{%
- \beamer at ifempty{#2}%
+ \ifblank{#2}%
{\beamer at frameenv}% normal frame
{% contains verbatim
\endgroup% end environment
@@ -396,7 +397,7 @@
\fi%
\beamer at next{#1#2}}
\def\beamer at checkforcolon#1:#2.{%
- \beamer at ifempty{#2}{}{\let\beamer at next=\beamer at oldframesyntax}}
+ \ifblank{#2}{}{\let\beamer at next=\beamer at oldframesyntax}}
\def\beamer at newframesyntax#1{\beamer@@@frame<*>[#1]}
\def\beamer at oldframesyntax#1{\beamer@@@frame<#1>[]}
@@ -411,7 +412,7 @@
\def\beamer@@@@frame<#1>[#2]{%
\framewidth\textwidth
\beamer at savemode%
- \def\beamer at mode{\mode<all>}%
+ \gdef\beamer at mode{\mode<all>}%
\def\beamer at frametemplate{}%
\def\beamer at againname{}%
\def\beamer at undolabels{}%
@@ -450,19 +451,9 @@
\ifx\beamer at againname\@empty%
\beamer at slideinframe=0\relax%
\beamer at anotherslidefalse%
- {\beamer at masterdecode{\beamer at whichframes}}%
+ \beamer at masterdecode{\beamer at whichframes}%
\ifbeamer at anotherslide%
-%% \beamer at slideinframe=2\relax%
-%% \def\beamer at doifnotinframe{}%
-%% \def\beamer at doifinframe{\let\beamer at howtotreatframe\beamer at doseveralframes}%
-%% \beamer at anotherslidefalse%
-%% {\beamer at masterdecode{\beamer at whichframes}}%
-%% \ifbeamer at anotherslide%
\let\beamer at howtotreatframe\beamer at doseveralframes%
-%% \else% single slide in frame
-%% \let\beamer at howtotreatframe\beamer at dosingleframe%
-%% \fi%
-%% \beamer at donow%
\ifbeamer at containsverbatim%
\let\beamer at howtotreatframe\beamer at dosingleframe%
\fi%
@@ -517,11 +508,11 @@
\beamer at slideinframe=1\relax%
\loop%
\beamer at anotherslidefalse%
- \def\beamer at doifnotinframe{}%
+ \gdef\beamer at doifnotinframe{}%
\def\beamer at doifinframe{\begin{beamer at frameslide}%
#1%
\end{beamer at frameslide}}%
- {\beamer at masterdecode{\beamer at whichframes}}%
+ \beamer at masterdecode{\beamer at whichframes}%
\beamer at donow%
\ifbeamer at twoscreenstext%
\beamer at dosecondscreennow{#1}% two screen stuff
@@ -572,7 +563,9 @@
\def\beamer at doframeinput{\@ifnextchar<{\beamer at frameinput}{\beamer at frameinput<*>}}
\def\beamer at frameinput<#1>{\@ifnextchar[{\beamer@@frameinput<#1>}{\beamer@@frameinput<#1>[]}}
-\def\beamer@@frameinput<#1>[{\@ifnextchar<{\beamer@@@@frameinput<#1>[}{\beamer@@@frameinput<#1>[<*>][}}
+\def\beamer@@frameinput<#1>[{\@ifnextchar<{\beamer@@@@frameinput<#1>[}%
+ {\edef\beamer at temp{\noexpand\beamer@@@frameinput<#1>[\beamer at defaultospec][}%
+ \beamer at temp}}
\def\beamer@@@@frameinput<#1>[#2]{\@ifnextchar[{\beamer@@@frameinput<#1>[{#2}]}{\beamer@@@frameinput<#1>[{#2}][]}}
\def\beamer@@@frameinput<#1>[#2][#3]{%
\global\advance\c at framenumber by-1\relax%
@@ -591,7 +584,7 @@
\csname end#1\endcsname}
\def\beamer at writeslidentry{%
- \expandafter\beamer at ifempty\expandafter{\beamer at framestartpage}{}% does not happen normally
+ \expandafter\ifblank\expandafter{\beamer at framestartpage}{}% does not happen normally
{%else
\addtocontents{nav}%
{\protect\headcommand{%
@@ -659,7 +652,7 @@
\refstepcounter{framenumber}%
\beamer at slideinframe=0\relax%
\beamer at anotherslidefalse%
- {\beamer at masterdecode{#1}}%
+ \beamer at masterdecode{#1}%
\ifbeamer at anotherslide%
\let\beamer at howtotreatframe\beamer at dosingleframe%
\else% no slides in frame
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -148,7 +148,7 @@
\beamer at tempdim=\ht\@tempboxa%
\setbox\@tempboxa=\hbox{\lower\beamer at tempdim\hbox{\box\@tempboxa}}%
\wd\@tempboxa=0pt\ht\@tempboxa=0pt\dp\@tempboxa=0pt%
- \vbox{\hbox{\hskip-\Gm at lmargin\raise\headheight\box\beamer at tempbox\box\@tempboxa}\hfil}%
+ \vbox{\hbox{\hskip-\Gm at lmargin\raise\headheight\box\beamer at tempbox\raise\headheight\box\@tempboxa}\hfil}%
\endgroup%
}
\def\@oddfoot{\normalcolor{\hfil%
@@ -359,24 +359,7 @@
\mode
<article>
{
- \define at key{beamerfootnote}{frame}[true]{}
-
-\let\beamer at origfootnote=\footnote
- \renewcommand\footnote[1][]{%
- \let\beamer at kvorig=\KV at errx%
- \let\beamer at xkvorig=\XKV at err
- \def\beamer at footarg{}%
- \def\KV at errx##1{\edef\beamer at footarg{\@tempa}}%
- \def\XKV at err##1{\edef\beamer at footarg{\XKV at tkey}}%
- \setkeys{beamerfootnote}{#1}%
- \let\KV at errx=\beamer at kvorig%
- \let\XKV at errx=\beamer at xkvorig
- \ifx\beamer at footarg\@empty%
- \edef\beamer at next{\noexpand\beamer at origfootnote}%
- \else%
- \edef\beamer at next{\noexpand\beamer at origfootnote[\beamer at footarg]}%
- \fi%
- \beamer at next}
+ \renewcommand<>{\footnote}{\beameroriginal{\footnote}}%
}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2010,2012--2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -24,7 +25,7 @@
%
\newcommand<>\frametitle{\alt#1{\@dblarg\beamer@@frametitle}{\beamer at gobbleoptional}}
\long\def\beamer@@frametitle[#1]#2{%
- \beamer at ifempty{#2}{}{%
+ \ifblank{#2}{}{%
\gdef\insertframetitle{{#2\ifnum\beamer at autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer at frametitle{#2}%
\gdef\beamer at shortframetitle{#1}%
@@ -42,7 +43,7 @@
<all>
{
\let\beamer at aftersubtitle=\relax
- \newcommand<>\framesubtitle[1]{\only#2{\beamer at ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer at aftersubtitle}}}
+ \newcommand<>\framesubtitle[1]{\only#2{\ifblank{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer at aftersubtitle}}}
}
@@ -53,7 +54,7 @@
\@ifnextchar\framesubtitle{\beamer at donextsubtitle}{\usebeamertemplate{frametitle}}}}
\renewcommand<>\framesubtitle[1]{%
\only#2{%
- \beamer at ifempty{#1}
+ \ifblank{#1}
{\usebeamertemplate{frametitle}}
{\gdef\insertframesubtitle{{#1}}\beamer at aftersubtitle}}}
\def\beamer at donextsubtitle{%
@@ -71,13 +72,13 @@
\mode
<all>
{
- \newenvironment{alertenv}{\begin{altenv}%
- {\usebeamertemplate{alerted text begin}\usebeamercolor[fg]{alerted text}\usebeamerfont{alerted text}}
- {\usebeamertemplate{alerted text end}}{\color{.}}{}}{\end{altenv}}
+ \newenvironment<>{alertenv}{\begin{altenv}#1%
+ {\usebeamercolor[fg]{alerted text}\usebeamerfont{alerted text}\usebeamertemplate{alerted text begin}}
+ {\usebeamertemplate{alerted text end}}{\color{.}}{}\ignorespaces}{\ifhmode\unskip\fi\end{altenv}}
- \newenvironment{structureenv}{\begin{altenv}%
- {\usebeamertemplate{structure text begin}\usebeamercolor[fg]{structure}\usebeamerfont{structure}}
- {\usebeamertemplate{structure text end}}{\color{.}}{}}{\end{altenv}}
+ \newenvironment<>{structureenv}{\begin{altenv}#1%
+ {\usebeamercolor[fg]{structure}\usebeamerfont{structure}\usebeamertemplate{structure text begin}}
+ {\usebeamertemplate{structure text end}}{\color{.}}{}\ignorespaces}{\ifhmode\unskip\fi\end{altenv}}
\newcommand<>{\alert}[1]{\begin{alertenv}#2\relax#1\end{alertenv}}
\newcommand<>{\structure}[1]{\begin{structureenv}#2\relax#1\end{structureenv}}
@@ -242,7 +243,7 @@
%
\renewcommand{\itemize}[1][]{%
- \beamer at ifempty{#1}{}{\def\beamer at defaultospec{#1}}%
+ \ifblank{#1}{}{\def\beamer at defaultospec{#1}}%
\ifnum \@itemdepth >2\relax\@toodeep\else
\advance\@itemdepth\@ne
\beamer at computepref\@itemdepth% sets \beameritemnestingprefix
@@ -295,6 +296,9 @@
\beamer at descdefault\wd\beamer at tempbox\@@description}
\def\@@description{%
\advance\beamer at descdefault by \labelsep%
+ \usebeamerfont{description body}%
+ \usebeamercolor[fg]{description body}%
+ \usebeamertemplate{description body begin}%
\list
{}
{\labelwidth\beamer at descdefault\leftmargin\beamer at descdefault\let\makelabel\beamer at descriptionitem}%
@@ -302,7 +306,8 @@
\raggedright
\beamer at firstlineitemizeunskip%
}
-\def\enddescription{\ifhmode\unskip\fi\endlist}
+\def\enddescription{\ifhmode\unskip\fi\endlist%
+ \usebeamertemplate{description body end}}
\long\def\beamer at descriptionitem#1{%
\def\insertdescriptionitem{#1}%
\hfil\hspace\labelsep{\usebeamertemplate**{description item}}}
@@ -491,8 +496,8 @@
{\ifcsundef{abx at name@labelname}{}{\let\bbx at tempa\labelnamepunct}%
\bbx at tempa\newblock\unspace\usebeamercolor[fg]{bibliography entry title}}{}{}
\apptocmd{\abx at macro@title}
- {\ifcsundef{abx at field@title}{}{\midsentence\newunitpunct}%
- \newblock\usebeamercolor[fg]{bibliography entry note}}{}{}}
+ {\ifcsundef{abx at field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}%
+ \newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}}
{}}
\mode
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -12,7 +13,6 @@
\mode
<presentation>
-
% Maximum dead cycles
\maxdeadcycles=1000
@@ -22,10 +22,10 @@
\beamer at sectionmax=0\relax
\beamer at sectioncount=0\relax
-\def\headcommand#1{\global\advance\beamer at totalheads by1\relax%
+\newrobustcmd*\headcommand[1]{\global\advance\beamer at totalheads by1\relax
\expandafter\gdef\csname @@head\the\beamer at totalheads\endcsname{#1}}
-\def\dohead{\beamer at headcounter=0\relax\loop\ifnum\beamer at headcounter<\beamer at totalheads%
- \advance\beamer at headcounter by1\relax%
+\newrobustcmd*\dohead{\beamer at headcounter=0\relax\loop\ifnum\beamer at headcounter<\beamer at totalheads
+ \advance\beamer at headcounter by1\relax
\csname @@head\the\beamer at headcounter\endcsname\repeat}
\def\beamer at startpageofframe{1}
@@ -40,8 +40,8 @@
\def\beamer at startpageofappendix{}
\def\inserttotalframenumber{1}
-\def\partentry#1#2{\beamer at sectioncount=0\relax}
-\def\beamer at initsectionentry#1#2#3#4#5{\advance\beamer at sectioncount by1\relax%
+\newrobustcmd*\partentry[2]{\beamer at sectioncount=0\relax}
+\def\beamer at initsectionentry#1#2#3#4#5{\advance\beamer at sectioncount by1\relax
\ifnum\beamer at sectionmax<\beamer at sectioncount\beamer at sectionmax=\beamer at sectioncount\fi}
\def\beamer at initslideentry#1#2#3#4#5#6{\ifnum\beamer at subsectionmax<#2\relax\beamer at subsectionmax=#2\fi}
\def\beamer at initsubsubsectionentry#1#2#3#4#5#6{\ifnum\beamer at subsubsectionmax<#4\relax\beamer at subsubsectionmax=#4\fi}
@@ -74,7 +74,7 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\g at addto@macro\beamer at lastminutepatches{
+\g at addto@macro\beamer at lastminutepatches{%
\beamer at activecjk
\makeatletter
\@input{\jobname.nav}
@@ -90,27 +90,26 @@
\let\beamer at subsubsectionentry=\beamer at subsubsectionentryorig
\beamer at calculateheadfoot
\ifbeamer at draftmode
- \setbeamertemplate{footline}{
+ \setbeamertemplate{footline}{%
\color{black!25}%
\kern-\Gm at lmargin\vrule width\paperwidth
- height\footheight\kern-\Gm at rmargin}
- \setbeamertemplate{headline}{
+ height\footheight\kern-\Gm at rmargin}%
+ \setbeamertemplate{headline}{%
\color{black!25}%
\kern-\Gm at lmargin\vrule width\paperwidth
- height\headheight\kern-\Gm at rmargin}
+ height\headheight\kern-\Gm at rmargin}%
\setbeamertemplate{sidebar left}{%
\color{black!20}%
- \vrule width \beamer at leftsidebar height\sidebarheight}
+ \vrule width \beamer at leftsidebar height\sidebarheight}%
\setbeamertemplate{sidebar right}{%
\color{black!20}%
- \vrule width \beamer at rightsidebar height\sidebarheight}
- \setbeamertemplate{sidebar canvas left}{}
- \setbeamertemplate{sidebar canvas right}{}
+ \vrule width \beamer at rightsidebar height\sidebarheight}%
+ \setbeamertemplate{sidebar canvas left}{}%
+ \setbeamertemplate{sidebar canvas right}{}%
\fi
\makeatother
}
-
\setcounter{tocdepth}{3}
\setlength\arraycolsep{5\p@}
@@ -122,7 +121,6 @@
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
-
\newcommand\contentsname{\translate{Contents}}
\newcommand\listfigurename{\translate{List of Figures}}
\newcommand\listtablename{\translate{List of Tables}}
@@ -151,7 +149,7 @@
\AtEndDocument{%
\clearpage
- \beamer at tempcount=\c at page\advance\beamer at tempcount by -1%
+ \beamer at tempcount=\c at page\advance\beamer at tempcount by -1 %
\if at filesw
\immediate\write\@auxout{\string\@writefile{nav}%
{\noexpand\headcommand{\noexpand\beamer at partpages{\the\beamer at partstartpage}{\the\beamer at tempcount}}}}%
@@ -172,21 +170,18 @@
\fi
}
-
-
%
% Managing short inserts
%
-
\define at key{beamerst}{respectlinebreaks}[true]{%
\def\beamer at stlinebreakrule{}}
\define at key{beamerst}{width}{%
\def\beamer at ststart{%
\begin{minipage}[t]{#1}%
- \raggedright%
- \beamer at stalign%
- \beamer at stlinebreakrule%
+ \raggedright
+ \beamer at stalign
+ \beamer at stlinebreakrule
}%
\def\beamer at stend{\end{minipage}}}
\define at key{beamerst}{center}[true]{%
@@ -200,7 +195,7 @@
\def\beamer at stend{\egroup}%
\setkeys{beamerst}{#1}}%
\newcommand{\beamer at insertshort}[1]{%
- \beamer at ststart#1\beamer at stend%
+ \beamer at ststart#1\beamer at stend
}
\mode
@@ -210,14 +205,25 @@
{
\ifx\includegraphics\@undefined
\else
- \renewcommand<>\includegraphics[2][]{\only#3{\beameroriginal\includegraphics[{#1}]{#2}}\ignorespaces}
- % Deal with star case (unique for overlay-aware commands)
- \let\beamer at includegraphics@maybe at star\includegraphics
- \DeclareRobustCommand\includegraphics{%
+ \renewcommand<>\includegraphics{%
\@ifstar
- {\Gin at cliptrue \beamer at includegraphics@maybe at star}
- {\Gin at clipfalse \beamer at includegraphics@maybe at star}%
+ {\Gin at cliptrue}
+ {\Gin at clipfalse}%
+ \@ifnextchar[%]
+ {\beamer at includegraphics{#1}}
+ {\beamer@@@includegraphics{#1}{}}%
}
+ \long\def\beamer at includegraphics#1[#2]{%
+ \@ifnextchar[%]
+ {\beamer@@includegraphics{#1}{#2}}
+ {\beamer@@@includegraphics{#1}{#2}}%
+ }
+ \long\def\beamer@@includegraphics#1#2[#3]#4{%
+ \only#1{\beameroriginal\includegraphics[{#2}][{#3}]{#4}}%
+ }
+ \long\def\beamer@@@includegraphics#1#2#3{%
+ \only#1{\beameroriginal\includegraphics[{#2}]{#3}}%
+ }
\fi
\ifx\pgfuseimage\@undefined
@@ -226,5 +232,3 @@
\renewcommand<>\pgfimage[2][]{\only#3{\beameroriginal\pgfimage[{#1}]{#2}}\ignorespaces}
\fi
}
-
-
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016,2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -10,24 +10,24 @@
%
% See the file doc/licenses/LICENSE for more details.
-%
-% Global Declarations used by beamer in all modes
-%
+% Force e-TeX and provide \patchcmd
+\RequirePackage{etoolbox}
+
+% Booleans for options available for both beamer and beamerarticle
+\newif\ifbeamer at blocks \beamer at blockstrue
+\newif\ifbeamer at ams \beamer at amstrue
+\newif\ifbeamer at amssymb \beamer at amssymbtrue
+\newif\ifbeamer at countsect \beamer at countsectfalse % A no-op but for clarity
+\newif\ifbeamer at keywords \beamer at keywordstrue
+
+% Scratch space
\newbox\beamer at tempbox
-\newif\ifbeamer at blocks
-\newif\ifbeamer at ams
-\newif\ifbeamer at amssymb
-\newif\ifbeamer at countsect
-\newif\ifbeamer at keywords
-\beamer at blockstrue
-\beamer at amstrue
-\beamer at amssymbtrue
-\beamer at countsectfalse
-\beamer at keywordstrue
\newcount\beamer at tempcount
+
+% The pauses counter is public and global, and required by both
+% beamer and beamerarticle
\newcounter{beamerpauses}
-
\RequirePackage{beamerbasedecode}
%
@@ -44,38 +44,41 @@
\newif\ifbeamer at inpresentation
\beamer at inpresentationtrue
-\def\beamer at makeinnocent#1{\catcode`#1=12 }
\def\beamer at startcomment{%
- \begingroup%
- \let\do\beamer at makeinnocent\dospecials%
- \beamer at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \beamer at processline}
+ \begingroup
+ \let\do\@makeother\dospecials
+ \catcode`\^^L=12 % and whatever other special cases
+ \endlinechar`\^^M %
+ \catcode`\^^M=12 %
+ \beamer at processline}
-{\catcode`\^^M=12\endlinechar=-1%
+\begingroup
+ \catcode`\^^M=12\relax\endlinechar=-1\relax%
\long\gdef\beamer at processline#1^^M{%
\def\beamer at test{#1}%
\ifx\beamer at test\beamer at stopmodestar%
\let\next=\beamer at modeoutsideframe%
\else%
- \ifx\beamer at test\beamer at stopmode%
- \let\next=\mode%
- \else%
- \ifx\beamer at test\beamer at stoparticle%
- \let\next=\article%
+ \ifx\beamer at test\beamer at stopmode%
+ \let\next=\mode%
\else%
- \ifx\beamer at test\beamer at stoppresentation%
- \let\next=\presentation%
+ \ifx\beamer at test\beamer at stoparticle%
+ \let\next=\article%
\else%
- \ifx\beamer at test\beamer at stopcommon%
- \let\next=\common%
+ \ifx\beamer at test\beamer at stoppresentation%
+ \let\next=\presentation%
\else%
- \ifx\beamer at test\beamer at stopdocument%
- \let\next=\beamer at enddocument%
- \else
- \ifx\beamer at test\beamer at begindocument%
- \let\next=\beamer at startdocument%
+ \ifx\beamer at test\beamer at stopcommon%
+ \let\next=\common%
+ \else%
+ \ifx\beamer at test\beamer at stopdocument%
+ \let\next=\beamer at enddocument%
\else
- \let\next=\beamer at processline%
+ \ifx\beamer at test\beamer at begindocument%
+ \let\next=\beamer at startdocument%
+ \else
+ \let\next=\beamer at processline%
+ \fi%
\fi%
\fi%
\fi%
@@ -82,14 +85,18 @@
\fi%
\fi%
\fi%
- \fi%
\next}
-}
+\endgroup
\def\beamer at enddocument{\beamer at closer\end{document}}
-\def\beamer at startdocument{\beamer at closer\begin{document}\def\beamer at closer{}\common}
+\def\beamer at startdocument{%
+ \beamer at closer
+ \begin{document}%
+ \gdef\beamer at closer{}%
+ \mode<all>}
\def\beamer at closer{}
-{\escapechar=-1\relax%
+\begingroup
+ \escapechar=-1\relax
\xdef\beamer at stopmode{\string\\mode}
\xdef\beamer at stopmodestar{\string\\mode*}
\xdef\beamer at stoparticle{\string\\article}
@@ -97,14 +104,18 @@
\xdef\beamer at stopcommon{\string\\common}
\xdef\beamer at stopdocument{\string\\end\string\{document\string\}}
\xdef\beamer at begindocument{\string\\begin\string\{document\string\}}
-}
+\endgroup
+
\newbox\beamer at commentbox
\def\beamer at startcommentinframe{%
- \begingroup%
- \edef\beamer at closer{\egroup\beamer at closer}%
- \setbox\beamer at commentbox=\vbox\bgroup\leavevmode}
+ \begingroup
+ \xdef\beamer at closer{\egroup\beamer at closer}%
+ \setbox\beamer at commentbox=\vbox\bgroup\leavevmode}
\def\beamer at outsidemode{\afterassignment\beamer at treat\let\beamer at nexttoken=}
+
+% Deals with the various tokens that need to be 'active' even when skipping
+% material outside frames
\def\beamer at treat{%
\ifx\beamer at nexttoken\frame\let\next=\beamer at stopoutsidemode\fi
\ifx\beamer at nexttoken\lecture\let\next=\beamer at stopoutsidemode\fi
@@ -126,69 +137,83 @@
\def\beamer at stopoutsidemode{\beamer at nexttoken}
\def\beamer at checkenddoc#1{%
\def\beamer at temp{#1}%
- \ifx\beamer at temp\beamer at enddoc%
- \let\next=\beamer at enddocument%
- \else%
- \let\next=\beamer at outsidemode%
- \fi%
+ \ifx\beamer at temp\beamer at enddoc
+ \let\next=\beamer at enddocument
+ \else
+ \let\next=\beamer at outsidemode
+ \fi
\next}
\def\beamer at enddoc{document}
\def\beamer at checkbeginframe#1{%
\def\beamer at temp{#1}%
- \ifx\beamer at temp\beamer at frametext%
- \let\next=\beamer at beginframeenv%
- \else%
- \let\next=\beamer at outsidemode%
- \fi%
+ \ifx\beamer at temp\beamer at frametext
+ \let\next=\beamer at beginframeenv
+ \else
+ \let\next=\beamer at outsidemode
+ \fi
\next}
\def\beamer at beginframeenv{\begin{frame}}
\def\beamer at modeoutsideframe{%
- \beamer at closer%
+ \beamer at closer
+ \gdef\beamer at closer{}%
\gdef\beamer at mode{\beamer at modeoutsideframe}%
- \ifbeamer at inpresentation%
- \let\next=\beamer at outsidemode%
- \gdef\beamer at closer{}%
- \else%
- \let\next=\relax%
- \gdef\beamer at closer{}%
+ \ifbeamer at inpresentation
+ \let\next=\beamer at outsidemode
+ \else
+ \let\next=\relax
\fi%
\next}
+% Obsolete, do not use!
+\newrobustcmd*\presentation{\mode<presentation>}
+\newrobustcmd*\article{\mode<article>}
+\newrobustcmd*\common{\mode<all>}
-%obsolete, do note use:
-\def\presentation{\mode<presentation>}
-\def\article{\mode<article>}
-\def\common{\mode<all>}
-
%
% Mode command
%
-\def\mode{\@ifstar\beamer at modeoutsideframe\beamer@@@mode}
-\def\beamer@@@mode<#1>{\beamer at closer\@ifnextchar\bgroup{\beamer at modeinline<#1>}{\beamer at switchmode<#1>}}
+\newrobustcmd*\mode{\@ifstar\beamer at modeoutsideframe\beamer@@@mode}
+\def\beamer@@@mode<#1>{%
+ \beamer at closer
+ \@ifnextchar\bgroup
+ {\beamer at modeinline<#1>}%
+ {\beamer at switchmode<#1>}}
\long\def\beamer at modeinline<#1>#2{%
\gdef\beamer at closer{}%
- \def\beamer at doifnotinframe{\@gobble}\def\beamer at doifinframe{\@firstofone}%
- {\beamer at saveanother\beamer at slideinframe=1\relax%
- \beamer at masterdecode{#1}%
- \beamer at restoreanother}\beamer at donow{#2}%
+ \gdef\beamer at doifnotinframe{\@gobble}%
+ \def\beamer at doifinframe{\@firstofone}%
+ \begingroup
+ \beamer at saveanother
+ \beamer at slideinframe=1\relax%
+ \beamer at masterdecode{#1}%
+ \beamer at restoreanother
+ \endgroup
+ \beamer at donow{#2}%
\beamer at mode\par}
\def\beamer at switchmode<#1>{%
\gdef\beamer at mode{\beamer at switchmode<#1>}%
- \def\beamer at doifnotinframe{%
- \let\next=\beamer at startcomment%
+ \gdef\beamer at doifnotinframe{%
+ \let\next=\beamer at startcomment
\gdef\beamer at closer{\endgroup}%
}%
\def\beamer at doifinframe{%
- \let\next=\relax%
+ \let\next=\relax
\gdef\beamer at closer{}%
- }%
- {\beamer at saveanother\beamer at slideinframe=1\relax%
- \beamer at masterdecode{#1}%
- \beamer at restoreanother}\beamer at donow%
+ }%
+ \begingroup
+ \beamer at saveanother
+ \beamer at slideinframe=1\relax%
+ \beamer at masterdecode{#1}%
+ \beamer at restoreanother
+ \endgroup
+ \beamer at donow
\next}
+\def\beamer at saveanother{\let\beamer at savedif=\ifbeamer at anotherslide}
+\def\beamer at restoreanother{\global\let\ifbeamer at anotherslide=\beamer at savedif}
+
\mode
<all>
@@ -203,79 +228,23 @@
\def\beamer at savemode{\expandafter\beamer at pushmode\expandafter{\beamer at mode}}
\def\beamer at resumemode{\beamer at popmode}
-
-
%
% Stuff needed in both article and presentation version
%
-\def\jobnamebeamerversion{}%
+\newcommand*\jobnamebeamerversion{}
-\def\includeslide{\@ifnextchar[{\@includeslide}{\@includeslide[]}}
-\def\@includeslide[#1]#2{%
- \ifx\jobnamebeamerversion\@empty%
- \ClassError{beamer}{Invoke macro "setjobnamebeamerversion" first}{}%
- \else%
- \edef\beamer at args{[{#1,page=\csname beamer at slide#2\endcsname}]{\jobnamebeamerversion}}%
- \expandafter\pgfimage\beamer at args%
+\newrobustcmd*\includeslide[2][]{%
+ \ifx\jobnamebeamerversion\@empty
+ \ClassError{beamer}{Invoke macro "setjobnamebeamerversion" first}\@ehc
+ \else
+ \edef\beamer at args
+ {[{#1,page=\csname beamer at slide#2\endcsname}]{\jobnamebeamerversion}}%
+ \expandafter\pgfimage\beamer at args
\fi}
-\def\setjobnamebeamerversion#1{%
- \def\jobnamebeamerversion{#1}%
- {\makeatletter
- \@input{\jobnamebeamerversion.snm}}
-}
-
-
-
-%
-% Check whether we should initiate transfer to another class (obsolete)
-%
-
-% Extract class name, if present
-\def\beamer at classname{}
-\def\beamer at classoptions{}
-\def\beamer at classnamename{class}
-\def\beamer at eq{=,}
-\def\beamer at findclassname#1=#2,#3!{
- \def\beamer at temp{#1}
- \ifx\beamer at temp\beamer at classnamename
- \def\beamer at classname{#2}
- \beamer at stripsign#3!
- \fi}
-\def\beamer at stripsign#1!{%
- \def\beamer at temp{#1}
- \ifx\beamer at temp\beamer at eq
- % nothing to do
- \else
- \beamer@@stripsign#1!
- \fi
-}
-\def\beamer@@stripsign#1,=,!{
- \def\beamer at classoptions{#1}
- }
-
-\def\beamer at transfer{%
- % Prepare...
- \def\beamer at slide##1##2{\expandafter\gdef\csname
- beamer at slide##1\endcsname{##2}}
-
- \beamer at inpresentationfalse
-
- \def\beamer at currentmode{article}
-
- \common
-
- \edef\beamer at classwhat{[\beamer at classoptions]{\beamer at classname}}
- \expandafter\LoadClass\beamer at classwhat
- \endinput
- }
-
-\expandafter\beamer at findclassname\@classoptionslist,=,!
-\ifx\beamer at classname\@empty
- \let\beamer at transferifnecessary=\relax
-\else
- % Need to transfer to another class soon
- \let\beamer at transferifnecessary=\beamer at transfer
-\fi
-\endinput
-
+\newrobustcmd*\setjobnamebeamerversion[1]{%
+ \gdef\jobnamebeamerversion{#1}%
+ \begingroup
+ \makeatletter
+ \@input{\jobnamebeamerversion.snm}%
+ \endgroup}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
-% Copyright 2013,2015 by Vedran Mileti\'c,, Joseph Wright
+% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,9 +12,9 @@
\RequirePackage{keyval}[1997/11/10]
-\def\ProcessOptionsBeamer{%
+\newrobustcmd*\ProcessOptionsBeamer{%
\let\@tempa\@empty
- \ifx\@currext\@clsextension%
+ \ifx\@currext\@clsextension
\else
\@for\CurrentOption:=\@classoptionslist\do{%
\@ifundefined{KV@\@currname @\CurrentOption}%
@@ -21,24 +22,23 @@
\fi
\edef\@tempa{%
\noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}%
- \let\beamer at origkverr\KV at errx%
- \let\beamer at origxkverr\XKV at err%
+ \let\beamer at origkverr\KV at errx
+ \let\beamer at origxkverr\XKV at err
\let\KV at errx=\@gobble% never mind
\let\XKV at err=\@gobble% never mind
- \@tempa%
- \let\KV at errx\beamer at origkverr%
- \let\XKV at err\beamer at origxkverr%
+ \@tempa
+ \let\KV at errx\beamer at origkverr
+ \let\XKV at err\beamer at origxkverr
\AtEndOfPackage{\let\@unprocessedoptions\relax}}
-\def\ExecuteOptionsBeamer#1{%
+\newrobustcmd\ExecuteOptionsBeamer[1]{%
\setkeys{\@currname}{#1}}
-\def\DeclareOptionBeamer#1{\@ifnextchar[{\beamer at dokv{#1}}{\beamer at dokv{#1}[]}}
+\newrobustcmd\DeclareOptionBeamer[1]{\@ifnextchar[{\beamer at dokv{#1}}{\beamer at dokv{#1}[]}}
\long\def\beamer at dokv#1[#2]#3{\define at key{\@currname}{#1}[{#2}]{#3}}
-
-\def\beamer at filterclassoptions{
- \def\beamer at filteredclassoptionslist{}
+\def\beamer at filterclassoptions{%
+ \def\beamer at filteredclassoptionslist{}%
\@for\CurrentOption:=\@classoptionslist\do{%
\ifx\CurrentOption\@empty\else
\@expandtwoargs\in@{=}{\CurrentOption}%
@@ -45,7 +45,7 @@
\ifin@
\else
\edef\beamer at filteredclassoptionslist{%
- \beamer at filteredclassoptionslist,\CurrentOption}
+ \beamer at filteredclassoptionslist,\CurrentOption}%
\fi
\fi
}%
@@ -52,9 +52,6 @@
\let\@classoptionslist=\beamer at filteredclassoptionslist
}
+\newrobustcmd*\defbeameroption{\define at key{beamer at option}}
+\newrobustcmd*\setbeameroption{\setkeys{beamer at option}}
-
-\newcommand\defbeameroption{\define at key{beamer at option}}
-\newcommand\setbeameroption{\setkeys{beamer at option}}
-
-
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2010--2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -9,6 +10,10 @@
%
% See the file doc/licenses/LICENSE for more details.
+% Many of these commans allow an overlay spec either before or after
+% their argument (though not in both positions), hence the repetition
+% of "\@ifnextchar<".
+
%
%
% Basic overlay commands
@@ -15,6 +20,10 @@
%
%
+% This variant based on \@ifnextchar does not skip spaces
+% (So like amsmath's \new at ifnextchar). It is used where beamer allows
+% an overlay at the end of a command, and would thus otherwise result in
+% space gobbling.
\long\def\beamer at ifnextcharospec#1#2{%
\def\reserved at a{#1}%
\def\reserved at b{#2}%
@@ -30,34 +39,34 @@
%
% \only
%
-\def\only{\@ifnextchar<{\beamer at only}{\beamer@@only}}
+\newrobustcmd*\only{\@ifnextchar<{\beamer at only}{\beamer@@only}}
\long\def\beamer at only<#1>#2{%
- \def\beamer at doifnotinframe{}\def\beamer at doifinframe{#2}%
- {\beamer at masterdecode{#1}}\beamer at donow}
+ \gdef\beamer at doifnotinframe{}\def\beamer at doifinframe{#2}%
+ \beamer at masterdecode{#1}\beamer at donow}
\long\def\beamer@@only#1{\beamer at ifnextcharospec{\beamer@@@only{#1}}{#1}}
\long\def\beamer@@@only#1<#2>{%
- \def\beamer at doifnotinframe{}\def\beamer at doifinframe{#1}%
- {\beamer at masterdecode{#2}}\beamer at donow}
+ \gdef\beamer at doifnotinframe{}\def\beamer at doifinframe{#1}%
+ \beamer at masterdecode{#2}\beamer at donow}
%
% \alt and \altenv
%
-\def\alt{\@ifnextchar<{\beamer at alt}{\beamer at alttwo}}
+\newrobustcmd*\alt{\@ifnextchar<{\beamer at alt}{\beamer at alttwo}}
\long\def\beamer at alttwo#1#2{\beamer at ifnextcharospec{\beamer at altget{#1}{#2}}{#1}}
\long\def\beamer at altget#1#2<#3>{%
- \def\beamer at doifnotinframe{#2}\def\beamer at doifinframe{#1}%
- {\beamer at masterdecode{#3}}\beamer at donow}
+ \gdef\beamer at doifnotinframe{#2}\def\beamer at doifinframe{#1}%
+ \beamer at masterdecode{#3}\beamer at donow}
\long\def\beamer at alt<#1>#2#3{%
- \def\beamer at doifnotinframe{#3}\def\beamer at doifinframe{#2}%
- {\beamer at masterdecode{#1}}\beamer at donow}
+ \gdef\beamer at doifnotinframe{#3}\def\beamer at doifinframe{#2}%
+ \beamer at masterdecode{#1}\beamer at donow}
-\def\altenv{\@ifnextchar<{\beamer at altenv}{\beamer@@@altenv}}
+\newrobustcmd*\altenv{\@ifnextchar<{\beamer at altenv}{\beamer@@@altenv}}
\def\beamer at altenv<#1>{\beamer@@altenv{<#1>}}
\long\def\beamer@@@altenv#1#2#3#4{\beamer at ifnextcharospec{\beamer at altenvsort{#1}{#2}{#3}{#4}}{\beamer@@altenv{}{#1}{#2}{#3}{#4}}}
\long\def\beamer at altenvsort#1#2#3#4<#5>{\beamer@@altenv{<#5>}{#1}{#2}{#3}{#4}}
\long\def\beamer@@altenv#1#2#3#4#5{\alt#1{\long\def\beamer at eoenv{#3}#2}{\long\def\beamer at eoenv{#5}#4}}
-\def\endaltenv{\beamer at eoenv}
+\protected\def\endaltenv{\beamer at eoenv}
%
% \action and actionenv
@@ -64,21 +73,22 @@
%
\def\beamer at plus{+}
-\def\action{\@ifnextchar<{\beamer at parsedaction}{\expandafter\beamer at parsedaction\beamer at defaultospec}}
+\newrobustcmd*\action{\@ifnextchar<{\beamer at parsedaction}{\expandafter\beamer at parsedaction\beamer at defaultospec}}
\long\def\beamer at parsedaction<#1>#2{%
- \def\beamer at doifnotinframe{}\def\beamer at doifinframe{}%
- {{\beamer at masterdecode{#1}}}%
- \ifx\beamer at decodefound\beamer at plus%
+ \gdef\beamer at doifnotinframe{}%
+ \def\beamer at doifinframe{}%
+ \beamer at masterdecode{#1}%
+ \ifx\beamer at decodefound\beamer at plus
\long\def\beamer at todo{#2}%
- \else%
- \expandafter\long\expandafter\def\expandafter\beamer at todo%
+ \else
+ \expandafter\long\expandafter\def\expandafter\beamer at todo
\expandafter{\expandafter\uncover\expandafter<\expandafter a\expandafter l\expandafter l\expandafter:\beamer at decodefound>{#2}}%
- \fi%
+ \fi
\expandafter\beamer at processactions\beamer at decaction{}%
\beamer at todo}
\def\beamer at processactions#1{%
- \beamer at ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactions\expandafter{\beamer at todo}#1}}
\long\def\beamer@@processactions#1#2<#3>{%
\expandafter\long\expandafter\def\expandafter\beamer at todo\expandafter{%
@@ -85,38 +95,37 @@
\csname#2\endcsname<all:#3>{#1}}%
\beamer at processactions}
-\def\actionenv{\beamer at ifnextcharospec{\beamer at parsedactionenv}{\expandafter\beamer at parsedactionenv\beamer at defaultospec}}
+\newrobustcmd*\actionenv{\beamer at ifnextcharospec{\beamer at parsedactionenv}{\expandafter\beamer at parsedactionenv\beamer at defaultospec}}
\def\beamer at parsedactionenv<#1>{%
- \def\beamer at doifnotinframe{}\def\beamer at doifinframe{}%
- {{\beamer at masterdecode{#1}}}%
- \ifx\beamer at decodefound\beamer at plus%
+ \gdef\beamer at doifnotinframe{}%
+ \def\beamer at doifinframe{}%
+ \beamer at masterdecode{#1}%
+ \ifx\beamer at decodefound\beamer at plus
\def\beamer at todobegin{}%
\def\beamer at todoend{}%
- \else%
+ \else
\edef\beamer at todobegin{\noexpand\begin{uncoverenv}<all:\beamer at decodefound>}%
\def\beamer at todoend{\end{uncoverenv}}%
- \fi%
+ \fi
\expandafter\beamer at processactionsbegin\beamer at decaction{}%
\expandafter\beamer at processactionsend\beamer at decaction{}%
\beamer at todobegin}
-\def\endactionenv{\beamer at todoend}
+\protected\def\endactionenv{\beamer at todoend}
\def\beamer at processactionsbegin#1{%
- \beamer at ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactionsbegin\expandafter{\beamer at todobegin}#1}}
\long\def\beamer@@processactionsbegin#1#2<#3>{%
\def\beamer at todobegin{\begin{#2env}<all:#3>#1}%
\beamer at processactionsbegin}
-
\def\beamer at processactionsend#1{%
- \beamer at ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactionsend\expandafter{\beamer at todoend}#1}}
\long\def\beamer@@processactionsend#1#2<#3>{%
\def\beamer at todoend{#1\end{#2env}}%
\beamer at processactionsend}
-
\def\beamer at defaultospec{<*>}
\def\beamer at emptyospec{<*>}
@@ -123,18 +132,16 @@
%
% \temporal
%
-\long\def\temporal<#1>#2#3#4{% past, present, future
- \def\beamer at doifnotinframe{\beamer at picked}\def\beamer at doifinframe{#3}%
- {\beamer at masterdecode{#1}%
- \ifbeamer at localanotherslide\gdef\beamer at picked{#2}\else\gdef\beamer at picked{#4}\fi}\beamer at donow}
+\protected\long\def\temporal<#1>#2#3#4{% past, present, future
+ \gdef\beamer at doifnotinframe{\beamer at picked}\def\beamer at doifinframe{#3}%
+ \beamer at masterdecode{#1}%
+ \ifbeamer at anotherslide\gdef\beamer at picked{#2}\else\gdef\beamer at picked{#4}\fi\beamer at donow}
-
%
-% \newoverlaycommand
+% \beameroriginal
%
\def\beameroriginal#1{\csname @orig\string#1\endcsname}
-
\newcount\beamer at argscount
%
@@ -146,6 +153,9 @@
\def\beamer at newenv<>{\@star at or@long\beamer at new@environment}
\def\beamer at new@environment#1{\@ifnextchar[{\beamer@@newenv{#1}}{\beamer at newenvnoopt{#1}{0}}}
\def\beamer@@newenv#1[#2]{\@ifnextchar[{\beamer at newenvopt{#1}{#2}}{\beamer at newenvnoopt{#1}{#2}}}
+% The beamer syntax for \newenvironment<> follows the pattern for \newcommand<>
+% and allows the overlay spec anywhere: the same code path is therefore used for
+% both.
\long\def\beamer at newenvnoopt#1#2#3#4{%
\expandafter\newcommand\expandafter<\expandafter>\csname#1\endcsname[#2]{#3}%
\expandafter\long\expandafter\def\csname end#1\endcsname{#4}%
@@ -155,18 +165,20 @@
\expandafter\long\expandafter\def\csname end#1\endcsname{#5}%
}
-
\let\beamer at origrenewenvironment=\renewenvironment
\def\renewenvironment{\@ifnextchar<{\beamer at renewenv}{\beamer at origrenewenvironment}}
\def\beamer at renewenv<>#1{%
- \edef\beamer at do{\csname original#1\endcsname=\expandafter\noexpand\csname#1\endcsname}
- \expandafter\let\beamer at do%
- \edef\beamer at do{\csname endoriginal#1\endcsname=\expandafter\noexpand\csname end#1\endcsname}
- \expandafter\let\beamer at do%
+ \ifcsdef{original#1}%
+ {}%
+ {%
+ \csletcs{original#1}{#1}%
+ \csletcs{endoriginal#1}{end#1}%
+ }%
+ \csundef{#1}%
+ \csundef{beamerx@\expandafter\string\csname#1\endcsname}%
\newenvironment<>{#1}}
-
%
% newcommand extension
%
@@ -177,20 +189,35 @@
\def\beamer at new@command#1{\@ifnextchar[{\beamer@@newcom{#1}}{\beamer at newcomnoopt{#1}{0}}}
\def\beamer@@newcom#1[#2]{\@ifnextchar[{\beamer at newcomopt{#1}{#2}}{\beamer at newcomnoopt{#1}{#2}}}
\long\def\beamer at newcomnoopt#1#2#3{%
- \ifnum#2=0\relax%
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer at sortzero\expandafter{\csname beamerx@\string#1\endcsname}}%
+ \ifnum#2=0\relax
+ \protected\edef#1%
+ {\noexpand\beamer at sortzero\expandafter\noexpand\csname beamerx@\string#1\endcsname}%
\else
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer at sort\expandafter{\csname beamerx@\string#1\endcsname}{#2}}%
- \fi%
- \beamer at argscount=#2\relax%
- \advance\beamer at argscount by 1\relax%
- \expandafter\newcommand\csname beamerx@\string#1\endcsname[\beamer at argscount]{#3}%
+ \protected\edef#1%
+ {\noexpand\beamer at sort\expandafter\noexpand\csname beamerx@\string#1\endcsname{#2}}%
+ \fi
+ \beamer at argscount=#2\relax
+ \advance\beamer at argscount by 1\relax
+ \ifx\l at ngrel@x\relax
+ \expandafter\expandafter\expandafter\newcommand
+ \expandafter\expandafter\expandafter*%
+ \else
+ \expandafter\expandafter\expandafter\newcommand
+ \fi
+ \csname beamerx@\string#1\endcsname[\beamer at argscount]{#3}%
}
\long\def\beamer at newcomopt#1#2[#3]#4{%
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer at presort\expandafter{\csname beamerx@\string#1\endcsname}{#2}{#3}}%
- \beamer at argscount=#2\relax%
- \advance\beamer at argscount by 1\relax%
- \expandafter\newcommand\csname beamerx@\string#1\endcsname[\beamer at argscount]{#4}%
+ \protected\expandafter\def\expandafter#1\expandafter
+ {\expandafter\beamer at presort\expandafter{\csname beamerx@\string#1\endcsname}{#2}{#3}}%
+ \beamer at argscount=#2\relax
+ \advance\beamer at argscount by 1\relax
+ \ifx\l at ngrel@x\relax
+ \expandafter\expandafter\expandafter\newcommand
+ \expandafter\expandafter\expandafter*%
+ \else
+ \expandafter\expandafter\expandafter\newcommand
+ \fi
+ \csname beamerx@\string#1\endcsname[\beamer at argscount]{#4}%
}
\let\beamer at origrenewcommand=\renewcommand
@@ -197,42 +224,44 @@
\def\renewcommand{\@ifnextchar<{\beamer at renewcom}{\beamer at origrenewcommand}}
\def\beamer at renewcom<>#1{%
- \expandafter\def\expandafter\beamer at name\expandafter{\csname @orig\string#1\endcsname}%
- \expandafter\let\beamer at name=#1\relax%
- \expandafter\let\csname beamerx@\string#1\endcsname\@undefined
+ \ifcsundef{@orig\string#1}%
+ {\cslet{@orig\string#1}#1}%
+ {}%
+ \csundef{beamerx@\string#1}%
\newcommand<>#1}
-
+% The class allows overlays specs at any position in a command.
+% To handle that, beamer first collects up material potentially
+% including overlay info before passing to the 'real' definition.
\long\def\beamer at presort#1#2#3{%
- \long\def\beamer at todo{#1}%
+ \def\beamer at todo{#1}%
\def\beamer at ospec{}%
- \beamer at argscount=#2\relax%
+ \beamer at argscount=#2\relax
\beamer at prechecka{#3}}
\long\def\beamer at prechecka#1{\@ifnextchar<{\beamer at preget{#1}}{\beamer at precheckb{#1}}}
\long\def\beamer at preget#1<#2>{\def\beamer at ospec{<#2>}\beamer at precheckb{#1}}
\long\def\beamer at precheckb#1{\@ifnextchar[{\beamer at pregetb}{\beamer at pregetb[{#1}]}}
\long\def\beamer at pregetb[#1]{%
- \expandafter\long\expandafter\def\expandafter\beamer at todo\expandafter{\beamer at todo{#1}}%
- \advance\beamer at argscount by-1\relax%
- \beamer at parseargs%
+ \expandafter\def\expandafter\beamer at todo\expandafter{\beamer at todo{#1}}%
+ \advance\beamer at argscount by-1\relax
+ \beamer at parseargs
}
\def\beamer at sortzero#1{\beamer at ifnextcharospec{\beamer at sortzeroread{#1}}{#1{}}}
\def\beamer at sortzeroread#1<#2>{#1{<#2>}}
-
\def\beamer at sort#1#2{%
- \long\def\beamer at todo{#1}%
+ \def\beamer at todo{#1}%
\def\beamer at ospec{}%
- \beamer at argscount=#2\relax%
+ \beamer at argscount=#2\relax
\beamer at parseargs}
\def\beamer at parseargs{%
- \ifnum\beamer at argscount=0\relax%
- \let\next=\beamer at finalargscheck%
- \else%
- \let\next=\beamer at lookforarg%
- \fi%
+ \ifnum\beamer at argscount=0\relax
+ \let\next=\beamer at finalargscheck
+ \else
+ \let\next=\beamer at lookforarg
+ \fi
\next}
\def\beamer at lookforarg{%
\@ifnextchar<\beamer at foundspec\beamer at readarg}
@@ -241,8 +270,8 @@
\beamer at lookforarg}
\long\def\beamer at readarg#1{%
\expandafter\long\expandafter\def\expandafter\beamer at todo\expandafter{\beamer at todo{#1}}%
- \advance\beamer at argscount by-1\relax%
- \beamer at parseargs%
+ \advance\beamer at argscount by-1\relax
+ \beamer at parseargs
}
\def\beamer at finalargscheck{\beamer at ifnextcharospec\beamer at finalspec\beamer at finalnospec}
@@ -250,29 +279,29 @@
\def\beamer at finalnospec{%
\expandafter\beamer at todo\expandafter{\beamer at ospec}}
-
-
-
\mode
<presentation>
-
% commands for smuggling skips past
\newskip\beamer at lastskipcover
\def\beamer at smuggle#1{%
{}%
- \beamer at lastskipcover=\lastskip%
+ \beamer at lastskipcover=\lastskip
\edef\beamer at lastskiptext{\the\lastskip}%
- \ifx\beamer at lastskiptext\beamer at zeropt\else%
- \ifvmode\unskip\fi\ifhmode\unskip\fi\fi%
+ \ifx\beamer at lastskiptext\beamer at zeropt
+ \else
+ \ifvmode\unskip\fi
+ \ifhmode\unskip\fi
+ \fi
#1%
- \ifx\beamer at lastskiptext\beamer at zeropt\else%
- \ifvmode\vskip\beamer at lastskipcover\fi\ifhmode\hskip\beamer at lastskipcover\fi\fi%
+ \ifx\beamer at lastskiptext\beamer at zeropt
+ \else
+ \ifvmode\vskip\beamer at lastskipcover\fi
+ \ifhmode\hskip\beamer at lastskipcover\fi
+ \fi
}
-
-
%
% Uncovering management
%
@@ -307,54 +336,52 @@
\the\beamer at coveringdepth\endcsname}%
\color{.}%
}}}%
- \ifnum\beamer at slideinframe<\beamer at minimum%ok, at beginning
- {%
- \beamer at saveanother%
- \advance\beamer at minimum by-\beamer at slideinframe%
- \beamer at slideinframe=\beamer at minimum%
- \beamer at uncoverbeforeactions%
- \beamer at restoreanother%
+ \ifnum\beamer at slideinframe<\beamer at minimum %ok, at beginning
+ \begingroup
+ \beamer at saveanother
+ \advance\beamer at minimum by-\beamer at slideinframe
+ \beamer at slideinframe=\beamer at minimum
+ \beamer at uncoverbeforeactions
+ \beamer at restoreanother
+ \endgroup
+ \else
+ \begingroup
+ \beamer at saveanother
+ \advance\beamer at slideinframe by-\beamer at minimum
+ \beamer at uncoverafteractions
+ \beamer at restoreanother
+ \endgroup
+ \fi
+ \beamer at do
}%
- \else%
- {%
- \beamer at saveanother%
- \advance\beamer at slideinframe by-\beamer at minimum%
- \beamer at uncoverafteractions%
- \beamer at restoreanother%
- }%
- \fi%
- \beamer at do%
- }%
}
\def\beamer at endcovered{%
\beamer at smuggle{%
- \csname beamer at doafter\the\beamer at coveringdepth\endcsname%
- \global\advance\beamer at coveringdepth by -1\relax%
+ \csname beamer at doafter\the\beamer at coveringdepth\endcsname
+ \global\advance\beamer at coveringdepth by -1\relax
}%
}%
-
\define at key{beamer at mixin}{still covered}{\def\beamer at uncoverbeforeactions{\ignorespaces#1}}
\define at key{beamer at mixin}{again covered}{\def\beamer at uncoverafteractions{\ignorespaces#1}}
\define at key{beamer at mixin}{invisible}[]{%
- \def\beamer at uncoverbeforeactions{\ignorespaces}
+ \def\beamer at uncoverbeforeactions{\ignorespaces}%
\def\beamer at uncoverafteractions{\ignorespaces}}
\define at key{beamer at mixin}{transparent}[15]{%
- \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1->{#1}}
+ \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1->{#1}}%
\def\beamer at uncoverafteractions{\ignorespaces\opaqueness<1->{#1}}}
\define at key{beamer at mixin}{dynamic}[]{%
- \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}
+ \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}%
\def\beamer at uncoverafteractions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}}
\define at key{beamer at mixin}{highly dynamic}[]{%
- \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}
+ \def\beamer at uncoverbeforeactions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}%
\def\beamer at uncoverafteractions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}}
-
-\def\setbeamercovered#1{%
+\newrobustcmd*\setbeamercovered[1]{%
\setkeys{beamer at mixin}{invisible}%
\setkeys{beamer at mixin}{#1}}
@@ -369,32 +396,30 @@
\beamer at coveringdepth=0\relax
-
\mode
<article>
{
- \let\setbeamercovered=\@gobble
+ \newrobustcmd*\setbeamercovered[1]{}
}
-
-
-
%
% Pausing
%
+\def\beamer at endpause{}
+
\newenvironment{beamer at framepauses}%internal
{%
- \global\c at beamerpauses=1\relax%
+ \setcounter{beamerpauses}{1}%
\gdef\beamer at endpause{}%
}
{\beamer at endpause}
-\newcommand{\beamer@@pause}[1][]{%
- \beamer at ifempty{#1}%
- {\global\advance\c at beamerpauses by1\relax}%
- {\global\c at beamerpauses=#1\relax}%
- \onslide<\c at beamerpauses->\relax%
+\newrobustcmd{\beamer@@pause}[1][]{%
+ \ifblank{#1}%
+ {\stepcounter{beamerpauses}}%
+ {\setcounter{beamerpauses}{#1}}%
+ \onslide<\value{beamerpauses}->\relax%
}
\mode
@@ -410,12 +435,10 @@
}
}
-
-
\mode
<all>
{
- \def\onslide{\@ifstar{\only}{\@ifnextchar+{\expandafter\beamer at visibleonslide\@gobble}{\beamer at mainonslide}}}
+ \newrobustcmd*\onslide{\@ifstar{\only}{\@ifnextchar+{\expandafter\beamer at visibleonslide\@gobble}{\beamer at mainonslide}}}
\newcommand<>{\beamer at visibleonslide}{%
\@ifnextchar\bgroup
@@ -446,14 +469,11 @@
\mode
<article>
{
- \newcommand\beamer@@pause[1][]{}
+ \newrobustcmd\beamer@@pause[1][]{}
\newcommand<>{\beamer at noargsonslide}{}
\newcommand<>{\beamer at noargsvisibleonslide}{}
}
-
-
-
%
% Make item overlays
%
@@ -464,26 +484,26 @@
\def\item{%
\@ifnextchar\relax\beamer at origitem{%
- \ifhmode%
- \unskip\unskip\par%
- \fi%
+ \ifhmode
+ \unskip\unskip\par
+ \fi
\beamer at closeitem\gdef\beamer at closeitem{}%
\@ifnextchar<{\beamer at parseitem}{\beamer at itemcheckopt}}}
\def\beamer at itemcheckopt{\@ifnextchar[{\beamer at itemcheckopta}{%
- \ifx\beamer at defaultospec\beamer at emptyospec%
- \let\next=\beamer at callorigitem%
- \else%
- \let\next=\beamer at defaultparse%
- \fi%
- \next%
+ \ifx\beamer at defaultospec\beamer at emptyospec
+ \let\next=\beamer at callorigitem
+ \else
+ \let\next=\beamer at defaultparse
+ \fi
+ \next
}}
\def\beamer at defaultparse{\expandafter\beamer at parseitem\beamer at defaultospec}
\long\def\beamer at itemcheckopta[#1]{\@ifnextchar<{\beamer at itemreverse[{#1}]}{%
- \ifx\beamer at defaultospec\beamer at emptyospec%
- \let\next=\beamer at callorigitem%
- \else%
- \let\next=\beamer at defaultparse%
- \fi%
+ \ifx\beamer at defaultospec\beamer at emptyospec
+ \let\next=\beamer at callorigitem
+ \else
+ \let\next=\beamer at defaultparse
+ \fi
\next[{#1}]}}
\long\def\beamer at itemreverse[#1]<#2>{\beamer at parseitem<#2>[{#1}]}
@@ -495,11 +515,10 @@
%% Local change inside actionenv should survive, and should be
%% always false
\@noparitemfalse}%
-\begin{actionenv}<#1>\beamer at callorigitem}
+ \begin{actionenv}<#1>\beamer at callorigitem}
-
-\def\beamerdefaultoverlayspecification#1{%
- \beamer at ifempty{#1}%
+\newrobustcmd*\beamerdefaultoverlayspecification[1]{%
+ \ifblank{#1}%
{%
\def\beamer at gdefaultospec{<*>}%
\def\beamer at defaultospec{<*>}}%
@@ -510,23 +529,22 @@
}
\beamerdefaultoverlayspecification{}
-
\newcount\beamer at trivlistdepth
\beamer at trivlistdepth=0\relax
\let\beamer at orig@trivlist=\@trivlist
\def\@trivlist{%
- \global\advance\beamer at trivlistdepth by1\relax%
- \expandafter\global\expandafter\let\csname beamer at closeitem\the\beamer at trivlistdepth\endcsname=\beamer at closeitem%
+ \global\advance\beamer at trivlistdepth by1\relax
+ \expandafter\global\expandafter\let\csname beamer at closeitem\the\beamer at trivlistdepth\endcsname=\beamer at closeitem
\gdef\beamer at closeitem{}%
- \beamer at orig@trivlist%
+ \beamer at orig@trivlist
}
\let\beamer at origendtrivlist=\endtrivlist
\def\endtrivlist{%
- \beamer at closeitem%
+ \beamer at closeitem
\expandafter\global\expandafter\let\expandafter\beamer at closeitem\expandafter=\csname
- beamer at closeitem\the\beamer at trivlistdepth\endcsname%
- \global\advance\beamer at trivlistdepth by-1\relax%
+ beamer at closeitem\the\beamer at trivlistdepth\endcsname
+ \global\advance\beamer at trivlistdepth by-1\relax
\beamer at origendtrivlist}
\def\beamer at closeitem{}
@@ -534,7 +552,6 @@
\let\beamer at list=\list
\let\beamer@@trivlist=\@trivlist
-
\mode
<article>
{
@@ -545,16 +562,14 @@
\def\beamer at item{\@ifnextchar[\beamer@@@item\beamer at origitem}
\def\beamer@@@item[#1]{\@ifnextchar<{\beamer@@@@item[{#1}]}{\beamer at origitem[{#1}]}}
\def\beamer@@@@item[#1]<#2>{\beamer at origitem[{#1}]}
+ \newrobustcmd*\beamerdefaultoverlayspecification[1]{}
}
}
-
-
%
% Overlay commands
%
-
\mode
<all>
{
@@ -572,9 +587,9 @@
\long\def\beamer at makecovered#1{\beamer at startcovered#1\beamer at endcovered}
\long\def\beamer at reallymakeinvisible#1{\beamer at begininvisible#1\beamer at endinvisible}
-\newcommand{\uncover}{\alt{\beamer at fakeinvisible}{\beamer at makecovered}}
-\newcommand{\visible}{\alt{\beamer at fakeinvisible}{\beamer at reallymakeinvisible}}
-\newcommand{\invisible}{\alt{\beamer at reallymakeinvisible}{\beamer at fakeinvisible}}
+\newrobustcmd*{\uncover}{\alt{\beamer at fakeinvisible}{\beamer at makecovered}}
+\newrobustcmd*{\visible}{\alt{\beamer at fakeinvisible}{\beamer at reallymakeinvisible}}
+\newrobustcmd*{\invisible}{\alt{\beamer at reallymakeinvisible}{\beamer at fakeinvisible}}
\newenvironment{visibleenv}{\begin{altenv}{\beamer at spacingcover}{\beamer at spacingcover}{\beamer at begininvisible}{\beamer at endinvisible}}{\end{altenv}}
\newenvironment{invisibleenv}{\begin{altenv}{\beamer at begininvisible}{\beamer at endinvisible}{\beamer at spacingcover}{\beamer at spacingcover}}{\end{altenv}}
\newenvironment{uncoverenv}{\begin{altenv}{\beamer at spacingcover}{\beamer at spacingcover}{\beamer at startcovered}{\beamer at endcovered}}{\end{altenv}}
@@ -584,9 +599,9 @@
\mode
<article>
{
- \newcommand{\uncover}{\alt{\@firstofone}{\@gobble}}
- \newcommand{\visible}{\alt{\@firstofone}{\@gobble}}
- \newcommand{\invisible}{\alt{\@gobble}{\@firstofone}}
+ \newrobustcmd*{\uncover}{\alt{\@firstofone}{\@gobble}}
+ \newrobustcmd*{\visible}{\alt{\@firstofone}{\@gobble}}
+ \newrobustcmd*{\invisible}{\alt{\@gobble}{\@firstofone}}
\newenvironment{onlyenv}{\begin{altenv}{}{}{\begingroup\setbox0=\vbox\bgroup}{\egroup\endgroup}}{\end{altenv}}
\newenvironment{uncoverenv}{\begin{altenv}{}{}{\begingroup\setbox0=\vbox\bgroup}{\egroup\endgroup}}{\end{altenv}}
\newenvironment{visibleenv}{\begin{altenv}{}{}{\begingroup\setbox0=\vbox\bgroup}{\egroup\endgroup}}{\end{altenv}}
@@ -614,15 +629,13 @@
\mode
<article>
{
- \g at addto@macro\beamer at lastminutepatches{
+ \g at addto@macro\beamer at lastminutepatches{%
% These have to be done late...
- \renewcommand<>{\hypertarget}[2]{\only#3{\beameroriginal{\hypertarget}{#1}{#2}}}
+ \renewcommand<>{\hypertarget}[2]{\only#3{\beameroriginal{\hypertarget}{#1}{#2}}}%
\renewcommand<>{\hyperlink}[2]{\only#3{\beameroriginal{\hyperlink}{#1}{#2}}}
}
}
-
-
\newcommand<>{\emph}[1]{{\only#2{\itshape}#1}}
\mode
@@ -631,27 +644,25 @@
\renewcommand<>{\emph}{\only#1{\beameroriginal\emph}}
}
-
-
%
% Insert area
%
\newenvironment{overlayarea}[2]{%
- \beamer at animht=#1\relax%
- \beamer at animwd=#2\relax%
- \setbox\beamer at areabox=\vbox to#2\bgroup%
- \strut\begin{minipage}[t]{#1}%
+ \beamer at animht=#1\relax
+ \beamer at animwd=#2\relax
+ \setbox\beamer at areabox=\vbox to\beamer at animwd\bgroup
+ \strut\begin{minipage}[t]{\beamer at animht}%
% Make the minipage behave like the main part of the slide
\normalfont
\raggedright
}
{%
- \end{minipage}\vfil%
- \egroup%
- \wd\beamer at areabox=\beamer at animht%
- \ht\beamer at areabox=\beamer at animwd%
- \dp\beamer at areabox=0pt%
- \box\beamer at areabox%
+ \end{minipage}\vfil
+ \egroup
+ \wd\beamer at areabox=\beamer at animht
+ \ht\beamer at areabox=\beamer at animwd
+ \dp\beamer at areabox=0pt %
+ \box\beamer at areabox
}
\mode
@@ -660,40 +671,39 @@
\newenvironment{overlayarea}[2]{}{}% no effect
}
-
\newenvironment{overprint}[1][\textwidth]{%
- \let\beamer at noargsonslide=\beamer at onslide%
- \let\beamer at noargsvisibleonslide=\beamer at onslide%
- \beamer at animht=0pt%
- \beamer at animdp=0pt%
- \beamer at animwd=#1\relax%
- \setbox\beamer at animcurrent=\box\beamer at animshowbox% makes animshowbox empty
+ \let\beamer at noargsonslide=\beamer at onslide
+ \let\beamer at noargsvisibleonslide=\beamer at onslide
+ \beamer at animht=0pt\relax
+ \beamer at animdp=0pt\relax
+ \beamer at animwd=#1\relax
+ \setbox\beamer at animcurrent=\box\beamer at animshowbox % makes animshowbox empty
\setbox\beamer at animcurrent=\hbox{}%
\def\beamer at endaction{}%
}{%
- \beamer at endaction%
- \ifvoid\beamer at animshowbox\setbox\beamer at animshowbox=\hbox{}\fi%
- \ht\beamer at animshowbox=\beamer at animht%
- \dp\beamer at animshowbox=\beamer at animdp%
- \wd\beamer at animshowbox=\beamer at animwd%
- \box\beamer at animshowbox%
+ \beamer at endaction
+ \ifvoid\beamer at animshowbox\setbox\beamer at animshowbox=\hbox{}\fi
+ \ht\beamer at animshowbox=\beamer at animht
+ \dp\beamer at animshowbox=\beamer at animdp
+ \wd\beamer at animshowbox=\beamer at animwd
+ \box\beamer at animshowbox
}
\def\beamer at onslide<#1>{%
- \beamer at endaction%
+ \beamer at endaction
\alt<#1>{%
- \ifvoid\beamer at animshowbox\else\ClassError{beamer}{Overprints may not overlap}{}\fi%
+ \ifvoid\beamer at animshowbox\else\ClassError{beamer}{Overprints may not overlap}{}\fi
\def\beamer at endaction{%
\end{minipage}%
- \egroup%
- \ifdim\beamer at animht<\ht\beamer at animcurrent\beamer at animht=\ht\beamer at animcurrent\fi%
- \ifdim\beamer at animdp<\dp\beamer at animcurrent\beamer at animdp=\dp\beamer at animcurrent\fi%
- \setbox\beamer at animshowbox=\copy\beamer at animcurrent}
+ \egroup
+ \ifdim\beamer at animht<\ht\beamer at animcurrent\beamer at animht=\ht\beamer at animcurrent\fi
+ \ifdim\beamer at animdp<\dp\beamer at animcurrent\beamer at animdp=\dp\beamer at animcurrent\fi
+ \setbox\beamer at animshowbox=\copy\beamer at animcurrent}%
}%
{\def\beamer at endaction{%
\end{minipage}%
- \egroup%
- \ifdim\beamer at animht<\ht\beamer at animcurrent\beamer at animht=\ht\beamer at animcurrent\fi%
+ \egroup
+ \ifdim\beamer at animht<\ht\beamer at animcurrent\beamer at animht=\ht\beamer at animcurrent\fi
\ifdim\beamer at animdp<\dp\beamer at animcurrent\beamer at animdp=\dp\beamer at animcurrent\fi}%
}%
\setbox\beamer at animcurrent=\vbox\bgroup\begin{minipage}[t]{\beamer at animwd}%
@@ -724,7 +734,7 @@
\def\beamer at transdir{}%
\def\beamer at dur{}%
\setkeys{beamertrans}{#1}%
- \edef\beamer at temp{{pdfpagetransition={#2 \beamer at transdir\space\beamer at dur}}}
+ \edef\beamer at temp{{pdfpagetransition={#2 \beamer at transdir\space\beamer at dur}}}%
\expandafter\hypersetup\beamer at temp}
\mode
@@ -767,40 +777,38 @@
% Animation macros
%
-\def\animate<#1>{\transduration<#1| handout:0| trans:0>{0}}
-\def\animatevalue<#1-#2>#3#4#5{%
+\protected\def\animate<#1>{\transduration<#1| handout:0| trans:0>{0}}
+\protected\def\animatevalue<#1-#2>#3#4#5{%
\only<#1-#2>{}% enforce these frames
- \ifnum\beamer at slideinframe<#1\relax%
- #3=#4\relax%
- \else%
- \ifnum\beamer at slideinframe<#2\relax%
- #3=#4\relax%
- #3=-#3\relax%
- \advance#3 by#5\relax%
- \beamer at animationtempa=#2\relax%
- \advance\beamer at animationtempa by-#1%
- \ifnum\beamer at animationtempa>0%
- \divide#3 by\beamer at animationtempa%
- \fi%
- \beamer at animationtempa=\beamer at slideinframe%
- \advance\beamer at animationtempa by-#1%
- \multiply#3 by\beamer at animationtempa%
- \advance#3 by#4%
+ \ifnum\beamer at slideinframe<#1\relax
+ #3=#4\relax
+ \else
+ \ifnum\beamer at slideinframe<#2\relax
+ #3=#4\relax
+ #3=-#3\relax
+ \advance#3 by#5\relax
+ \beamer at animationtempa=#2\relax
+ \advance\beamer at animationtempa by-#1 %
+ \ifnum\beamer at animationtempa>0 %
+ \divide#3 by\beamer at animationtempa
+ \fi
+ \beamer at animationtempa=\beamer at slideinframe
+ \advance\beamer at animationtempa by-#1 %
+ \multiply#3 by\beamer at animationtempa
+ \advance#3 by#4 %
\else
- #3=#5\relax%
- \fi%
- \fi%
+ #3=#5\relax
+ \fi
+ \fi
}
\mode
<article>
{
- \def\animate<#1>{}
- \def\animatevalue<#1-#2>#3#4#5{#3=#4\relax}
+ \protected\def\animate<#1>{}
+ \protected\def\animatevalue<#1-#2>#3#4#5{#3=#4\relax}
}
-
-
%
% Labels in overlays
%
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -8,70 +9,65 @@
%
% See the file doc/licenses/LICENSE for more details.
-
%
% Beamer packages
%
+
+% Fixes other packages
\RequirePackage{beamerbasecompatibility}
-% Fixes other packages
+% Font stuff
\RequirePackage{beamerbasefont}
-% Font stuff
+% Support for translations
\RequirePackage{beamerbasetranslator}
-% Support for translations
+% Miscellaneous commands
\RequirePackage{beamerbasemisc}
-% Miscellaneous commands
+% Stuff for using two screens
\RequirePackage{beamerbasetwoscreens}
-% Stuff for using two screens
+% Overlay stuff
\RequirePackage{beamerbaseoverlay}
-% Overlay stuff
+% Commands for constructing the title page
\RequirePackage{beamerbasetitle}
-% Commands for constructing the title page
+% Parts, sections, subsections, appendix
\RequirePackage{beamerbasesection}
-% Parts, sections, subsections, appendix
+% Commands for constructing frames
\RequirePackage{beamerbaseframe}
-% Commands for constructing frames
-
\RequirePackage{beamerbaseverbatim}
-% Commands for constructing frames
-
\RequirePackage{beamerbaseframesize}
-% Commands for constructing frames
+% Headlines, sidebars, columns
\RequirePackage{beamerbaseframecomponents}
-% Headlines, sidebars, columns
+% Color management
\RequirePackage{beamerbasecolor}
-% Color management
+% Commands for adding notes
\RequirePackage{beamerbasenotes}
-% Commands for adding notes
+% Table of contents formatting
\RequirePackage{beamerbasetoc}
-% Table of Contents Format
+% For default templates
\RequirePackage{beamerbasetemplates}
-% For default templates
+% Commands for local structure like alert, itemize, etc.
\RequirePackage{beamerbaselocalstructure}
-% Commands for local structure like alert, itemize, etc.
+% Navigation buttons
\RequirePackage{beamerbasenavigation}
-% Navigation buttons
+% Theorems
\RequirePackage{beamerbasetheorems}
-% Theorems
+% Commands for including and building themes
\RequirePackage{beamerbasethemes}
-% Commands for including and building themes
-
\mode
<all>
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -23,7 +24,6 @@
\mode
<presentation>
-
%
% Lecture Definitions
%
@@ -44,35 +44,34 @@
\newcounter{lecture}
\renewcommand\thelecture{\@arabic\c at lecture}
\let\insertlecturenumber=\thelecture
-\newcommand\lecture{\@dblarg\beamer at lecture}
-\long\def\beamer at lecture[#1]#2#3{
+\newrobustcmd*\lecture{\@dblarg\beamer at lecture}
+\long\def\beamer at lecture[#1]#2#3{%
\beamer at savemode
- \mode<all>
- \refstepcounter{lecture}
- \def\beamer at currentlecturelabel{#3}
+ \mode<all>%
+ \refstepcounter{lecture}%
+ \def\beamer at currentlecturelabel{#3}%
\@onelevel at sanitize\beamer at currentlecturelabel
- \def\beamer at lecturename{#2}
- \def\beamer at shortlecturename{#1}
+ \def\beamer at lecturename{#2}%
+ \def\beamer at shortlecturename{#1}%
\ifx\beamer at onlylecture\@empty
\else
\expandafter\beamer at if@in at clist@TF\expandafter\beamer at onlylecture
\expandafter{\beamer at currentlecturelabel}%
- {\beamer at inlecturetrue}
- {\beamer at inlecturefalse}
+ {\beamer at inlecturetrue}%
+ {\beamer at inlecturefalse}%
\fi
\beamer at atbeginlecture
\beamer at resumemode
}
-
\mode
<all>
{
- \long\def\AtBeginLecture#1{%
+ \newrobustcmd\AtBeginLecture[1]{%
\def\beamer at atbeginlecture{#1}}
\AtBeginLecture{}
- \newcommand\includeonlylecture[1]{%
+ \newrobustcmd*\includeonlylecture[1]{%
\def\beamer at onlylecture{#1}%
\@onelevel at sanitize\beamer at onlylecture
}
@@ -80,20 +79,19 @@
\includeonlylecture{}
}
-\newcommand\insertlecture{\beamer at lecturename}
-\newcommand\insertshortlecture[1][]{%
- {%
+\newrobustcmd*\insertlecture{\beamer at lecturename}
+\newrobustcmd*\insertshortlecture[1][]{%
+ \begingroup
\beamer at setupshort{#1}%
\beamer at insertshort{\beamer at shortlecturename}%
- }}
+ \endgroup}
\mode
<article>
{
- \newcommand\lecture[3][]{\def\insertlecture{#2}\def\insertshortlecture{#1}}
+ \newrobustcmd*\lecture[3][]{\def\insertlecture{#2}\def\insertshortlecture{#1}}
}
-
%
% Part Definitions
%
@@ -103,9 +101,9 @@
\newcommand<>{\part}{\alt#1{\@dblarg\beamer at part}{\beamer at gobbleoptional}}
\long\def\beamer at part[#1]#2{%
- \beamer at savemode%
+ \beamer at savemode
\mode<all>%
- \ifbeamer at inlecture%
+ \ifbeamer at inlecture
\refstepcounter{part}%
\def\beamer at partname{#2}%
\def\beamer at partnameshort{#1}%
@@ -119,44 +117,43 @@
\protect\beamer at sectionpages{\the\beamer at sectionstartpage}{\the\beamer at tempcount}}}%
\addtocontents{nav}{\protect\headcommand{%
\protect\beamer at subsectionpages{\the\beamer at subsectionstartpage}{\the\beamer at tempcount}}}%
- \beamer at partstartpage=\c at page%
- \beamer at sectionstartpage=\c at page%
- \beamer at subsectionstartpage=\c at page%
+ \beamer at partstartpage=\c at page
+ \beamer at sectionstartpage=\c at page
+ \beamer at subsectionstartpage=\c at page
\setcounter{subsection}{0}%
- \def\insertsection{}%
- \def\insertsubsection{}%
- \def\insertsubsubsection{}%
- \def\insertsectionhead{}%
- \def\insertsubsectionhead{}%
- \def\insertsubsubsectionhead{}%
+ \protected\def\insertsection{}%
+ \protected\def\insertsubsection{}%
+ \protected\def\insertsubsubsection{}%
+ \protected\def\insertsectionhead{}%
+ \protected\def\insertsubsectionhead{}%
+ \protected\def\insertsubsubsectionhead{}%
\def\lastsubsection{}%
- \def\insertpart{\expandafter\hyperlink\partlink}%
+ \protected\def\insertpart{\expandafter\hyperlink\partlink}%
\Hy at writebookmark{\the\c at section}{#1}{Outline\the\c at part}{1}{toc}%
- \hyper at anchorstart{Outline\the\c at part}\hyper at anchorend%
- \beamer at atbeginpart%
+ \hyper at anchorstart{Outline\the\c at part}\hyper at anchorend
+ \beamer at atbeginpart
\fi%
\beamer at resumemode}%
\def\insertpart{}
\def\partlinkshort{{Navigation1}{}}
-\def\insertromanpartnumber{\@Roman\c at part}
-\def\insertpartnumber{\@arabic\c at part}
+\newrobustcmd*\insertromanpartnumber{\@Roman\c at part}
+\newrobustcmd*\insertpartnumber{\@arabic\c at part}
-\newcommand\insertshortpart[1][]{%
- {%
+\newrobustcmd*\insertshortpart[1][]{%
+ \begingroup
\beamer at setupshort{#1}%
\beamer at insertshort{\expandafter\hyperlink\partlinkshort}%
- }}
+ \endgroup}
\mode
<all>
{
- \long\def\AtBeginPart#1{%
+ \newrobustcmd\AtBeginPart[1]{%
\def\beamer at atbeginpart{#1}}
\AtBeginPart{}
}
-
\mode
<article>
{
@@ -166,7 +163,6 @@
\fi
}
-
%
% Section Definitions
%
@@ -186,7 +182,7 @@
\mode<all>%
\ifbeamer at inlecture
\refstepcounter{section}%
- \beamer at ifempty{#2}%
+ \ifblank{#2}%
{\long\def\secname{#1}\long\def\lastsection{#1}}%
{\global\advance\beamer at tocsectionnumber by 1\relax%
\long\def\secname{#2}%
@@ -195,7 +191,7 @@
{\the\beamer at tocsectionnumber}}}%
{\let\\=\relax\xdef\sectionlink{{Navigation\the\c at page}{\noexpand\secname}}}%
\beamer at tempcount=\c at page\advance\beamer at tempcount by -1%
- \beamer at ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c at section}{#1}{\the\c at page}{\secname}{\the\c at part}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer at sectionpages{\the\beamer at sectionstartpage}{\the\beamer at tempcount}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer at subsectionpages{\the\beamer at subsectionstartpage}{\the\beamer at tempcount}}}%
@@ -213,7 +209,7 @@
\def\lastsubsection{}%
\Hy at writebookmark{\the\c at section}{\secname}{Outline\the\c at part.\the\c at section}{2}{toc}%
\hyper at anchorstart{Outline\the\c at part.\the\c at section}\hyper at anchorend%
- \beamer at ifempty{#2}{\beamer at atbeginsections}{\beamer at atbeginsection}%
+ \ifblank{#2}{\beamer at atbeginsections}{\beamer at atbeginsection}%
\fi%
\beamer at resumemode}%
\def\insertsection{}
@@ -230,7 +226,7 @@
\mode
<all>
{
- \def\AtBeginSection{\@ifnextchar[{\beamer at AtBeginSection}{\beamer@@AtBeginSection}}
+ \newrobustcmd*\AtBeginSection{\@ifnextchar[{\beamer at AtBeginSection}{\beamer@@AtBeginSection}}
\long\def\beamer@@AtBeginSection#1{\beamer at AtBeginSection[{#1}]{#1}}
\long\def\beamer at AtBeginSection[#1]#2{%
\def\beamer at atbeginsection{#2}%
@@ -260,7 +256,7 @@
\def\beamer@@subsection{\@ifnextchar*\beamer@@ssubsection\beamer@@@subsection}
\long\def\beamer@@ssubsection*#1{\beamer at subsection[{#1}]{}}
%\long\def\beamer@@ssubsection*#1{%
-% \beamer at ifempty{#1}{\beamer at untitledsubsection}{\beamer at subsection[{#1}]{}}}
+% \ifblank{#1}{\beamer at untitledsubsection}{\beamer at subsection[{#1}]{}}}
\def\beamer@@@subsection#1{\beamer at subsection[{#1}]{#1}}
\def\beamer at subsection[#1]#2{%
\beamer at savemode%
@@ -267,7 +263,7 @@
\mode<all>%
\ifbeamer at inlecture%
\refstepcounter{subsection}%
- \beamer at ifempty{#2}{\long\def\subsecname{#1}\long\def\lastsubsection{#1}}
+ \ifblank{#2}{\long\def\subsecname{#1}\long\def\lastsubsection{#1}}
{%
\long\def\subsecname{#2}%
\long\def\lastsubsection{#1}%
@@ -288,7 +284,7 @@
\def\insertsubsubsectionhead{}%
\Hy at writebookmark{\the\c at subsection}{#2}{Outline\the\c at part.\the\c at section.\the\c at subsection.\the\c at page}{3}{toc}%
\hyper at anchorstart{Outline\the\c at part.\the\c at section.\the\c at subsection.\the\c at page}\hyper at anchorend%
- \beamer at ifempty{#2}{\beamer at atbeginsubsections}{\beamer at atbeginsubsection}%
+ \ifblank{#2}{\beamer at atbeginsubsections}{\beamer at atbeginsubsection}%
\fi%
\beamer at resumemode}
\def\insertsubsection{}
@@ -304,7 +300,7 @@
\mode
<all>
{
- \def\AtBeginSubsection{\@ifnextchar[{\beamer at AtBeginSubsection}{\beamer@@AtBeginSubsection}}
+ \newrobustcmd*\AtBeginSubsection{\@ifnextchar[{\beamer at AtBeginSubsection}{\beamer@@AtBeginSubsection}}
\long\def\beamer@@AtBeginSubsection#1{\beamer at AtBeginSubsection[{#1}]{#1}}
\long\def\beamer at AtBeginSubsection[#1]#2{%
\def\beamer at atbeginsubsection{#2}%
@@ -337,7 +333,7 @@
\mode<all>%
\ifbeamer at inlecture%
\refstepcounter{subsubsection}%
- \beamer at ifempty{#2}{\long\def\subsubsecname{#1}\long\def\lastsubsubsection{#1}}
+ \ifblank{#2}{\long\def\subsubsecname{#1}\long\def\lastsubsubsection{#1}}
{%
\long\def\subsubsecname{#2}%
\long\def\lastsubsubsection{#1}%
@@ -351,7 +347,7 @@
\def\insertsubsubsectionhead{#1}%
\Hy at writebookmark{\the\c at subsubsection}{#2}{Outline\the\c at part.\the\c at section.\the\c at subsection.\the\c at subsubsection.\the\c at page}{4}{toc}%
\hyper at anchorstart{Outline\the\c at part.\the\c at section.\the\c at subsection.\the\c at subsubsection.\the\c at page}\hyper at anchorend%
- \beamer at ifempty{#2}{\beamer at atbeginsubsubsections}{\beamer at atbeginsubsubsection}%
+ \ifblank{#2}{\beamer at atbeginsubsubsections}{\beamer at atbeginsubsubsection}%
\fi%
\beamer at resumemode}
\def\insertsubsubsection{}
@@ -360,7 +356,7 @@
\mode
<all>
{
- \def\AtBeginSubsubsection{\@ifnextchar[{\beamer at AtBeginSubsubsection}{\beamer@@AtBeginSubsubsection}}
+ \newrobustcmd*\AtBeginSubsubsection{\@ifnextchar[{\beamer at AtBeginSubsubsection}{\beamer@@AtBeginSubsubsection}}
\long\def\beamer@@AtBeginSubsubsection#1{\beamer at AtBeginSubsubsection[{#1}]{#1}}
\long\def\beamer at AtBeginSubsubsection[#1]#2{%
\def\beamer at atbeginsubsubsection{#2}%
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -43,7 +44,7 @@
\newtoks\beamer at sbttoks
\newcommand<>\defbeamertemplate{
- \beamer at ifempty{#1}
+ \ifblank{#1}
{\def\beamer@@oar{<presentation>}}
{\def\beamer@@oar{#1}}\beamer at defbeamertemplate}
\def\beamer at defbeamertemplate{\@ifstar{\beamer at sbttrue\beamer at sbtoo}{\beamer at sbtfalse\beamer at sbtoo}}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -15,25 +16,25 @@
<presentation>
{
\def\beamer at calltheme#1#2#3{%
- \def\beamer at themelist{#2}
+ \def\beamer at themelist{#2}%
\@for\beamer at themename:=\beamer at themelist\do
{\usepackage[{#1}]{#3\beamer at themename}}}
- \newcommand\usetheme[2][]{\beamer at calltheme{#1}{#2}{beamertheme}}
- \newcommand\usecolortheme[2][]{\beamer at calltheme{#1}{#2}{beamercolortheme}}
- \newcommand\usefonttheme[2][]{\beamer at calltheme{#1}{#2}{beamerfonttheme}}
- \newcommand\useoutertheme[2][]{\beamer at calltheme{#1}{#2}{beameroutertheme}}
- \newcommand\useinnertheme[2][]{\beamer at calltheme{#1}{#2}{beamerinnertheme}}
+ \newrobustcmd*\usetheme[2][]{\beamer at calltheme{#1}{#2}{beamertheme}}
+ \newrobustcmd*\usecolortheme[2][]{\beamer at calltheme{#1}{#2}{beamercolortheme}}
+ \newrobustcmd*\usefonttheme[2][]{\beamer at calltheme{#1}{#2}{beamerfonttheme}}
+ \newrobustcmd*\useoutertheme[2][]{\beamer at calltheme{#1}{#2}{beameroutertheme}}
+ \newrobustcmd*\useinnertheme[2][]{\beamer at calltheme{#1}{#2}{beamerinnertheme}}
}
\mode
<article>
{
- \newcommand\usetheme[2][]{}
- \newcommand\usecolortheme[2][]{}
- \newcommand\usefonttheme[2][]{}
- \newcommand\useoutertheme[2][]{}
- \newcommand\useinnertheme[2][]{}
+ \newrobustcmd*\usetheme[2][]{}
+ \newrobustcmd*\usecolortheme[2][]{}
+ \newrobustcmd*\usefonttheme[2][]{}
+ \newrobustcmd*\useoutertheme[2][]{}
+ \newrobustcmd*\useinnertheme[2][]{}
}
\mode
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -55,7 +56,7 @@
}
\newcommand<>\beamer at begintheorem[1][]{%
- \beamer at ifempty{#1}
+ \ifblank{#1}
{\def\inserttheoremaddition{}}
{\def\inserttheoremaddition{#1}}
\usebeamertemplate{theorem begin}#2}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,7 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2010,2015 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2016 Joseph Wright
+% Copyright 2016 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -174,7 +174,7 @@
% Aux commands for \author
-\def\beamer at insttitle#1{{\donotcoloroutermaths$^{#1}$}}
+\def\beamer at insttitle#1{\textsuperscript{#1}}
\def\beamer at andtitle{\quad}
\def\beamer at instother#1{}
\def\beamer at andother{\unskip, }
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -32,21 +33,21 @@
\define at key{beamertoc}{subsectionstyle}{\beamer at toc@subsectionstyle{#1}}
\define at key{beamertoc}{subsubsectionstyle}{\beamer at toc@subsubsectionstyle{#1}}
\def\beamer at toc@process#1#2#3/#4/{%
- \beamer at ifempty{#4}{\def#1{#3}\def#2{#3}}{\def#1{#3}\def#2{#4}\@gobble}}
+ \ifblank{#4}{\def#1{#3}\def#2{#3}}{\def#1{#3}\def#2{#4}\@gobble}}
\def\beamer at toc@sprocess#1#2#3#4/#5/#6/{%
- \beamer at ifempty{#5}%
+ \ifblank{#5}%
{\def#1{#4}\def#2{#4}\def#3{#4}}
- {\beamer at ifempty{#6}
+ {\ifblank{#6}
{\def#1{#4}\def#2{#5}\def#3{#5}\@gobble}
{\def#1{#4}\def#2{#5}\def#3{#6}\@gobbletwo}}}
\def\beamer at toc@ssprocess#1#2#3#4#5/#6/#7/#8/{%
- \beamer at ifempty{#6}%
+ \ifblank{#6}%
{\def#1{#5}\def#2{#5}\def#3{#5}\def#4{#5}}
- {\beamer at ifempty{#7}
+ {\ifblank{#7}
{\def#1{#5}\def#2{#6}\def#3{#6}\def#4{#6}\@gobble}
- {\beamer at ifempty{#8}
+ {\ifblank{#8}
{\def#1{#5}\def#2{#6}\def#3{#7}\def#4{#7}\@gobbletwo}
{\def#1{#5}\def#2{#6}\def#3{#7}\def#4{#8}\expandafter\@gobble\@gobbletwo}}}% no gobblethree?
}
@@ -99,6 +100,7 @@
\def\beamer at tocifnothide#1{\csname beamer at tocinvcheck@#1\endcsname}
\let\beamer at tocinvcheck@hide\@gobble
+\let\beamer at tocinvcheck@show\@firstofone
\def\beamer at hidetext{hide}
@@ -202,6 +204,9 @@
\mode
<article>
{
+ \long\def\beamer at sectionintoc#1#2#3#4#5{}
+ \long\def\beamer at subsectionintoc#1#2#3#4#5#6{}
+ \long\def\beamer at subsubsectionintoc#1#2#3#4#5#6#7{}
\AtBeginDocument{
\let\beamer at origtableofcontents=\tableofcontents
\renewcommand{\tableofcontents}[1][]{\beamer at origtableofcontents}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -18,43 +19,41 @@
\newif\ifbeamer at dosecondmode
\defbeameroption{previous slide on second screen}[right]%
-{
- \pgfpagesuselayout{two screens with lagging second}[second #1]
+{%
+ \pgfpagesuselayout{two screens with lagging second}[second #1]%
\beamer at twoscreenstexttrue
\nofiles
}
\defbeameroption{second mode text on second screen}[right]%
-{
- \pgfpagesuselayout{two screens with optional second}[second #1]
+{%
+ \pgfpagesuselayout{two screens with optional second}[second #1]%
\beamer at twoscreenstexttrue
}
\defbeameroption{always typeset second mode}[true]%
-{
- \def\beamer at defaultdosecondmode{#1}
+{%
+ \def\beamer at defaultdosecondmode{#1}%
}
\def\beamer at defaultdosecondmode{false}
-
\long\def\beamer at dosecondscreennow#1{% called from \beamer at doseveralframes
\ifbeamer at dosecondmode%
{%
- \clearpage%
- \def\beamer at currentmode{second}
- \def\beamer at doifnotinframe{}%
+ \clearpage
+ \def\beamer at currentmode{second}%
+ \gdef\beamer at doifnotinframe{}%
\def\beamer at doifinframe{\begin{beamer at frameslide}%
#1%
\end{beamer at frameslide}%
\pgfpagescurrentpagewillbelogicalpage{2}%
- \clearpage%
+ \clearpage
}%
- {\beamer at masterdecode{\beamer at whichframes}}%
- \beamer at donow%
+ \beamer at masterdecode{\beamer at whichframes}%
+ \beamer at donow
}%
- \fi%
+ \fi
}
-
\mode
<all>
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -17,14 +18,14 @@
\def\beamer at verbatimreadframe{%
\begingroup
- \let\do\beamer at makeinnocent\dospecials
+ \let\do\@makeother\dospecials
\count@=127 %
\@whilenum\count@<255 \do{%
\advance\count@ by 1 %
\catcode\count@=11 %
}%
- \beamer at makeinnocent\^^L% and whatever other special cases
- \beamer at makeinnocent\^^I % Allow tab chars
+ \@makeother\^^L% and whatever other special cases
+ \@makeother\^^I % Allow tab chars
\endlinechar`\^^M \catcode`\^^M=12%
\@ifnextchar\bgroup{\afterassignment\beamer at specialprocessframefirstline\let\beamer at temp=}{\beamer at processframefirstline}}%
Modified: trunk/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011,2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -12,7 +13,7 @@
\let\beamerprosper at entry=\@gobble
\DeclareOption{framesassubsections}{\mode<presentation>
- {\def\beamerprosper at entry#1{\beamer at ifempty{#1}{}{\subsection{#1}}}}}
+ {\def\beamerprosper at entry#1{\ifblank{#1}{}{\subsection{#1}}}}}
\ProcessOptions
Modified: trunk/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -143,6 +143,8 @@
\setbeamercolor{description item}{parent=item}
+\setbeamercolor{description body}{}
+
\setbeamercolor{bibliography item}{parent=item}
\setbeamercolor{bibliography entry author}{use=structure,fg=structure.fg}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -102,9 +102,10 @@
\setbeamerfont{itemize/enumerate subbody}{size=\small}
\setbeamerfont{itemize/enumerate subsubbody}{size=\footnotesize}
-
\setbeamerfont{description item}{parent=item}
+\setbeamerfont{description body}{}
+
\setbeamerfont{projected text}{parent={tiny structure}}
\setbeamerfont{abstract}{size=\small}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2007 by Till Tantau
% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -176,7 +177,7 @@
% Enumerate items, default
-\defbeamertemplateparent{enumerate items}{enumerate item,enumerate subitem,enumerate subsubitem,enumerate mini}
+\defbeamertemplateparent{enumerate items}{enumerate item,enumerate subitem,enumerate subsubitem,enumerate mini template}
{}
\defbeamertemplate*{enumerate item}{default}{\insertenumlabel.}
@@ -185,12 +186,11 @@
\defbeamertemplate*{enumerate mini template}{default}{\insertenumlabel}
-% Description item width
+% Description item, default
\defbeamertemplate*{description item}{default}{\insertdescriptionitem}
-
% Itemize/Enumerate body
\defbeamertemplate*{itemize/enumerate body begin}{default}{}
@@ -202,8 +202,12 @@
\defbeamertemplate*{itemize/enumerate subsubbody begin}{default}{}
\defbeamertemplate*{itemize/enumerate subsubbody end}{default}{}
+% Description body
+\defbeamertemplate*{description body begin}{default}{}
+\defbeamertemplate*{description body end}{default}{}
+
% Alerted text
\defbeamertemplate*{alerted text begin}{default}{\setbeamercolor{local structure}{parent=alerted text}}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,5 +1,6 @@
% Copyright 2007 by Till Tantau
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -22,7 +23,7 @@
\leavevmode%
\hbox{%
\begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{author in head/foot}%
- \usebeamerfont{author in head/foot}\insertshortauthor\expandafter\beamer at ifempty\expandafter{\beamer at shortinstitute}{}{~~(\insertshortinstitute)}
+ \usebeamerfont{author in head/foot}\insertshortauthor\expandafter\ifblank\expandafter{\beamer at shortinstitute}{}{~~(\insertshortinstitute)}
\end{beamercolorbox}%
\begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
\usebeamerfont{title in head/foot}\insertshorttitle
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,84 @@
+\ProvidesDictionary{translator-basic-dictionary}{Swedish}
+
+\providetranslation{Abstract}{Sammanfattning}
+\providetranslation{Addresses}{Adresser}
+\providetranslation{addresses}{adresser}
+\providetranslation{Address}{Adress}
+\providetranslation{address}{adress}
+\providetranslation{and}{och}
+\providetranslation{Appendix}{Bilaga}
+\providetranslation{Authors}{F\"orfattare}
+\providetranslation{authors}{f\"orfattare}
+\providetranslation{Author}{F\"orfattare}
+\providetranslation{author}{f\"orfattare}
+\providetranslation{Bibliography}{Bibliografi}
+\providetranslation{cc}{Kopia}
+\providetranslation{Chapters}{Kapitel}
+\providetranslation{chapters}{kapitel}
+\providetranslation{Chapter}{Kapitel}
+\providetranslation{chapter}{kapitel}
+\providetranslation{Conclusion}{Sammanfattning}
+\providetranslation{conclusion}{sammanfattning}
+\providetranslation{Contents}{Inneh{\aa}ll}
+\providetranslation{encl (plural)}{Bilagor}
+\providetranslation{encl (singular)}{Bilaga}
+\providetranslation{encl}{Bilaga}
+\providetranslation{Figures}{Figurer}
+\providetranslation{figures}{figurer}
+\providetranslation{Figure}{Figur}
+\providetranslation{figure}{figur}
+\providetranslation{From}{Fr{\aa}n}
+\providetranslation{from}{fr{\aa}n}
+\providetranslation{Glossary}{Ordlista}
+\providetranslation{Index}{F\"orteckning}
+\providetranslation{Introduction}{Inledning}
+\providetranslation{introduction}{inledning}
+\providetranslation{List of Figures and Tables}{Figurer och tabeller}
+\providetranslation{List of Figures}{Figurer}
+\providetranslation{List of Tables}{Tabeller}
+\providetranslation{or}{eller}
+\providetranslation{Outline}{Disposition}
+\providetranslation{Overview}{\"Oversikt}
+\providetranslation{Pages}{Sidor}
+\providetranslation{pages}{sidor}
+\providetranslation{Page}{Sida}
+\providetranslation{page}{sida}
+\providetranslation{Paragraphs}{Avsnitt}
+\providetranslation{paragraphs}{avsnitt}
+\providetranslation{Paragraph}{Avsnitt}
+\providetranslation{paragraph}{avsnitt}
+\providetranslation{Parts}{Delar}
+\providetranslation{parts}{delar}
+\providetranslation{Part}{Del}
+\providetranslation{part}{del}
+\providetranslation{Preface}{F\"orord}
+\providetranslation{Proofs}{Bevis}
+\providetranslation{proofs}{bevis}
+\providetranslation{Proof}{Bevis}
+\providetranslation{proof}{bevis}
+\providetranslation{References}{Referanser}
+\providetranslation{Related work}{Relaterat arbete}
+\providetranslation{Related Work}{Relaterat arbete}
+\providetranslation{Sections}{Avsnitt}
+\providetranslation{sections}{avsnitt}
+\providetranslation{Section}{Avsnitt}
+\providetranslation{section}{avsnitt}
+\providetranslation{See also}{Se ocks{\aa}}
+\providetranslation{see also}{se ocks{\aa}}
+\providetranslation{See}{Se}
+\providetranslation{see}{se}
+\providetranslation{Sketch of Proofs}{Bevisskisser}
+\providetranslation{Sketch of proofs}{Bevisskisser}
+\providetranslation{Sketch of Proof}{Bevisskiss}
+\providetranslation{Sketch of proof}{Bevisskiss}
+\providetranslation{Subsections}{Delavsnitt}
+\providetranslation{subsections}{delavsnitt}
+\providetranslation{Subsection}{Delavsnitt}
+\providetranslation{subsection}{delavsnitt}
+\providetranslation{Summary}{Sammanfattning}
+\providetranslation{Tables}{Tabeller}
+\providetranslation{tables}{tabeller}
+\providetranslation{Table}{Tabell}
+\providetranslation{table}{tabell}
+\providetranslation{To}{Till}
+\providetranslation{to}{till}
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,21 @@
+\ProvidesDictionary{translator-bibliography-dictionary}{Swedish}
+
+\providetranslation{ed.}{utg.}
+\providetranslation{Editions}{Utg{\aa}vor}
+\providetranslation{editions}{utg{\aa}vor}
+\providetranslation{Edition}{Utg{\aa}va}
+\providetranslation{edition}{utg{\aa}va}
+\providetranslation{Editors}{Utgivare}
+\providetranslation{editors}{utgivare}
+\providetranslation{Editor}{Utgivare}
+\providetranslation{editor}{utgivare}
+\providetranslation{eds.}{utg.}
+\providetranslation{Extended edition}{Ut\"okad utg{\aa}va}
+\providetranslation{extended edition}{Ut\"okad utg{\aa}va}
+\providetranslation{in (bibliography)}{i}
+\providetranslation{In (bibliography)}{I}
+\providetranslation{Tech. Rep.}{Tek.\ Repr.}
+\providetranslation{Technical Reports}{Tekniska Rapporter}
+\providetranslation{technical reports}{tekniska rapporter}
+\providetranslation{Technical Report}{Teknisk Rapport}
+\providetranslation{technical report}{teknisk rapport}
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,10 @@
+\ProvidesDictionary{translator-environment-dictionary}{Swedish}
+
+\providetranslation{advantage}{f\"ordel}
+\providetranslation{Advantage}{F\"ordel}
+\providetranslation{advantages}{f\"ordelar}
+\providetranslation{Advantages}{F\"ordelar}
+\providetranslation{disadvantage}{nackdel}
+\providetranslation{Disadvantage}{Nackdel}
+\providetranslation{disadvantages}{nackdelar}
+\providetranslation{Disadvantages}{Nackdelar}
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,43 @@
+\ProvidesDictionary{translator-months-dictionary}{Swedish}
+
+\providetranslation{January}{Januari}
+\providetranslation{February}{Februari}
+\providetranslation{March}{Mars}
+\providetranslation{April}{April}
+\providetranslation{May}{Maj}
+\providetranslation{June}{Juni}
+\providetranslation{July}{Juli}
+\providetranslation{August}{Augusti}
+\providetranslation{September}{September}
+\providetranslation{October}{Oktober}
+\providetranslation{November}{November}
+\providetranslation{December}{December}
+
+\providetranslation{Jan}{Jan}
+\providetranslation{Feb}{Feb}
+\providetranslation{Mar}{Mar}
+\providetranslation{Apr}{Apr}
+\providetranslation{May}{Maj}
+\providetranslation{Jun}{Jun}
+\providetranslation{Jul}{Jul}
+\providetranslation{Aug}{Aug}
+\providetranslation{Sep}{Sep}
+\providetranslation{Oct}{Okt}
+\providetranslation{Nov}{Nov}
+\providetranslation{Dec}{Dec}
+
+\providetranslation{Monday}{M{\aa}ndag}
+\providetranslation{Tuesday}{Tisdag}
+\providetranslation{Wednesday}{Onsdag}
+\providetranslation{Thursday}{Torsdag}
+\providetranslation{Friday}{Fredag}
+\providetranslation{Saturday}{L\"ordag}
+\providetranslation{Sunday}{S\"ondag}
+
+\providetranslation{Mon}{M{\aa}n}
+\providetranslation{Tue}{Tis}
+\providetranslation{Wed}{Ons}
+\providetranslation{Thu}{Tor}
+\providetranslation{Fri}{Fre}
+\providetranslation{Sat}{L\"or}
+\providetranslation{Sun}{S\"on}
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,53 @@
+\ProvidesDictionary{translator-numbers-dictionary}{Swedish}
+
+\providetranslation{one}{ett}
+\providetranslation{two}{tv{\aa}}
+\providetranslation{three}{tre}
+\providetranslation{four}{fyra}
+\providetranslation{five}{fem}
+\providetranslation{six}{sex}
+\providetranslation{seven}{sju}
+\providetranslation{eight}{{\aa}tta}
+\providetranslation{nine}{nio}
+\providetranslation{ten}{tio}
+\providetranslation{eleven}{elva}
+\providetranslation{twelve}{tolv}
+
+\providetranslation{One}{En}
+\providetranslation{Two}{Tv{\aa}}
+\providetranslation{Three}{Tre}
+\providetranslation{Four}{Fyra}
+\providetranslation{Five}{Fem}
+\providetranslation{Six}{Sex}
+\providetranslation{Seven}{Sju}
+\providetranslation{Eight}{{\AA}tta}
+\providetranslation{Nine}{Nio}
+\providetranslation{Ten}{Tio}
+\providetranslation{Eleven}{Elva}
+\providetranslation{Twelve}{Tolv}
+
+\providetranslation{first}{f{\"o}rsta}
+\providetranslation{second}{andra}
+\providetranslation{third}{tredje}
+\providetranslation{fourth}{fj\"arde}
+\providetranslation{fifth}{femte}
+\providetranslation{sixth}{sj\"atte}
+\providetranslation{seventh}{sjunde}
+\providetranslation{eighth}{{\aa}ttonde}
+\providetranslation{ninth}{nionde}
+\providetranslation{tenth}{tionde}
+\providetranslation{eleventh}{elfte}
+\providetranslation{twelfth}{tolfte}
+
+\providetranslation{1st}{1a}
+\providetranslation{2nd}{2a}
+\providetranslation{3rd}{3e}
+\providetranslation{4th}{4e}
+\providetranslation{5th}{5e}
+\providetranslation{6th}{6e}
+\providetranslation{7th}{7e}
+\providetranslation{8th}{8e}
+\providetranslation{9th}{9e}
+\providetranslation{10th}{10e}
+\providetranslation{11th}{11e}
+\providetranslation{12th}{12e}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict 2017-07-14 22:14:58 UTC (rev 44797)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -1,4 +1,4 @@
-\ProvidesDictionary{translator-theorem-dictionary}{English}
+\ProvidesDictionary{translator-theorem-dictionary}{Norsk}
\providetranslation{Comments}{Kommentarer}
\providetranslation{comments}{kommentarer}
@@ -11,7 +11,7 @@
\providetranslation{Definitions}{Definisjoner}
\providetranslation{definitions}{definisjoner}
\providetranslation{Definition}{Definisjon}
-\providetranslation{definition}{definision}
+\providetranslation{definition}{definisjon}
\providetranslation{Examples}{Eksempler}
\providetranslation{examples}{eksempler}
\providetranslation{Example}{Eksempel}
Added: trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict 2017-07-14 22:16:30 UTC (rev 44798)
@@ -0,0 +1,82 @@
+\ProvidesDictionary{translator-theorem-dictionary}{Swedish}
+
+\providetranslation{Comments}{Kommentarer}
+\providetranslation{comments}{kommentarer}
+\providetranslation{Comment}{Kommentar}
+\providetranslation{comment}{kommentar}
+\providetranslation{Corollaries}{Korollarium}
+\providetranslation{corollaries}{korollarium}
+\providetranslation{Corollary}{Korollarium}
+\providetranslation{corollary}{korollarium}
+\providetranslation{Definitions}{Definitioner}
+\providetranslation{definitions}{definitioner}
+\providetranslation{Definition}{Definition}
+\providetranslation{definition}{definition}
+\providetranslation{Examples}{Exempel}
+\providetranslation{examples}{exempel}
+\providetranslation{Example}{Exempel}
+\providetranslation{example}{exempel}
+\providetranslation{Exercises}{Uppgifter}
+\providetranslation{exercises}{uppgifter}
+\providetranslation{Exercise}{Uppgift}
+\providetranslation{exercise}{uppgift}
+\providetranslation{Facts}{Fakta}
+\providetranslation{facts}{fakta}
+\providetranslation{Fact}{Faktum}
+\providetranslation{fact}{faktum}
+\providetranslation{Key Lemmas}{Nyckellemman}
+\providetranslation{key lemmas}{nyckellemman}
+\providetranslation{Key Lemma}{Nyckellemma}
+\providetranslation{key lemma}{Nyckellemma}
+\providetranslation{Key Observations}{Nyckelobservationer}
+\providetranslation{key observations}{nyckelobservationer}
+\providetranslation{Key Observation}{Nyckelobservation}
+\providetranslation{key observation}{nyckelobservation}
+\providetranslation{Lemmas}{Lemman}
+\providetranslation{lemmas}{lemman}
+\providetranslation{Lemma}{Lemma}
+\providetranslation{lemma}{lemma}
+\providetranslation{Main Theorems}{Huvudteorem}
+\providetranslation{main theorems}{huvudteorem}
+\providetranslation{Main Theorem}{Huvudteorem}
+\providetranslation{main theorem}{huvudteorem}
+\providetranslation{Observations}{Observationer}
+\providetranslation{observations}{observationer}
+\providetranslation{Observation}{Observation}
+\providetranslation{observation}{observation}
+\providetranslation{Problems}{Problem}
+\providetranslation{problems}{problem}
+\providetranslation{Problem}{Problem}
+\providetranslation{problem}{problem}
+\providetranslation{Proofs}{Bevis}
+\providetranslation{proofs}{bevis}
+\providetranslation{Proof}{Bevis}
+\providetranslation{proof}{Bevis}
+\providetranslation{Proof Sketch}{Bevisskiss}
+\providetranslation{Proof sketch}{Bevisskiss}
+\providetranslation{proof sketch}{bevisskiss}
+\providetranslation{Proof Sketches}{Bevisskisser}
+\providetranslation{Proof sketches}{Bevisskisser}
+\providetranslation{proof sketches}{bevisskisser}
+\providetranslation{Sketch of Proof}{Bevisskiss}
+\providetranslation{Sketch of Proofs}{Bevisskisser}
+\providetranslation{Sketch of proof}{Bevisskiss}
+\providetranslation{Sketch of proofs}{Bevisskisser}
+\providetranslation{sketch of proof}{bevisskiss}
+\providetranslation{sketch of proofs}{bevisskisser}
+\providetranslation{Propositions}{Propositioner}
+\providetranslation{propositions}{propositioner}
+\providetranslation{Proposition}{Proposition}
+\providetranslation{proposition}{proposition}
+\providetranslation{Remarks}{Anm\"arkningar}
+\providetranslation{remarks}{anm\"arkningar}
+\providetranslation{Remark}{Anm\"arkning}
+\providetranslation{remark}{anm\"arkning}
+\providetranslation{Solutions}{L\"osningar}
+\providetranslation{solutions}{l\"osningar}
+\providetranslation{Solution}{L\"osning}
+\providetranslation{solution}{l\"osning}
+\providetranslation{Theorems}{Teorem}
+\providetranslation{theorems}{teorem}
+\providetranslation{Theorem}{Teorem}
+\providetranslation{theorem}{teorem}
More information about the tex-live-commits
mailing list