summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-14 22:16:30 +0000
committerKarl Berry <karl@freefriends.org>2017-07-14 22:16:30 +0000
commit46e95f178cfedc9839460ee35880698050f7644a (patch)
tree730f540a21d7047a243e929c74e4158674675814
parent44af1a53bf28c922f525bd635c417b22f3b99b39 (diff)
beamer (14jul17)
git-svn-id: svn://tug.org/texlive/trunk@44798 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/Makefile2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex10
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex3
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdfbin18030 -> 18041 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdfbin18300 -> 18312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdfbin17996 -> 18006 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdfbin17878 -> 17891 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdfbin18248 -> 18259 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdfbin17497 -> 17511 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdfbin17933 -> 17945 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdfbin24944 -> 24956 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdfbin17802 -> 17814 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdfbin17831 -> 17842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf (renamed from Master/texmf-dist/doc/latex/beamer/doc/beamerugthemedefault.pdf)bin17576 -> 18034 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdfbin17969 -> 17979 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdfbin17948 -> 17960 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdfbin25048 -> 25060 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdfbin17949 -> 17961 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdfbin17866 -> 17878 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdfbin18170 -> 18182 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdfbin17852 -> 17866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdfbin18000 -> 18012 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdfbin18081 -> 18092 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdfbin17369 -> 17381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdfbin27764 -> 27777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdfbin32798 -> 32809 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdfbin28007 -> 28020 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdfbin34906 -> 34916 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdfbin18247 -> 18257 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdfbin17581 -> 17593 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdfbin17991 -> 18002 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdfbin17966 -> 17978 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdfbin20309 -> 20320 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdfbin17414 -> 17426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdfbin18423 -> 18435 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdfbin18041 -> 18053 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdfbin18627 -> 18639 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdfbin18005 -> 18019 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdfbin18859 -> 18871 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdfbin18687 -> 18700 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdfbin17963 -> 17975 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdfbin17977 -> 17988 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdfbin21558 -> 21572 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdfbin18201 -> 18213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdfbin18057 -> 18068 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdfbin18322 -> 18334 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdfbin18488 -> 18499 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdfbin21790 -> 21803 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdfbin22023 -> 22034 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdfbin20488 -> 20500 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdfbin22533 -> 22545 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdfbin18198 -> 18210 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdfbin21117 -> 21131 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdfbin22475 -> 22487 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdfbin18199 -> 18210 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdfbin18335 -> 18347 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdfbin20797 -> 20809 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdfbin22363 -> 22375 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdfbin18192 -> 18204 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdfbin22133 -> 22146 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdfbin17886 -> 17898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdfbin18283 -> 18296 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdfbin17870 -> 17881 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdfbin21851 -> 21864 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdfbin18003 -> 18015 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdfbin17924 -> 17936 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdfbin18237 -> 18248 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdfbin18148 -> 18159 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdfbin22258 -> 22271 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdfbin17576 -> 17588 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdfbin1638077 -> 1620644 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex6
-rw-r--r--Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdfbin146720 -> 146735 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdfbin324214 -> 324225 bytes
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls141
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerarticle.sty13
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty10
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty72
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty344
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty268
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty35
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty23
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty31
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty70
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty269
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty35
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty462
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty44
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty100
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty23
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty4
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty17
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty29
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty7
-rw-r--r--Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty10
-rw-r--r--Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict84
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict21
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict10
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict43
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict53
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict4
-rw-r--r--Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict82
114 files changed, 1311 insertions, 1043 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/Makefile b/Master/texmf-dist/doc/latex/beamer/doc/Makefile
index c043dec3276..dd5cd19aa3f 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/Makefile
+++ b/Master/texmf-dist/doc/latex/beamer/doc/Makefile
@@ -14,7 +14,7 @@ fontthemes = default serif structurebold structureitalicserif structuresmallcaps
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
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
index 82d04512eb1..eb220aed194 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
@@ -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
%
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
index 788fab7d9e8..2fa4f097021 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
@@ -128,7 +128,7 @@ In the following examples the color theme |seahorse| is used. Since the default
\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).
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
index 22685e32052..6637683fea8 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
@@ -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
%
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
index a09122f95be..74fbdcba76e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
@@ -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 @@ There exist corresponding templates like |itemize/enumerate subbody begin| for s
\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:
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
index 8e3eb48d752..5c6a15cac2f 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
@@ -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
%
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
index 0f5fce01305..714cfd661d9 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
@@ -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 @@ In certain cases you may wish to have different overlay specifications to apply
\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}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf
index 062453615bd..8cf0928615a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatross.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf
index 76545028e78..9f47dc93f5e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemealbatrossstylish.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf
index c3826640dc2..bcab0659c78 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeaver.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf
index d9add142e00..94fd5b91d2a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemebeetle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf
index baf3ed046f4..58982604abf 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemecrane.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf
index 786237206cf..724068bb201 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedefault.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf
index 40f71d26986..d9eb2050326 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedolphin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf
index 3ff58011ef2..0418d9172e1 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemedove.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf
index 3b6b7765ef8..fba077876aa 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemefly.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf
index 1cf6c0848bf..5ccdcff7eca 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemelily.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemedefault.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
index 6ebd308e696..46583b3395a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemedefault.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthememonarca.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf
index 905bbc5cb6d..f8f7b073747 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeorchid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf
index e483f129410..cbbd2da2bef 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemerose.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf
index 80d25b1c1b3..99fea558a06 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseagull.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf
index 42ca2058904..6b087a592fa 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemeseahorse.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf
index 66e203285ba..afda565e3b5 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemesidebartab.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf
index 69e52375dc8..02ff4605615 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemespruce.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf
index 7f5a185820c..a7d7c8089ce 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemestructure.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf
index b0a97eec072..533bf973288 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewhale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf
index fc165c5f143..70542ca9d39 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugcolorthemewolverine.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf
index 91f61e9bd70..1a8f9f36b8e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemedefault.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf
index c7cc34186ab..de1662025b2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemeserif.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf
index 02486d3b9f3..a147bd0c371 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructurebold.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf
index 18ca84eb951..c3c497a80e5 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructureitalicserif.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf
index eef4d21892c..fc1a547ec80 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugfontthemestructuresmallcapsserif.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf
index 6c462460ff7..1a63228391d 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemecircles.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf
index 659901487e0..1851ade2e44 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemedefault.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf
index 07b916360f2..3a471fda41d 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemeinmargin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf
index 6435a527e09..2ca327a48e9 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerectangles.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf
index 01646c22910..63cb0f4fb00 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruginnerthemerounded.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf
index 3b3c2794c95..9626c968d54 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemedefault.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf
index b463e68fabf..1584fee1235 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeinfolines.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf
index 8216c1843e1..2a53b453476 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthememiniframes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf
index 6289d1cdf62..0c4282e557b 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemeshadow.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf
index 77f1bdd66dc..9a3420f437e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesidebar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf
index 56ae64a11db..e79f296cc1e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothbars.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf
index e3aaad86888..dee474e2b94 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesmoothtree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf
index 433f1e7dae0..20d2eb6c306 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemesplit.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf
index 3c1fa15f9d6..4c57b90214a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugouterthemetree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf
index 992d2f511cf..e79109fc7a3 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAnnArbor.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf
index c135878d958..903f5f6eb39 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeAntibes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf
index 23f632bf79e..ff87b3cf443 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBergen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf
index cc52d9a6c12..8d75a181033 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerkeley.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf
index 1006fde9f75..8f50567a177 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBerlin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf
index a5d38fa5ed7..a13db5c771f 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeBoadilla.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf
index a92b5041ee0..169cc39439b 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCambridgeUS.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf
index 7af410f0253..4b313d81da0 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeCopenhagen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf
index 1e88e57988f..b1e5cf73489 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDarmstadt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf
index 4b8c378b27c..3152465ee1d 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeDresden.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf
index e1ea503a5e5..66fdd4bbcca 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeEastLansing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf
index f639200cff9..831b949487e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeFrankfurt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf
index 64e8a99f7c8..a523d8e3c3c 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeGoettingen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf
index c92d744c2d0..c662acfd2c3 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeHannover.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf
index f95efa447d9..a6f64a9b4f2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeIlmenau.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf
index 12ee04750fe..dce78e6c7e2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeJuanLesPins.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf
index e44130c7fb9..0c71d41155a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeLuebeck.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf
index 4d111a34687..6ef5d146be7 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMadrid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf
index bcdad269ecc..5365fe4b40e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMalmoe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf
index 205981761eb..5cc570490c6 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMarburg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf
index 9cc9a0ca570..451478f3571 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeMontpellier.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf
index fabb81259d8..f170d59df3a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePaloAlto.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf
index db5dc9c55dd..31b6455568e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemePittsburgh.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf
index 20420db5113..7304bd5f909 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeRochester.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf
index 4a0c133d071..7949ebb2079 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSingapore.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf
index bb9f33f1758..a0768b3d0a8 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeSzeged.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf
index 6e4cd590be7..23923ae7c57 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeWarsaw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf
index 3b05509980b..7bd19fce3d2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerugthemeboxes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
index 9b20aba30c1..2342896e7c9 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
index 680eef9bc25..49e559bae54 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
@@ -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 @@ User Guide for version \beamerugversion.}
Copyright 2003--2007 by Till Tantau
Copyright 2010,2011 by Joseph Wright and Vedran Mileti\'c
-
+
Copyright 2016,2017 by Joseph Wright
\medskip
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf
index 8a3b1a92ded..5cb456343be 100644
--- a/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf b/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf
index e828f332e56..1c34acf5641 100644
--- a/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/examples/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index 4621408264e..e9b4e209fe5 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamer.cls
+++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls
@@ -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}
-
-\RequirePackage{beamerbasemodes}
% Setup modes and check for article option
+% Also loads packages required by both beamer and beamerarticle
+\RequirePackage{beamerbasemodes}
-\beamer@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@sectionadjust
\newcount\beamer@tocsectionnumber
-
\newif\ifbeamer@sansmath
\newif\ifbeamer@altmode
\newif\ifbeamer@notes
@@ -91,10 +86,8 @@
\newif\ifbeamer@ignorenonframe
\newif\ifbeamer@autopdfinfo
+% Option management
\RequirePackage{beamerbaseoptions}
-% For option management
-
-
%
%
@@ -122,7 +115,6 @@
\DeclareOptionBeamer{t}{\beamer@centeredfalse}
\DeclareOptionBeamer{c}{\beamer@centeredtrue}
-
\DeclareOptionBeamer{leqno}{\input{leqno.clo}}
\DeclareOptionBeamer{fleqn}{\input{fleqn.clo}}
@@ -164,22 +156,16 @@
\def\beamer@hypercjk{}
\DeclareOptionBeamer{CJK}{\ExecuteOptionsBeamer{cjk}}
-\DeclareOptionBeamer{cjk}{
+\DeclareOptionBeamer{cjk}{%
\def\beamer@hypercjk{\hypersetup{CJKbookmarks=true}}
-
- \def\beamer@activecjk{
+ \def\beamer@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@notesaction@#1\endcsname}
@@ -199,36 +185,36 @@
\nofiles
}
\def\beamer@notesaction@onlyslideswithnotes{%
- \beamer@notestrue%
- \beamer@frameswithnotesonlytrue%
+ \beamer@notestrue
+ \beamer@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@notesaction@only}
-\DeclareOptionBeamer{blue}{
+\DeclareOptionBeamer{blue}{%
\ClassWarning{beamer}{``blue'' is obsolete. Use color theme structure instead}
\def\beamer@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@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@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@loadlater{\usecolortheme[rgb={0.66,0.4,0.166}]{structure}}}
-\DeclareOptionBeamer{slidescentered}{
+\DeclareOptionBeamer{slidescentered}{%
\ClassWarning{beamer}{``slidescentered'' is obsolete. Use ``c'' instead}
\beamer@centeredtrue}
-\DeclareOptionBeamer{slidestop}{
+\DeclareOptionBeamer{slidestop}{%
\ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead}
\beamer@centeredfalse}
\DeclareOptionBeamer{sans}{%
@@ -243,13 +229,13 @@
\def\mathfamilydefault{\rmdefault}
\beamer@sansmathfalse
}
-\DeclareOptionBeamer{mathsans}{
+\DeclareOptionBeamer{mathsans}{%
\ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``stillsansserifmath''}
\def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue}
-\DeclareOptionBeamer{mathserif}{
+\DeclareOptionBeamer{mathserif}{%
\ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''}
\def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
-\DeclareOptionBeamer{professionalfont}{
+\DeclareOptionBeamer{professionalfont}{%
\ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead}
\beamer@suppressreplacementstrue}
@@ -258,8 +244,6 @@
\def\mathfamilydefault{\sfdefault}
\beamer@sansmathtrue
-
-
\PassOptionsToPackage{bookmarks=true,%
bookmarksopen=true,%
pdfborder={0 0 0},%
@@ -276,13 +260,13 @@
\DeclareOptionBeamer{ucs}{%
\ifpdf
\PassOptionsToPackage{pdftex,unicode}{hyperref}
- \def\beamer@loaducs{
+ \def\beamer@loaducs{%
\RequirePackage[hyperref]{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
}
\else
- \def\beamer@loaducs{
+ \def\beamer@loaducs{%
\RequirePackage{ucs}%
\AtBeginDocument{\PreloadUnicodePage{0}}%
\AtBeginDocument{\PreloadUnicodePage{1}}%
@@ -292,10 +276,10 @@
\DeclareOptionBeamer{utf8x}{\ExecuteOptionsBeamer{ucs}%
\g@addto@macro\beamer@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@paperwidth%
-\beamer@paperwidth 12.80cm%
-\newlength\beamer@paperheight%
-\beamer@paperheight 9.60cm%
+\newlength\beamer@paperwidth
+\setlength\beamer@paperwidth{12.80cm}
+\newlength\beamer@paperheight
+\setlength\beamer@paperheight{9.60cm}
\DeclareOptionBeamer{aspectratio}[43]{%
- \ifnum#1=1610%
- \beamer@paperwidth 16.00cm%
- \beamer@paperheight 10.00cm%
- \else\ifnum#1=169%
- \beamer@paperwidth 16.00cm%
- \beamer@paperheight 9.00cm%
- \else\ifnum#1=149%
- \beamer@paperwidth 14.00cm%
- \beamer@paperheight 9.00cm%
- \else\ifnum#1=54%
- \beamer@paperwidth 12.50cm%
- \beamer@paperheight 10.00cm%
- \else\ifnum#1=43%
- \beamer@paperwidth 12.80cm%
- \beamer@paperheight 9.60cm%
- \else\ifnum#1=32%
- \beamer@paperwidth 13.50cm%
- \beamer@paperheight 9.00cm%
- \else\ifnum#1=141%
- \beamer@paperwidth 14.85cm%
- \beamer@paperheight10.50cm%
- \fi\fi\fi\fi\fi\fi\fi%
+ \ifnum#1=1610 %
+ \setlength\beamer@paperwidth{16.00cm}%
+ \setlength\beamer@paperheight{10.00cm}%
+ \else\ifnum#1=169 %
+ \setlength\beamer@paperwidth{16.00cm}%
+ \setlength\beamer@paperheight{9.00cm}%
+ \else\ifnum#1=149 %
+ \setlength\beamer@paperwidth{14.00cm}%
+ \setlength\beamer@paperheight{9.00cm}%
+ \else\ifnum#1=54 %
+ \setlength\beamer@paperwidth{12.50cm}%
+ \setlength\beamer@paperheight{10.00cm}%
+ \else\ifnum#1=43 %
+ \setlength\beamer@paperwidth{12.80cm}%
+ \setlength\beamer@paperheight{9.60cm}%
+ \else\ifnum#1=32 %
+ \setlength\beamer@paperwidth{13.50cm}%
+ \setlength\beamer@paperheight{9.00cm}%
+ \else\ifnum#1=141 %
+ \setlength\beamer@paperwidth{14.85cm}%
+ \setlength\beamer@paperheight{10.50cm}%
+ \fi\fi\fi\fi\fi\fi\fi
}
\RequirePackage[%
@@ -355,28 +339,23 @@
% Filter class option list
\beamer@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).
-\RequirePackage{atbegshi}
% Normally loaded by hyperref but to be on the safe side ...
+\RequirePackage{atbegshi}
\RequirePackage[implicit=false]{hyperref}
-% For hyperlinks
\hypersetup{pdfcreator={LaTeX with Beamer class}}
-% Coding stuff
+% Encoding stuff
\beamer@loaducs
\beamer@hypercjk
-
-\RequirePackage{beamerbaserequires}
% Beamer packages required both by presentation and article modes
+\RequirePackage{beamerbaserequires}
% Defaults
\normalfont
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
index 8c519bb6ebe..6be1d56e82c 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
@@ -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,13 +11,11 @@
% 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}
-
-\RequirePackage{beamerbasemodes}
% Setup modes and check for article option
-
+% Also loads packages required by both beamer and beamerarticle
+\RequirePackage{beamerbasemodes}
\DeclareOption{utf8}{\PassOptionsToPackage{utf8}{beamerbasearticle}}
\DeclareOption{hyperref}{\PassOptionsToPackage{hyperref}{beamerbasearticle}}
@@ -29,8 +27,7 @@
\DeclareOption{activeospeccharacters}{\PassOptionsToPackage{activeospeccharacters}{beamerbasearticle}}
\DeclareOption{nokeywords}{\PassOptionsToPackage{nokeywords}{beamerbasearticle}}
-\ProcessOptions
-
+\ProcessOptions\relax
\def\beamer@slide#1#2{\expandafter\gdef\csname beamer@slide#1\endcsname{#2}}
\beamer@inpresentationfalse
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
index 8ce495b8338..a0f627f3372 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
@@ -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@articleutf
\RequirePackage[utf8]{inputenc}
@@ -58,8 +58,6 @@
\ifbeamer@articlehyperref
\RequirePackage[pdfborder={0 0 0},bookmarksnumbered]{hyperref}
- % For hyperlinks
-
\hypersetup{pdfcreator={LaTeX with Beamer class (article mode)}}
\ifbeamer@articleutf
\hypersetup{unicode=true}
@@ -68,12 +66,10 @@
\ifbeamer@articlexcolor
\RequirePackage[override]{xcolor}
- % For color support
\fi
-\RequirePackage{beamerbaserequires}
% Beamer packages required both by presentation and article modes
-
+\RequirePackage{beamerbaserequires}
% Default article templates:
\defbeamertemplate<article>*{frame begin}{default}{}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
index 5aaf62db8a0..b8d61b44c34 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
@@ -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
%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index f62ab535a52..33fc7276499 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -305,6 +305,8 @@
\def\underline#1{{\donotcoloroutermaths\beamer@orig@underline{#1}}}
% Fix $ usage in underline:
+ \let\beamer@orig@@textsubscript=\@textsubscript
+ \def\@textsubscript#1{{\donotcoloroutermaths\beamer@orig@@textsubscript{#1}}}
\let\beamer@orig@@textsuperscript=\@textsuperscript
\def\@textsuperscript#1{{\donotcoloroutermaths\beamer@orig@@textsuperscript{#1}}}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
index af57a24ecb8..d986b858fc2 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
@@ -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@orighyperlink\hyperlink
@@ -51,34 +52,24 @@
%
\let\beamer@origdocument\document
\def\document{%
- \beamer@firstminutepatches%
- \endgroup%
-
+ \beamer@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@enumi}
- \renewcommand\theenumii{\@arabic\c@enumii}
- \renewcommand\theenumiii{\@arabic\c@enumiii}
- }
-
- \AtBeginDocument{% fix frenchb.ldf's meddling with itemize and :
- \let\labelitemi\beamer@labelitemi
- \let\labelitemii\beamer@labelitemii
- \let\itemize\beamer@itemize
- \let\list\beamer@list
- \let\@trivlist\beamer@@trivlist%
- \catcode`<=12\catcode`>=12}
-
- \begingroup\beamer@origdocument%
- \beamer@lastminutepatches%
- \ifbeamer@ignorenonframe%
- \expandafter\mode\expandafter*%
- \fi}
+ \renewcommand\theenumi{\@arabic\c@enumi}%
+ \renewcommand\theenumii{\@arabic\c@enumii}%
+ \renewcommand\theenumiii{\@arabic\c@enumiii}%
+ }%
+ \begingroup
+ \beamer@origdocument
+ \beamer@lastminutepatches
+ \ifbeamer@ignorenonframe
+ \expandafter\mode\expandafter*%
+ \fi}
\mode
<article>
@@ -91,36 +82,32 @@
\g@addto@macro\beamer@lastminutepatches{%
\ifbeamer@articleactive
\else
- \catcode`<=12\catcode`>=12
+ \catcode`<=12 %
+ \catcode`>=12 %
\fi
}
}
-
\AtBeginDocument{\def\es@itemize#1#2#3#4{}}% fix spanish.ldf's with \itemize
-
-
-
%
% Fix for older versions of geometry
% We used to test \ifGm@compatii,
% but as of geometry v5.0, it is no longer provided.
%
\ifx\Gm@lmargin\@undefined
-\def\Gm@lmargin{\Geom@lmargin}\def\Gm@rmargin{\Geom@rmargin}
+ \def\Gm@lmargin{\Geom@lmargin}
+ \def\Gm@rmargin{\Geom@rmargin}
\else
-\geometry{includeheadfoot}
+ \geometry{includeheadfoot}
\fi
-
-
%
% Fix deluxetabular floats
%
-\AtBeginDocument{
+\AtBeginDocument{%
\def\@plano@float@#1{\begin{table}}
- \def\end@plano@float@{\end{table}}
+ \def\end@plano@float@{\end{table}}%
}
%
@@ -136,8 +123,8 @@
% Heiko's fix for correct generation of section* and subsection* bookmarks
%
\g@addto@macro\beamer@lastminutepatches{%
- \long\def\@LongEmpty{}
- \newcommand*{\org@beamer@section}{}
+ \long\def\@LongEmpty{}%
+ \newcommand*{\org@beamer@section}{}%
\let\org@beamer@section\beamer@section{}%
\let\org@writebookmark\Hy@writebookmark{}%
\long\def\beamer@section[#1]#2{%
@@ -151,8 +138,8 @@
\def\Hy@writebookmark##1##2##3##4##5{}%
\fi
\org@beamer@section[{#1}]{#2}%
- }
- \newcommand*{\org@beamer@subsection}{}
+ }%
+ \newcommand*{\org@beamer@subsection}{}%
\let\org@beamer@subsection\beamer@subsection{}%
\long\def\beamer@subsection[#1]#2{%
\let\Hy@writebookmark\org@writebookmark
@@ -165,7 +152,7 @@
\def\Hy@writebookmark##1##2##3##4##5{}%
\fi
\org@beamer@subsection[{#1}]{#2}%
- }
+ }%
}
%
@@ -204,15 +191,14 @@
\providecommand\ext@table{}
\providecommand\ext@figure{}
-
-
-
%
% Obsolete commands from old versions of beamer
%
\mode
<all>
{
+ \let\beamer@ifempty=\ifblank
+
\let\beamer@verb@egroup=\verb@egroup
\def\beamer@setb{\setbox0=\copy}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty
index 62b388a30b3..a09a055b84f 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasedecode.sty
@@ -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@slideinframe
\newcount\beamer@minimum
+
+% Indicate whether another slide needs to be processed in this frame
\newif\ifbeamer@anotherslide
-\newif\ifbeamer@localanotherslide
+% Used to know that beamerpauses needs to be used in substitution
\newif\ifbeamer@plusencountered
-%
-%
-% Empty test
-%
-%
-\long\def\beamer@ifempty#1{\beamer@xifempty#1@@..\@nil}
-\long\def\beamer@xifempty#1#2@#3#4#5\@nil{%
- \ifx#3#4\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\let\beamer@ifnextchar=\@ifnextchar
-
-\def\beamer@stoptexts{| stop:0| }
-{
- \catcode`\|=13
- \catcode`\:=13
- \catcode`\,=13
- \catcode`\.=13
- \catcode`\+=13
- \catcode`\-=13
- \catcode`\(=13
- \catcode`\)=13
- \catcode`\ =13
-\gdef\beamer@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@stoptexts}%
-\beamer@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@masterdecode#1{%
\setbox0=\hbox{%
-\expandafter\beamer@decode\beamer@@@temp%
-\ifbeamer@localanotherslide\global\beamer@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@space\beamer@@@temp}%
+\space\noexpand\@empty}%
+\unexpanded{\expandafter\beamer@decode\beamer@@@temp}}%
}%
-}
+\endgroup
% Sets dowhat to doif, if \beamer@slideinframe is in the specified
% interval. Example: 5-7,-3,9,11,13- would mean pages
@@ -64,22 +63,24 @@
\def\beamer@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@decode{%
- \beamer@plusencounteredfalse%
- \global\beamer@minimum=10000\relax%
+ \beamer@plusencounteredfalse
+ \global\beamer@minimum=10000\relax
\gdef\beamer@decaction{}%
- \gdef\beamer@decactionrev{}%
- \global\let\beamer@decodefound=\beamer@allsign%
+ \global\let\beamer@decodefound=\beamer@allsign
\beamer@@decodefind}
-\def\beamer@@decodefind#1|{%
- \beamer@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@ifempty{#2}%
- {\beamer@decodefind beamer:#1:}%
- {\beamer@decodefind #1:#2}}
-
+ \ifblank{#2}%
+ {\beamer@decodefind beamer:#1:}%
+ {\beamer@decodefind #1:#2}}
+% A list of possible overlay modes
\def\beamer@default{default}
\def\beamer@articlemode{article}
\def\beamer@secondmode{second}
@@ -87,167 +88,204 @@
\def\beamer@presentationmode{presentation}
\def\beamer@modeall{all}
\def\beamer@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@decodefind#1:#2:{%
\def\beamer@ovmode{#1}%
- \beameratdecodeaction{#2}%
- \expandafter\futurelet\expandafter\next\expandafter\beamer@checkcat\beamer@spec:%
+ \beamer@decodeaction{#2}%
+ \expandafter\futurelet\expandafter\next\expandafter
+ \beamer@checkcat\beamer@spec:%
\expandafter\beamer@decodeplus\beamer@spec+:%
\expandafter\beamer@decodedot\beamer@spec.:%
- \ifx\beamer@ovmode\beamer@ovmodestop%
+ \ifx\beamer@ovmode\beamer@ovmodestop
\expandafter\beamer@@decode\beamer@decodefound,!%
- \let\beamer@next=\relax%
- \ifbeamer@plusencountered\global\advance\c@beamerpauses by1\relax\fi%
+ \let\beamer@next=\relax
+ \ifbeamer@plusencountered\stepcounter{beamerpauses}\fi
\else
- \ifx\beamer@ovmode\beamer@currentmode%
- \beamer@@decodefound%
- \else%
- \ifx\beamer@ovmode\beamer@modeall%
- \beamer@@decodefound%
- \else%
- \ifx\beamer@ovmode\beamer@presentationmode%
- \ifx\beamer@currentmode\beamer@articlemode%
- \else%
- \beamer@@decodefound%
- \fi%
- \else%
- \ifx\beamer@ovmode\beamer@beamermode%
- \ifx\beamer@currentmode\beamer@secondmode%
- \beamer@@decodefound%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
- \let\beamer@next=\beamer@@decodefind%
- \fi%
+ \ifx\beamer@ovmode\beamer@currentmode
+ \beamer@@decodefound
+ \else
+ \ifx\beamer@ovmode\beamer@modeall
+ \beamer@@decodefound
+ \else
+ \ifx\beamer@ovmode\beamer@presentationmode
+ \ifx\beamer@currentmode\beamer@articlemode
+ \else
+ \beamer@@decodefound
+ \fi
+ \else
+ \ifx\beamer@ovmode\beamer@beamermode
+ \ifx\beamer@currentmode\beamer@secondmode
+ \beamer@@decodefound
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \let\beamer@next=\beamer@@decodefind
+ \fi
\beamer@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@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@action{default}%
+ \def\noexpand\beamer@spec{##1}%
+ }%
+ {%
+ \def\noexpand\beamer@action{##1}%
+ \def\noexpand\beamer@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@checkcat#1:{%
\ifcat\next a%
\gdef\beamer@ovmode{#1}%
\ifx\beamer@decodefound\beamer@allsign
\gdef\beamer@decodefound{0}%
- \fi%
- \gdef\beamer@spec{1-}%
- \fi%
- }
-
-\def\beamer@@decodefound{%
- \ifx\beamer@action\beamer@default%
- \expandafter\gdef\expandafter\beamer@decodefound\expandafter{\beamer@spec}%
- \else
- \xdef\beamer@decaction{\beamer@decaction{\beamer@action<\beamer@spec>}}
- \xdef\beamer@decactionrev{{\beamer@action}\beamer@decactionrev}
+ \fi
+ \def\beamer@spec{1-}%
\fi}
-\def\beamer@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@spec{#2}%
- \ifx\beamer@spec\@empty%
- \xdef\beamer@spec{#1}%
- \gdef\beamer@action{default}%
- \else%
- \xdef\beamer@action{#1}%
- \beameratgetridofat#2%
- \xdef\beamer@spec{\beameratspec}
- \fi%
-}
\def\beamer@decodeplus{%
\def\beamer@spec{}\beamer@@decodeplus}
\def\beamer@@decodeplus#1+#2:{%
- \edef\beamer@spec{\beamer@spec#1}% everything up to first +
- \beamer@ifempty{#2}{}
+ \edef\beamer@spec{\beamer@spec#1}% everything up to a +
+ \ifblank{#2}{}
{% ok, check if followed by number:
- \beamer@plusencounteredtrue%
+ \beamer@plusencounteredtrue
\beamer@@@decodeplus#2:}}
\def\beamer@@@decodeplus{%
- \beamer@ifnextchar({\beamer@relnumber}{\beamer@relnumber(0)}}
+ \kernel@ifnextchar(%)
+ {\beamer@relnumber}{\beamer@relnumber(0)}}
\def\beamer@relnumber(#1){%
- \beamer@plusencounteredtrue%
- \beamer@tempcount=#1\relax
- \advance\beamer@tempcount by\c@beamerpauses\relax%
- \edef\beamer@spec{\beamer@spec\the\beamer@tempcount}%
+ \beamer@plusencounteredtrue
+ \edef\beamer@spec
+ {\beamer@spec\number\numexpr #1 + \value{beamerpauses}\relax}%
\beamer@@decodeplus}
\def\beamer@decodedot{%
\def\beamer@spec{}\beamer@@decodedot}
\def\beamer@@decodedot#1.#2:{%
\edef\beamer@spec{\beamer@spec#1}% everything up to first .
- \beamer@ifempty{#2}{}{\beamer@@@decodedot#2:}}
+ \ifblank{#2}{}{\beamer@@@decodedot#2:}}
\def\beamer@@@decodedot{%
- \beamer@ifnextchar({\beamer@relnumberdot}{\beamer@relnumberdot(0)}}
+ \kernel@ifnextchar(%)
+ {\beamer@relnumberdot}{\beamer@relnumberdot(0)}}
\def\beamer@relnumberdot(#1){%
- \beamer@tempcount=#1\relax
- \advance\beamer@tempcount by\c@beamerpauses\relax%
- \advance\beamer@tempcount by-1\relax%
- \edef\beamer@spec{\beamer@spec\the\beamer@tempcount}%
+ \edef\beamer@spec
+ {\beamer@spec\number\numexpr #1 + \value{beamerpauses} -1\relax}%
\beamer@@decodedot}
+\def\beamer@@decodefound{%
+ \ifx\beamer@action\beamer@default
+ \xdef\beamer@decodefound{\beamer@spec}%
+ \else
+ \xdef\beamer@decaction{{\beamer@action<\beamer@spec>}}%
+ \fi}
+\def\beamer@currentaction{default}
+
\def\beamer@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@ifnextchar!%
+ \kernel@ifnextchar!%
{\beamer@decodeend}%
{%
- \beamer@ifnextchar*%
+ \kernel@ifnextchar*%
{\beamer@decodeall}{%
- \beamer@ifnextchar-%
+ \kernel@ifnextchar-%
{\beamer@decodeuntil}%
{\beamer@decodenumber}}}}
\def\beamer@decodeend!{}
\def\beamer@decodeall*,{%
- \ifnum1<\beamer@minimum\global\beamer@minimum=1\fi%
- \ifnum1>\beamer@slideinframe%
- \global\beamer@anotherslidetrue%
- \beamer@localanotherslidetrue%
- \fi%
- \gdef\beamer@doifnotinframe{\beamer@doifinframe}\beamer@@decode}
+ \ifnum1<\beamer@minimum
+ \global\beamer@minimum=1\relax
+ \fi
+ \ifnum1>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \gdef\beamer@doifnotinframe{\beamer@doifinframe}%
+ \beamer@@decode}
\def\beamer@decodeuntil-#1,{%
- \ifnum1<\beamer@minimum\global\beamer@minimum=1\fi%
- \ifnum#1>\beamer@slideinframe\global\beamer@anotherslidetrue\beamer@localanotherslidetrue\fi%
- \ifnum\beamer@slideinframe>#1\else\gdef\beamer@doifnotinframe{\beamer@doifinframe}\fi%
+ \ifnum1<\beamer@minimum
+ \global\beamer@minimum=1\relax
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \ifnum\beamer@slideinframe>#1\relax
+ \else
+ \gdef\beamer@doifnotinframe{\beamer@doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer@decodenumber#1{%
- \beamer@ifnextchar,%
+ \kernel@ifnextchar,%
{\beamer@decodeone{#1}}%
- {\beamer@ifnextchar-%
+ {\kernel@ifnextchar-%
{\beamer@decodenumberto{#1}}%
{\beamer@decodegobble{#1}}}}
\def\beamer@decodegobble#1#2{%
\beamer@decodenumber{#1#2}}
-\def\beamer@decodenumberto#1-{
- \beamer@ifnextchar,%
+\def\beamer@decodenumberto#1-{%
+ \kernel@ifnextchar,%
{\beamer@decodeto{#1}}%
{\beamer@decodebetween{#1}}}
\def\beamer@decodeto#1,{%
- \ifnum#1<\beamer@minimum\global\beamer@minimum=#1\fi%
- \ifnum#1>\beamer@slideinframe\global\beamer@anotherslidetrue\beamer@localanotherslidetrue\fi%
- \ifnum#1>\beamer@slideinframe\else\gdef\beamer@doifnotinframe{\beamer@doifinframe}\fi%
+ \ifnum#1<\beamer@minimum
+ \global\beamer@minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \else
+ \gdef\beamer@doifnotinframe{\beamer@doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer@decodebetween#1#2,{%
- \ifnum#1<\beamer@minimum\global\beamer@minimum=#1\fi%
- \ifnum#1>\beamer@slideinframe\global\beamer@anotherslidetrue\beamer@localanotherslidetrue\fi%
- \ifnum#2>\beamer@slideinframe\global\beamer@anotherslidetrue\beamer@localanotherslidetrue\fi%
- \ifnum#1>\beamer@slideinframe\else\ifnum#2<\beamer@slideinframe\else\gdef\beamer@doifnotinframe{\beamer@doifinframe}\fi\fi%
+ \ifnum#1<\beamer@minimum
+ \global\beamer@minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \ifnum#2>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \else
+ \ifnum#2<\beamer@slideinframe
+ \else
+ \gdef\beamer@doifnotinframe{\beamer@doifinframe}%
+ \fi
+ \fi
\beamer@@decode}
\def\beamer@decodeone#1,{%
- \ifnum#1<\beamer@minimum\global\beamer@minimum=#1\fi%
- \ifnum#1>\beamer@slideinframe\global\beamer@anotherslidetrue\beamer@localanotherslidetrue\fi%
- \ifnum#1=\beamer@slideinframe\gdef\beamer@doifnotinframe{\beamer@doifinframe}\fi%
+ \ifnum#1<\beamer@minimum
+ \global\beamer@minimum=#1\relax
+ \fi
+ \ifnum#1>\beamer@slideinframe
+ \global\beamer@anotherslidetrue
+ \fi
+ \ifnum#1=\beamer@slideinframe
+ \gdef\beamer@doifnotinframe{\beamer@doifinframe}%
+ \fi
\beamer@@decode}
\def\beamer@donow{\beamer@doifnotinframe}
-
-\def\beamer@saveanother{\let\beamer@savedif=\ifbeamer@anotherslide}
-\def\beamer@restoreanother{\global\let\ifbeamer@anotherslide=\beamer@savedif}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
index 42853618a10..bdd8a3aa894 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
@@ -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@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@amssymb
+ \RequirePackage{amssymb}
\fi
\mode
@@ -45,26 +45,28 @@
{\expandafter\def\csname beamer@thmfinherits@\beamer@temp\endcsname{%
\@for\@temp:={#1}\do{\expandafter\usebeamerfont\expandafter{\@temp}}}}
-\def\setbeamerfont{\@ifstar{\beamer@clearbeamerfont}{\beamer@setbeamerfont}}
+\newrobustcmd*\setbeamerfont{%
+ \@ifstar{\beamer@clearbeamerfont}{\beamer@setbeamerfont}}
\newcommand\beamer@clearbeamerfont[2]{%
- \def\beamer@temp{#1}
- \setkeys{beamerthm}{size={},shape={},series={},family={},parent={}}
- \setkeys{beamerthm}{#2}
+ \def\beamer@temp{#1}%
+ \setkeys{beamerthm}{size={},shape={},series={},family={},parent={}}%
+ \setkeys{beamerthm}{#2}%
}
\newcommand\beamer@setbeamerfont[2]{%
- \def\beamer@temp{#1}
- \setkeys{beamerthm}{#2}
+ \def\beamer@temp{#1}%
+ \setkeys{beamerthm}{#2}%
}
-\def\usebeamerfont{\@ifstar{\reset@font\beamer@usebeamerfont}{\beamer@usebeamerfont}}
+\newrobustcmd*\usebeamerfont{%
+ \@ifstar{\reset@font\beamer@usebeamerfont}{\beamer@usebeamerfont}}
\newcommand\beamer@usebeamerfont[1]{%
- \csname beamer@thmfinherits@#1\endcsname%
- \csname beamer@thmfsize@#1\endcsname%
- \csname beamer@thmfshape@#1\endcsname%
- \csname beamer@thmfseries@#1\endcsname%
- \csname beamer@thmffamily@#1\endcsname%
+ \csname beamer@thmfinherits@#1\endcsname
+ \csname beamer@thmfsize@#1\endcsname
+ \csname beamer@thmfshape@#1\endcsname
+ \csname beamer@thmfseries@#1\endcsname
+ \csname beamer@thmffamily@#1\endcsname
\selectfont}
@@ -74,7 +76,7 @@
%
\def\EC@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@family{T1}{cmr}{m}{n}{ecrm}
\EC@family{T1}{cmr}{m}{sl}{ecsl}
@@ -87,46 +89,46 @@
\EC@family{T1}{cmr}{bx}{sc}{ecxc}
\EC@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%
<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@family{T1}{cmss}{bx}{it}{ecso}
\EC@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,149 +153,149 @@
}{}
\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%
}{}
\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%
}{}
\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@font@check}{%
- \def\beamer@cmr{cmr}
- \edef\beamer@fmdef{\mathfamilydefault}
+ \def\beamer@cmr{cmr}%
+ \edef\beamer@fmdef{\mathfamilydefault}%
% supress for standard cm
\ifx\beamer@fmdef\beamer@cmr\beamer@suppressreplacementstrue\fi
% supress for mathtime serif and math minion serif
- \@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lmodern}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathastext}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathpmnt}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathpple}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mathtime}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mtpro}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
- \@ifpackageloaded{mtpro2}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}
+ \@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lmodern}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathastext}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathpmnt}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathpple}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mathtime}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mtpro}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{mtpro2}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
}
\AtBeginDocument{%
\beamer@font@check
\ifbeamer@suppressreplacements\else
\ifbeamer@sansmath
- \SetSymbolFont{operators}{normal}{OT1}{cmss}{\mddefault}{n}
+ \SetSymbolFont{operators}{normal}{OT1}{cmss}{\mddefault}{n}%
\ifx\mv@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@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@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,9 +315,8 @@
\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
-
-\newcommand\Tiny{\@setfontsize\Tiny{4}{5}}
-\newcommand\TINY{\@setfontsize\Tiny{3}{4}}
+\newrobustcmd*\Tiny{\@setfontsize\Tiny{4}{5}}
+\newrobustcmd*\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@optgog}{\beamer@optgog}}
+ \newrobustcmd*\setbeamerfont{\@ifstar{\@gobbletwo}{\@gobbletwo}}
+ \newrobustcmd*\usebeamerfont{\@ifstar{\beamer@optgog}{\beamer@optgog}}
}
-
\mode
<all>
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index e14d9cd2138..724bdb7a36e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -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@beamerpauses=1\relax%
- \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{%
+ \expandafter\ifblank\expandafter{\beamer@framestartpage}{%
\stepcounter{subsectionslide}%
\xdef\beamer@framestartpage{\the\c@page}% only first time
}{\clearpage\beamer@notesactions}% cleanup from previous slide
@@ -365,14 +366,14 @@
\beamer@copewithframeenv}
\def\beamer@checkforverbatim#1containsverbatim#2\relax{%
- \beamer@ifempty{#2}%
+ \ifblank{#2}%
{\beamer@checkforfragile#1fragile\relax}
{% contains verbatim
\endgroup% end environment
\expandafter\beamer@framecommand\beamer@frameoptions\bgroup}%
}
\def\beamer@checkforfragile#1fragile#2\relax{%
- \beamer@ifempty{#2}%
+ \ifblank{#2}%
{\beamer@frameenv}% normal frame
{% contains verbatim
\endgroup% end environment
@@ -396,7 +397,7 @@
\fi%
\beamer@next{#1#2}}
\def\beamer@checkforcolon#1:#2.{%
- \beamer@ifempty{#2}{}{\let\beamer@next=\beamer@oldframesyntax}}
+ \ifblank{#2}{}{\let\beamer@next=\beamer@oldframesyntax}}
\def\beamer@newframesyntax#1{\beamer@@@frame<*>[#1]}
\def\beamer@oldframesyntax#1{\beamer@@@frame<#1>[]}
@@ -411,7 +412,7 @@
\def\beamer@@@@frame<#1>[#2]{%
\framewidth\textwidth
\beamer@savemode%
- \def\beamer@mode{\mode<all>}%
+ \gdef\beamer@mode{\mode<all>}%
\def\beamer@frametemplate{}%
\def\beamer@againname{}%
\def\beamer@undolabels{}%
@@ -450,19 +451,9 @@
\ifx\beamer@againname\@empty%
\beamer@slideinframe=0\relax%
\beamer@anotherslidefalse%
- {\beamer@masterdecode{\beamer@whichframes}}%
+ \beamer@masterdecode{\beamer@whichframes}%
\ifbeamer@anotherslide%
-%% \beamer@slideinframe=2\relax%
-%% \def\beamer@doifnotinframe{}%
-%% \def\beamer@doifinframe{\let\beamer@howtotreatframe\beamer@doseveralframes}%
-%% \beamer@anotherslidefalse%
-%% {\beamer@masterdecode{\beamer@whichframes}}%
-%% \ifbeamer@anotherslide%
\let\beamer@howtotreatframe\beamer@doseveralframes%
-%% \else% single slide in frame
-%% \let\beamer@howtotreatframe\beamer@dosingleframe%
-%% \fi%
-%% \beamer@donow%
\ifbeamer@containsverbatim%
\let\beamer@howtotreatframe\beamer@dosingleframe%
\fi%
@@ -517,11 +508,11 @@
\beamer@slideinframe=1\relax%
\loop%
\beamer@anotherslidefalse%
- \def\beamer@doifnotinframe{}%
+ \gdef\beamer@doifnotinframe{}%
\def\beamer@doifinframe{\begin{beamer@frameslide}%
#1%
\end{beamer@frameslide}}%
- {\beamer@masterdecode{\beamer@whichframes}}%
+ \beamer@masterdecode{\beamer@whichframes}%
\beamer@donow%
\ifbeamer@twoscreenstext%
\beamer@dosecondscreennow{#1}% two screen stuff
@@ -572,7 +563,9 @@
\def\beamer@doframeinput{\@ifnextchar<{\beamer@frameinput}{\beamer@frameinput<*>}}
\def\beamer@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@temp{\noexpand\beamer@@@frameinput<#1>[\beamer@defaultospec][}%
+ \beamer@temp}}
\def\beamer@@@@frameinput<#1>[#2]{\@ifnextchar[{\beamer@@@frameinput<#1>[{#2}]}{\beamer@@@frameinput<#1>[{#2}][]}}
\def\beamer@@@frameinput<#1>[#2][#3]{%
\global\advance\c@framenumber by-1\relax%
@@ -591,7 +584,7 @@
\csname end#1\endcsname}
\def\beamer@writeslidentry{%
- \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{}% does not happen normally
+ \expandafter\ifblank\expandafter{\beamer@framestartpage}{}% does not happen normally
{%else
\addtocontents{nav}%
{\protect\headcommand{%
@@ -659,7 +652,7 @@
\refstepcounter{framenumber}%
\beamer@slideinframe=0\relax%
\beamer@anotherslidefalse%
- {\beamer@masterdecode{#1}}%
+ \beamer@masterdecode{#1}%
\ifbeamer@anotherslide%
\let\beamer@howtotreatframe\beamer@dosingleframe%
\else% no slides in frame
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
index 821dc4c3f4a..04e25e5c33a 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
@@ -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@tempdim=\ht\@tempboxa%
\setbox\@tempboxa=\hbox{\lower\beamer@tempdim\hbox{\box\@tempboxa}}%
\wd\@tempboxa=0pt\ht\@tempboxa=0pt\dp\@tempboxa=0pt%
- \vbox{\hbox{\hskip-\Gm@lmargin\raise\headheight\box\beamer@tempbox\box\@tempboxa}\hfil}%
+ \vbox{\hbox{\hskip-\Gm@lmargin\raise\headheight\box\beamer@tempbox\raise\headheight\box\@tempboxa}\hfil}%
\endgroup%
}
\def\@oddfoot{\normalcolor{\hfil%
@@ -359,24 +359,7 @@
\mode
<article>
{
- \define@key{beamerfootnote}{frame}[true]{}
-
-\let\beamer@origfootnote=\footnote
- \renewcommand\footnote[1][]{%
- \let\beamer@kvorig=\KV@errx%
- \let\beamer@xkvorig=\XKV@err
- \def\beamer@footarg{}%
- \def\KV@errx##1{\edef\beamer@footarg{\@tempa}}%
- \def\XKV@err##1{\edef\beamer@footarg{\XKV@tkey}}%
- \setkeys{beamerfootnote}{#1}%
- \let\KV@errx=\beamer@kvorig%
- \let\XKV@errx=\beamer@xkvorig
- \ifx\beamer@footarg\@empty%
- \edef\beamer@next{\noexpand\beamer@origfootnote}%
- \else%
- \edef\beamer@next{\noexpand\beamer@origfootnote[\beamer@footarg]}%
- \fi%
- \beamer@next}
+ \renewcommand<>{\footnote}{\beameroriginal{\footnote}}%
}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
index fb496a87333..beebc74d5eb 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
@@ -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@gobbleoptional}}
\long\def\beamer@@frametitle[#1]#2{%
- \beamer@ifempty{#2}{}{%
+ \ifblank{#2}{}{%
\gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer@frametitle{#2}%
\gdef\beamer@shortframetitle{#1}%
@@ -42,7 +43,7 @@
<all>
{
\let\beamer@aftersubtitle=\relax
- \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
+ \newcommand<>\framesubtitle[1]{\only#2{\ifblank{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
}
@@ -53,7 +54,7 @@
\@ifnextchar\framesubtitle{\beamer@donextsubtitle}{\usebeamertemplate{frametitle}}}}
\renewcommand<>\framesubtitle[1]{%
\only#2{%
- \beamer@ifempty{#1}
+ \ifblank{#1}
{\usebeamertemplate{frametitle}}
{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
\def\beamer@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@ifempty{#1}{}{\def\beamer@defaultospec{#1}}%
+ \ifblank{#1}{}{\def\beamer@defaultospec{#1}}%
\ifnum \@itemdepth >2\relax\@toodeep\else
\advance\@itemdepth\@ne
\beamer@computepref\@itemdepth% sets \beameritemnestingprefix
@@ -295,6 +296,9 @@
\beamer@descdefault\wd\beamer@tempbox\@@description}
\def\@@description{%
\advance\beamer@descdefault by \labelsep%
+ \usebeamerfont{description body}%
+ \usebeamercolor[fg]{description body}%
+ \usebeamertemplate{description body begin}%
\list
{}
{\labelwidth\beamer@descdefault\leftmargin\beamer@descdefault\let\makelabel\beamer@descriptionitem}%
@@ -302,7 +306,8 @@
\raggedright
\beamer@firstlineitemizeunskip%
}
-\def\enddescription{\ifhmode\unskip\fi\endlist}
+\def\enddescription{\ifhmode\unskip\fi\endlist%
+ \usebeamertemplate{description body end}}
\long\def\beamer@descriptionitem#1{%
\def\insertdescriptionitem{#1}%
\hfil\hspace\labelsep{\usebeamertemplate**{description item}}}
@@ -491,8 +496,8 @@
{\ifcsundef{abx@name@labelname}{}{\let\bbx@tempa\labelnamepunct}%
\bbx@tempa\newblock\unspace\usebeamercolor[fg]{bibliography entry title}}{}{}
\apptocmd{\abx@macro@title}
- {\ifcsundef{abx@field@title}{}{\midsentence\newunitpunct}%
- \newblock\usebeamercolor[fg]{bibliography entry note}}{}{}}
+ {\ifcsundef{abx@field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}%
+ \newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}}
{}}
\mode
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
index 7f2b0fca27f..1d14df1698d 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
@@ -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@sectionmax=0\relax
\beamer@sectioncount=0\relax
-\def\headcommand#1{\global\advance\beamer@totalheads by1\relax%
+\newrobustcmd*\headcommand[1]{\global\advance\beamer@totalheads by1\relax
\expandafter\gdef\csname @@head\the\beamer@totalheads\endcsname{#1}}
-\def\dohead{\beamer@headcounter=0\relax\loop\ifnum\beamer@headcounter<\beamer@totalheads%
- \advance\beamer@headcounter by1\relax%
+\newrobustcmd*\dohead{\beamer@headcounter=0\relax\loop\ifnum\beamer@headcounter<\beamer@totalheads
+ \advance\beamer@headcounter by1\relax
\csname @@head\the\beamer@headcounter\endcsname\repeat}
\def\beamer@startpageofframe{1}
@@ -40,8 +40,8 @@
\def\beamer@startpageofappendix{}
\def\inserttotalframenumber{1}
-\def\partentry#1#2{\beamer@sectioncount=0\relax}
-\def\beamer@initsectionentry#1#2#3#4#5{\advance\beamer@sectioncount by1\relax%
+\newrobustcmd*\partentry[2]{\beamer@sectioncount=0\relax}
+\def\beamer@initsectionentry#1#2#3#4#5{\advance\beamer@sectioncount by1\relax
\ifnum\beamer@sectionmax<\beamer@sectioncount\beamer@sectionmax=\beamer@sectioncount\fi}
\def\beamer@initslideentry#1#2#3#4#5#6{\ifnum\beamer@subsectionmax<#2\relax\beamer@subsectionmax=#2\fi}
\def\beamer@initsubsubsectionentry#1#2#3#4#5#6{\ifnum\beamer@subsubsectionmax<#4\relax\beamer@subsubsectionmax=#4\fi}
@@ -74,7 +74,7 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\g@addto@macro\beamer@lastminutepatches{
+\g@addto@macro\beamer@lastminutepatches{%
\beamer@activecjk
\makeatletter
\@input{\jobname.nav}
@@ -90,27 +90,26 @@
\let\beamer@subsubsectionentry=\beamer@subsubsectionentryorig
\beamer@calculateheadfoot
\ifbeamer@draftmode
- \setbeamertemplate{footline}{
+ \setbeamertemplate{footline}{%
\color{black!25}%
\kern-\Gm@lmargin\vrule width\paperwidth
- height\footheight\kern-\Gm@rmargin}
- \setbeamertemplate{headline}{
+ height\footheight\kern-\Gm@rmargin}%
+ \setbeamertemplate{headline}{%
\color{black!25}%
\kern-\Gm@lmargin\vrule width\paperwidth
- height\headheight\kern-\Gm@rmargin}
+ height\headheight\kern-\Gm@rmargin}%
\setbeamertemplate{sidebar left}{%
\color{black!20}%
- \vrule width \beamer@leftsidebar height\sidebarheight}
+ \vrule width \beamer@leftsidebar height\sidebarheight}%
\setbeamertemplate{sidebar right}{%
\color{black!20}%
- \vrule width \beamer@rightsidebar height\sidebarheight}
- \setbeamertemplate{sidebar canvas left}{}
- \setbeamertemplate{sidebar canvas right}{}
+ \vrule width \beamer@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@tempcount=\c@page\advance\beamer@tempcount by -1%
+ \beamer@tempcount=\c@page\advance\beamer@tempcount by -1 %
\if@filesw
\immediate\write\@auxout{\string\@writefile{nav}%
{\noexpand\headcommand{\noexpand\beamer@partpages{\the\beamer@partstartpage}{\the\beamer@tempcount}}}}%
@@ -172,21 +170,18 @@
\fi
}
-
-
%
% Managing short inserts
%
-
\define@key{beamerst}{respectlinebreaks}[true]{%
\def\beamer@stlinebreakrule{}}
\define@key{beamerst}{width}{%
\def\beamer@ststart{%
\begin{minipage}[t]{#1}%
- \raggedright%
- \beamer@stalign%
- \beamer@stlinebreakrule%
+ \raggedright
+ \beamer@stalign
+ \beamer@stlinebreakrule
}%
\def\beamer@stend{\end{minipage}}}
\define@key{beamerst}{center}[true]{%
@@ -200,7 +195,7 @@
\def\beamer@stend{\egroup}%
\setkeys{beamerst}{#1}}%
\newcommand{\beamer@insertshort}[1]{%
- \beamer@ststart#1\beamer@stend%
+ \beamer@ststart#1\beamer@stend
}
\mode
@@ -210,13 +205,24 @@
{
\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@includegraphics@maybe@star\includegraphics
- \DeclareRobustCommand\includegraphics{%
+ \renewcommand<>\includegraphics{%
\@ifstar
- {\Gin@cliptrue \beamer@includegraphics@maybe@star}
- {\Gin@clipfalse \beamer@includegraphics@maybe@star}%
+ {\Gin@cliptrue}
+ {\Gin@clipfalse}%
+ \@ifnextchar[%]
+ {\beamer@includegraphics{#1}}
+ {\beamer@@@includegraphics{#1}{}}%
+ }
+ \long\def\beamer@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
@@ -226,5 +232,3 @@
\renewcommand<>\pgfimage[2][]{\only#3{\beameroriginal\pgfimage[{#1}]{#2}}\ignorespaces}
\fi
}
-
-
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
index 488d7557563..57dfffeeaba 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
@@ -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,23 +10,23 @@
%
% 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@blocks \beamer@blockstrue
+\newif\ifbeamer@ams \beamer@amstrue
+\newif\ifbeamer@amssymb \beamer@amssymbtrue
+\newif\ifbeamer@countsect \beamer@countsectfalse % A no-op but for clarity
+\newif\ifbeamer@keywords \beamer@keywordstrue
+
+% Scratch space
\newbox\beamer@tempbox
-\newif\ifbeamer@blocks
-\newif\ifbeamer@ams
-\newif\ifbeamer@amssymb
-\newif\ifbeamer@countsect
-\newif\ifbeamer@keywords
-\beamer@blockstrue
-\beamer@amstrue
-\beamer@amssymbtrue
-\beamer@countsectfalse
-\beamer@keywordstrue
\newcount\beamer@tempcount
-\newcounter{beamerpauses}
+% The pauses counter is public and global, and required by both
+% beamer and beamerarticle
+\newcounter{beamerpauses}
\RequirePackage{beamerbasedecode}
@@ -44,52 +44,59 @@
\newif\ifbeamer@inpresentation
\beamer@inpresentationtrue
-\def\beamer@makeinnocent#1{\catcode`#1=12 }
\def\beamer@startcomment{%
- \begingroup%
- \let\do\beamer@makeinnocent\dospecials%
- \beamer@makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \beamer@processline}
-
-{\catcode`\^^M=12\endlinechar=-1%
+ \begingroup
+ \let\do\@makeother\dospecials
+ \catcode`\^^L=12 % and whatever other special cases
+ \endlinechar`\^^M %
+ \catcode`\^^M=12 %
+ \beamer@processline}
+
+\begingroup
+ \catcode`\^^M=12\relax\endlinechar=-1\relax%
\long\gdef\beamer@processline#1^^M{%
\def\beamer@test{#1}%
\ifx\beamer@test\beamer@stopmodestar%
\let\next=\beamer@modeoutsideframe%
\else%
- \ifx\beamer@test\beamer@stopmode%
- \let\next=\mode%
- \else%
- \ifx\beamer@test\beamer@stoparticle%
- \let\next=\article%
+ \ifx\beamer@test\beamer@stopmode%
+ \let\next=\mode%
\else%
- \ifx\beamer@test\beamer@stoppresentation%
- \let\next=\presentation%
+ \ifx\beamer@test\beamer@stoparticle%
+ \let\next=\article%
\else%
- \ifx\beamer@test\beamer@stopcommon%
- \let\next=\common%
+ \ifx\beamer@test\beamer@stoppresentation%
+ \let\next=\presentation%
\else%
- \ifx\beamer@test\beamer@stopdocument%
- \let\next=\beamer@enddocument%
- \else
- \ifx\beamer@test\beamer@begindocument%
- \let\next=\beamer@startdocument%
+ \ifx\beamer@test\beamer@stopcommon%
+ \let\next=\common%
+ \else%
+ \ifx\beamer@test\beamer@stopdocument%
+ \let\next=\beamer@enddocument%
\else
- \let\next=\beamer@processline%
+ \ifx\beamer@test\beamer@begindocument%
+ \let\next=\beamer@startdocument%
+ \else
+ \let\next=\beamer@processline%
+ \fi%
\fi%
\fi%
\fi%
\fi%
\fi%
\fi%
- \fi%
\next}
-}
+\endgroup
\def\beamer@enddocument{\beamer@closer\end{document}}
-\def\beamer@startdocument{\beamer@closer\begin{document}\def\beamer@closer{}\common}
+\def\beamer@startdocument{%
+ \beamer@closer
+ \begin{document}%
+ \gdef\beamer@closer{}%
+ \mode<all>}
\def\beamer@closer{}
-{\escapechar=-1\relax%
+\begingroup
+ \escapechar=-1\relax
\xdef\beamer@stopmode{\string\\mode}
\xdef\beamer@stopmodestar{\string\\mode*}
\xdef\beamer@stoparticle{\string\\article}
@@ -97,14 +104,18 @@
\xdef\beamer@stopcommon{\string\\common}
\xdef\beamer@stopdocument{\string\\end\string\{document\string\}}
\xdef\beamer@begindocument{\string\\begin\string\{document\string\}}
-}
+\endgroup
+
\newbox\beamer@commentbox
\def\beamer@startcommentinframe{%
- \begingroup%
- \edef\beamer@closer{\egroup\beamer@closer}%
- \setbox\beamer@commentbox=\vbox\bgroup\leavevmode}
+ \begingroup
+ \xdef\beamer@closer{\egroup\beamer@closer}%
+ \setbox\beamer@commentbox=\vbox\bgroup\leavevmode}
\def\beamer@outsidemode{\afterassignment\beamer@treat\let\beamer@nexttoken=}
+
+% Deals with the various tokens that need to be 'active' even when skipping
+% material outside frames
\def\beamer@treat{%
\ifx\beamer@nexttoken\frame\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\lecture\let\next=\beamer@stopoutsidemode\fi
@@ -126,69 +137,83 @@
\def\beamer@stopoutsidemode{\beamer@nexttoken}
\def\beamer@checkenddoc#1{%
\def\beamer@temp{#1}%
- \ifx\beamer@temp\beamer@enddoc%
- \let\next=\beamer@enddocument%
- \else%
- \let\next=\beamer@outsidemode%
- \fi%
+ \ifx\beamer@temp\beamer@enddoc
+ \let\next=\beamer@enddocument
+ \else
+ \let\next=\beamer@outsidemode
+ \fi
\next}
\def\beamer@enddoc{document}
\def\beamer@checkbeginframe#1{%
\def\beamer@temp{#1}%
- \ifx\beamer@temp\beamer@frametext%
- \let\next=\beamer@beginframeenv%
- \else%
- \let\next=\beamer@outsidemode%
- \fi%
+ \ifx\beamer@temp\beamer@frametext
+ \let\next=\beamer@beginframeenv
+ \else
+ \let\next=\beamer@outsidemode
+ \fi
\next}
\def\beamer@beginframeenv{\begin{frame}}
\def\beamer@modeoutsideframe{%
- \beamer@closer%
+ \beamer@closer
+ \gdef\beamer@closer{}%
\gdef\beamer@mode{\beamer@modeoutsideframe}%
- \ifbeamer@inpresentation%
- \let\next=\beamer@outsidemode%
- \gdef\beamer@closer{}%
- \else%
- \let\next=\relax%
- \gdef\beamer@closer{}%
+ \ifbeamer@inpresentation
+ \let\next=\beamer@outsidemode
+ \else
+ \let\next=\relax
\fi%
\next}
-
-%obsolete, do note use:
-\def\presentation{\mode<presentation>}
-\def\article{\mode<article>}
-\def\common{\mode<all>}
+% Obsolete, do not use!
+\newrobustcmd*\presentation{\mode<presentation>}
+\newrobustcmd*\article{\mode<article>}
+\newrobustcmd*\common{\mode<all>}
%
% Mode command
%
-\def\mode{\@ifstar\beamer@modeoutsideframe\beamer@@@mode}
-\def\beamer@@@mode<#1>{\beamer@closer\@ifnextchar\bgroup{\beamer@modeinline<#1>}{\beamer@switchmode<#1>}}
+\newrobustcmd*\mode{\@ifstar\beamer@modeoutsideframe\beamer@@@mode}
+\def\beamer@@@mode<#1>{%
+ \beamer@closer
+ \@ifnextchar\bgroup
+ {\beamer@modeinline<#1>}%
+ {\beamer@switchmode<#1>}}
\long\def\beamer@modeinline<#1>#2{%
\gdef\beamer@closer{}%
- \def\beamer@doifnotinframe{\@gobble}\def\beamer@doifinframe{\@firstofone}%
- {\beamer@saveanother\beamer@slideinframe=1\relax%
- \beamer@masterdecode{#1}%
- \beamer@restoreanother}\beamer@donow{#2}%
+ \gdef\beamer@doifnotinframe{\@gobble}%
+ \def\beamer@doifinframe{\@firstofone}%
+ \begingroup
+ \beamer@saveanother
+ \beamer@slideinframe=1\relax%
+ \beamer@masterdecode{#1}%
+ \beamer@restoreanother
+ \endgroup
+ \beamer@donow{#2}%
\beamer@mode\par}
\def\beamer@switchmode<#1>{%
\gdef\beamer@mode{\beamer@switchmode<#1>}%
- \def\beamer@doifnotinframe{%
- \let\next=\beamer@startcomment%
+ \gdef\beamer@doifnotinframe{%
+ \let\next=\beamer@startcomment
\gdef\beamer@closer{\endgroup}%
}%
\def\beamer@doifinframe{%
- \let\next=\relax%
+ \let\next=\relax
\gdef\beamer@closer{}%
- }%
- {\beamer@saveanother\beamer@slideinframe=1\relax%
- \beamer@masterdecode{#1}%
- \beamer@restoreanother}\beamer@donow%
+ }%
+ \begingroup
+ \beamer@saveanother
+ \beamer@slideinframe=1\relax%
+ \beamer@masterdecode{#1}%
+ \beamer@restoreanother
+ \endgroup
+ \beamer@donow
\next}
+\def\beamer@saveanother{\let\beamer@savedif=\ifbeamer@anotherslide}
+\def\beamer@restoreanother{\global\let\ifbeamer@anotherslide=\beamer@savedif}
+
\mode
<all>
@@ -203,79 +228,23 @@
\def\beamer@savemode{\expandafter\beamer@pushmode\expandafter{\beamer@mode}}
\def\beamer@resumemode{\beamer@popmode}
-
-
%
% Stuff needed in both article and presentation version
%
-\def\jobnamebeamerversion{}%
-
-\def\includeslide{\@ifnextchar[{\@includeslide}{\@includeslide[]}}
-\def\@includeslide[#1]#2{%
- \ifx\jobnamebeamerversion\@empty%
- \ClassError{beamer}{Invoke macro "setjobnamebeamerversion" first}{}%
- \else%
- \edef\beamer@args{[{#1,page=\csname beamer@slide#2\endcsname}]{\jobnamebeamerversion}}%
- \expandafter\pgfimage\beamer@args%
- \fi}
-
-\def\setjobnamebeamerversion#1{%
- \def\jobnamebeamerversion{#1}%
- {\makeatletter
- \@input{\jobnamebeamerversion.snm}}
-}
-
-
-
-%
-% Check whether we should initiate transfer to another class (obsolete)
-%
+\newcommand*\jobnamebeamerversion{}
-% Extract class name, if present
-\def\beamer@classname{}
-\def\beamer@classoptions{}
-\def\beamer@classnamename{class}
-\def\beamer@eq{=,}
-\def\beamer@findclassname#1=#2,#3!{
- \def\beamer@temp{#1}
- \ifx\beamer@temp\beamer@classnamename
- \def\beamer@classname{#2}
- \beamer@stripsign#3!
- \fi}
-\def\beamer@stripsign#1!{%
- \def\beamer@temp{#1}
- \ifx\beamer@temp\beamer@eq
- % nothing to do
+\newrobustcmd*\includeslide[2][]{%
+ \ifx\jobnamebeamerversion\@empty
+ \ClassError{beamer}{Invoke macro "setjobnamebeamerversion" first}\@ehc
\else
- \beamer@@stripsign#1!
- \fi
-}
-\def\beamer@@stripsign#1,=,!{
- \def\beamer@classoptions{#1}
- }
-
-\def\beamer@transfer{%
- % Prepare...
- \def\beamer@slide##1##2{\expandafter\gdef\csname
- beamer@slide##1\endcsname{##2}}
-
- \beamer@inpresentationfalse
-
- \def\beamer@currentmode{article}
-
- \common
-
- \edef\beamer@classwhat{[\beamer@classoptions]{\beamer@classname}}
- \expandafter\LoadClass\beamer@classwhat
- \endinput
- }
-
-\expandafter\beamer@findclassname\@classoptionslist,=,!
-\ifx\beamer@classname\@empty
- \let\beamer@transferifnecessary=\relax
-\else
- % Need to transfer to another class soon
- \let\beamer@transferifnecessary=\beamer@transfer
-\fi
-\endinput
+ \edef\beamer@args
+ {[{#1,page=\csname beamer@slide#2\endcsname}]{\jobnamebeamerversion}}%
+ \expandafter\pgfimage\beamer@args
+ \fi}
+\newrobustcmd*\setjobnamebeamerversion[1]{%
+ \gdef\jobnamebeamerversion{#1}%
+ \begingroup
+ \makeatletter
+ \@input{\jobnamebeamerversion.snm}%
+ \endgroup}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
index df9cc7db94b..c69564b681e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
@@ -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,40 +22,36 @@
\fi
\edef\@tempa{%
\noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}%
- \let\beamer@origkverr\KV@errx%
- \let\beamer@origxkverr\XKV@err%
+ \let\beamer@origkverr\KV@errx
+ \let\beamer@origxkverr\XKV@err
\let\KV@errx=\@gobble% never mind
\let\XKV@err=\@gobble% never mind
- \@tempa%
- \let\KV@errx\beamer@origkverr%
- \let\XKV@err\beamer@origxkverr%
+ \@tempa
+ \let\KV@errx\beamer@origkverr
+ \let\XKV@err\beamer@origxkverr
\AtEndOfPackage{\let\@unprocessedoptions\relax}}
-\def\ExecuteOptionsBeamer#1{%
+\newrobustcmd\ExecuteOptionsBeamer[1]{%
\setkeys{\@currname}{#1}}
-\def\DeclareOptionBeamer#1{\@ifnextchar[{\beamer@dokv{#1}}{\beamer@dokv{#1}[]}}
+\newrobustcmd\DeclareOptionBeamer[1]{\@ifnextchar[{\beamer@dokv{#1}}{\beamer@dokv{#1}[]}}
\long\def\beamer@dokv#1[#2]#3{\define@key{\@currname}{#1}[{#2}]{#3}}
-
-\def\beamer@filterclassoptions{
- \def\beamer@filteredclassoptionslist{}
+\def\beamer@filterclassoptions{%
+ \def\beamer@filteredclassoptionslist{}%
\@for\CurrentOption:=\@classoptionslist\do{%
\ifx\CurrentOption\@empty\else
\@expandtwoargs\in@{=}{\CurrentOption}%
\ifin@
\else
\edef\beamer@filteredclassoptionslist{%
- \beamer@filteredclassoptionslist,\CurrentOption}
+ \beamer@filteredclassoptionslist,\CurrentOption}%
\fi
\fi
}%
\let\@classoptionslist=\beamer@filteredclassoptionslist
}
-
-
-\newcommand\defbeameroption{\define@key{beamer@option}}
-\newcommand\setbeameroption{\setkeys{beamer@option}}
-
+\newrobustcmd*\defbeameroption{\define@key{beamer@option}}
+\newrobustcmd*\setbeameroption{\setkeys{beamer@option}}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
index a73cd06444c..e7d0b14ecbc 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
@@ -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,12 +10,20 @@
%
% 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
%
%
+% This variant based on \@ifnextchar does not skip spaces
+% (So like amsmath's \new@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@ifnextcharospec#1#2{%
\def\reserved@a{#1}%
\def\reserved@b{#2}%
@@ -30,111 +39,109 @@
%
% \only
%
-\def\only{\@ifnextchar<{\beamer@only}{\beamer@@only}}
+\newrobustcmd*\only{\@ifnextchar<{\beamer@only}{\beamer@@only}}
\long\def\beamer@only<#1>#2{%
- \def\beamer@doifnotinframe{}\def\beamer@doifinframe{#2}%
- {\beamer@masterdecode{#1}}\beamer@donow}
+ \gdef\beamer@doifnotinframe{}\def\beamer@doifinframe{#2}%
+ \beamer@masterdecode{#1}\beamer@donow}
\long\def\beamer@@only#1{\beamer@ifnextcharospec{\beamer@@@only{#1}}{#1}}
\long\def\beamer@@@only#1<#2>{%
- \def\beamer@doifnotinframe{}\def\beamer@doifinframe{#1}%
- {\beamer@masterdecode{#2}}\beamer@donow}
+ \gdef\beamer@doifnotinframe{}\def\beamer@doifinframe{#1}%
+ \beamer@masterdecode{#2}\beamer@donow}
%
% \alt and \altenv
%
-\def\alt{\@ifnextchar<{\beamer@alt}{\beamer@alttwo}}
+\newrobustcmd*\alt{\@ifnextchar<{\beamer@alt}{\beamer@alttwo}}
\long\def\beamer@alttwo#1#2{\beamer@ifnextcharospec{\beamer@altget{#1}{#2}}{#1}}
\long\def\beamer@altget#1#2<#3>{%
- \def\beamer@doifnotinframe{#2}\def\beamer@doifinframe{#1}%
- {\beamer@masterdecode{#3}}\beamer@donow}
+ \gdef\beamer@doifnotinframe{#2}\def\beamer@doifinframe{#1}%
+ \beamer@masterdecode{#3}\beamer@donow}
\long\def\beamer@alt<#1>#2#3{%
- \def\beamer@doifnotinframe{#3}\def\beamer@doifinframe{#2}%
- {\beamer@masterdecode{#1}}\beamer@donow}
+ \gdef\beamer@doifnotinframe{#3}\def\beamer@doifinframe{#2}%
+ \beamer@masterdecode{#1}\beamer@donow}
-\def\altenv{\@ifnextchar<{\beamer@altenv}{\beamer@@@altenv}}
+\newrobustcmd*\altenv{\@ifnextchar<{\beamer@altenv}{\beamer@@@altenv}}
\def\beamer@altenv<#1>{\beamer@@altenv{<#1>}}
\long\def\beamer@@@altenv#1#2#3#4{\beamer@ifnextcharospec{\beamer@altenvsort{#1}{#2}{#3}{#4}}{\beamer@@altenv{}{#1}{#2}{#3}{#4}}}
\long\def\beamer@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@eoenv{#3}#2}{\long\def\beamer@eoenv{#5}#4}}
-\def\endaltenv{\beamer@eoenv}
+\protected\def\endaltenv{\beamer@eoenv}
%
% \action and actionenv
%
\def\beamer@plus{+}
-\def\action{\@ifnextchar<{\beamer@parsedaction}{\expandafter\beamer@parsedaction\beamer@defaultospec}}
+\newrobustcmd*\action{\@ifnextchar<{\beamer@parsedaction}{\expandafter\beamer@parsedaction\beamer@defaultospec}}
\long\def\beamer@parsedaction<#1>#2{%
- \def\beamer@doifnotinframe{}\def\beamer@doifinframe{}%
- {{\beamer@masterdecode{#1}}}%
- \ifx\beamer@decodefound\beamer@plus%
+ \gdef\beamer@doifnotinframe{}%
+ \def\beamer@doifinframe{}%
+ \beamer@masterdecode{#1}%
+ \ifx\beamer@decodefound\beamer@plus
\long\def\beamer@todo{#2}%
- \else%
- \expandafter\long\expandafter\def\expandafter\beamer@todo%
+ \else
+ \expandafter\long\expandafter\def\expandafter\beamer@todo
\expandafter{\expandafter\uncover\expandafter<\expandafter a\expandafter l\expandafter l\expandafter:\beamer@decodefound>{#2}}%
- \fi%
+ \fi
\expandafter\beamer@processactions\beamer@decaction{}%
\beamer@todo}
\def\beamer@processactions#1{%
- \beamer@ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactions\expandafter{\beamer@todo}#1}}
\long\def\beamer@@processactions#1#2<#3>{%
\expandafter\long\expandafter\def\expandafter\beamer@todo\expandafter{%
\csname#2\endcsname<all:#3>{#1}}%
\beamer@processactions}
-\def\actionenv{\beamer@ifnextcharospec{\beamer@parsedactionenv}{\expandafter\beamer@parsedactionenv\beamer@defaultospec}}
+\newrobustcmd*\actionenv{\beamer@ifnextcharospec{\beamer@parsedactionenv}{\expandafter\beamer@parsedactionenv\beamer@defaultospec}}
\def\beamer@parsedactionenv<#1>{%
- \def\beamer@doifnotinframe{}\def\beamer@doifinframe{}%
- {{\beamer@masterdecode{#1}}}%
- \ifx\beamer@decodefound\beamer@plus%
+ \gdef\beamer@doifnotinframe{}%
+ \def\beamer@doifinframe{}%
+ \beamer@masterdecode{#1}%
+ \ifx\beamer@decodefound\beamer@plus
\def\beamer@todobegin{}%
\def\beamer@todoend{}%
- \else%
+ \else
\edef\beamer@todobegin{\noexpand\begin{uncoverenv}<all:\beamer@decodefound>}%
\def\beamer@todoend{\end{uncoverenv}}%
- \fi%
+ \fi
\expandafter\beamer@processactionsbegin\beamer@decaction{}%
\expandafter\beamer@processactionsend\beamer@decaction{}%
\beamer@todobegin}
-\def\endactionenv{\beamer@todoend}
+\protected\def\endactionenv{\beamer@todoend}
\def\beamer@processactionsbegin#1{%
- \beamer@ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactionsbegin\expandafter{\beamer@todobegin}#1}}
\long\def\beamer@@processactionsbegin#1#2<#3>{%
\def\beamer@todobegin{\begin{#2env}<all:#3>#1}%
\beamer@processactionsbegin}
-
\def\beamer@processactionsend#1{%
- \beamer@ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\expandafter\beamer@@processactionsend\expandafter{\beamer@todoend}#1}}
\long\def\beamer@@processactionsend#1#2<#3>{%
\def\beamer@todoend{#1\end{#2env}}%
\beamer@processactionsend}
-
\def\beamer@defaultospec{<*>}
\def\beamer@emptyospec{<*>}
%
% \temporal
%
-\long\def\temporal<#1>#2#3#4{% past, present, future
- \def\beamer@doifnotinframe{\beamer@picked}\def\beamer@doifinframe{#3}%
- {\beamer@masterdecode{#1}%
- \ifbeamer@localanotherslide\gdef\beamer@picked{#2}\else\gdef\beamer@picked{#4}\fi}\beamer@donow}
-
+\protected\long\def\temporal<#1>#2#3#4{% past, present, future
+ \gdef\beamer@doifnotinframe{\beamer@picked}\def\beamer@doifinframe{#3}%
+ \beamer@masterdecode{#1}%
+ \ifbeamer@anotherslide\gdef\beamer@picked{#2}\else\gdef\beamer@picked{#4}\fi\beamer@donow}
%
-% \newoverlaycommand
+% \beameroriginal
%
\def\beameroriginal#1{\csname @orig\string#1\endcsname}
-
\newcount\beamer@argscount
%
@@ -146,6 +153,9 @@
\def\beamer@newenv<>{\@star@or@long\beamer@new@environment}
\def\beamer@new@environment#1{\@ifnextchar[{\beamer@@newenv{#1}}{\beamer@newenvnoopt{#1}{0}}}
\def\beamer@@newenv#1[#2]{\@ifnextchar[{\beamer@newenvopt{#1}{#2}}{\beamer@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@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@origrenewenvironment=\renewenvironment
\def\renewenvironment{\@ifnextchar<{\beamer@renewenv}{\beamer@origrenewenvironment}}
\def\beamer@renewenv<>#1{%
- \edef\beamer@do{\csname original#1\endcsname=\expandafter\noexpand\csname#1\endcsname}
- \expandafter\let\beamer@do%
- \edef\beamer@do{\csname endoriginal#1\endcsname=\expandafter\noexpand\csname end#1\endcsname}
- \expandafter\let\beamer@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,62 +189,79 @@
\def\beamer@new@command#1{\@ifnextchar[{\beamer@@newcom{#1}}{\beamer@newcomnoopt{#1}{0}}}
\def\beamer@@newcom#1[#2]{\@ifnextchar[{\beamer@newcomopt{#1}{#2}}{\beamer@newcomnoopt{#1}{#2}}}
\long\def\beamer@newcomnoopt#1#2#3{%
- \ifnum#2=0\relax%
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer@sortzero\expandafter{\csname beamerx@\string#1\endcsname}}%
+ \ifnum#2=0\relax
+ \protected\edef#1%
+ {\noexpand\beamer@sortzero\expandafter\noexpand\csname beamerx@\string#1\endcsname}%
\else
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer@sort\expandafter{\csname beamerx@\string#1\endcsname}{#2}}%
- \fi%
- \beamer@argscount=#2\relax%
- \advance\beamer@argscount by 1\relax%
- \expandafter\newcommand\csname beamerx@\string#1\endcsname[\beamer@argscount]{#3}%
+ \protected\edef#1%
+ {\noexpand\beamer@sort\expandafter\noexpand\csname beamerx@\string#1\endcsname{#2}}%
+ \fi
+ \beamer@argscount=#2\relax
+ \advance\beamer@argscount by 1\relax
+ \ifx\l@ngrel@x\relax
+ \expandafter\expandafter\expandafter\newcommand
+ \expandafter\expandafter\expandafter*%
+ \else
+ \expandafter\expandafter\expandafter\newcommand
+ \fi
+ \csname beamerx@\string#1\endcsname[\beamer@argscount]{#3}%
}
\long\def\beamer@newcomopt#1#2[#3]#4{%
- \expandafter\def\expandafter#1\expandafter{\expandafter\beamer@presort\expandafter{\csname beamerx@\string#1\endcsname}{#2}{#3}}%
- \beamer@argscount=#2\relax%
- \advance\beamer@argscount by 1\relax%
- \expandafter\newcommand\csname beamerx@\string#1\endcsname[\beamer@argscount]{#4}%
+ \protected\expandafter\def\expandafter#1\expandafter
+ {\expandafter\beamer@presort\expandafter{\csname beamerx@\string#1\endcsname}{#2}{#3}}%
+ \beamer@argscount=#2\relax
+ \advance\beamer@argscount by 1\relax
+ \ifx\l@ngrel@x\relax
+ \expandafter\expandafter\expandafter\newcommand
+ \expandafter\expandafter\expandafter*%
+ \else
+ \expandafter\expandafter\expandafter\newcommand
+ \fi
+ \csname beamerx@\string#1\endcsname[\beamer@argscount]{#4}%
}
\let\beamer@origrenewcommand=\renewcommand
\def\renewcommand{\@ifnextchar<{\beamer@renewcom}{\beamer@origrenewcommand}}
\def\beamer@renewcom<>#1{%
- \expandafter\def\expandafter\beamer@name\expandafter{\csname @orig\string#1\endcsname}%
- \expandafter\let\beamer@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@presort#1#2#3{%
- \long\def\beamer@todo{#1}%
+ \def\beamer@todo{#1}%
\def\beamer@ospec{}%
- \beamer@argscount=#2\relax%
+ \beamer@argscount=#2\relax
\beamer@prechecka{#3}}
\long\def\beamer@prechecka#1{\@ifnextchar<{\beamer@preget{#1}}{\beamer@precheckb{#1}}}
\long\def\beamer@preget#1<#2>{\def\beamer@ospec{<#2>}\beamer@precheckb{#1}}
\long\def\beamer@precheckb#1{\@ifnextchar[{\beamer@pregetb}{\beamer@pregetb[{#1}]}}
\long\def\beamer@pregetb[#1]{%
- \expandafter\long\expandafter\def\expandafter\beamer@todo\expandafter{\beamer@todo{#1}}%
- \advance\beamer@argscount by-1\relax%
- \beamer@parseargs%
+ \expandafter\def\expandafter\beamer@todo\expandafter{\beamer@todo{#1}}%
+ \advance\beamer@argscount by-1\relax
+ \beamer@parseargs
}
\def\beamer@sortzero#1{\beamer@ifnextcharospec{\beamer@sortzeroread{#1}}{#1{}}}
\def\beamer@sortzeroread#1<#2>{#1{<#2>}}
-
\def\beamer@sort#1#2{%
- \long\def\beamer@todo{#1}%
+ \def\beamer@todo{#1}%
\def\beamer@ospec{}%
- \beamer@argscount=#2\relax%
+ \beamer@argscount=#2\relax
\beamer@parseargs}
\def\beamer@parseargs{%
- \ifnum\beamer@argscount=0\relax%
- \let\next=\beamer@finalargscheck%
- \else%
- \let\next=\beamer@lookforarg%
- \fi%
+ \ifnum\beamer@argscount=0\relax
+ \let\next=\beamer@finalargscheck
+ \else
+ \let\next=\beamer@lookforarg
+ \fi
\next}
\def\beamer@lookforarg{%
\@ifnextchar<\beamer@foundspec\beamer@readarg}
@@ -241,8 +270,8 @@
\beamer@lookforarg}
\long\def\beamer@readarg#1{%
\expandafter\long\expandafter\def\expandafter\beamer@todo\expandafter{\beamer@todo{#1}}%
- \advance\beamer@argscount by-1\relax%
- \beamer@parseargs%
+ \advance\beamer@argscount by-1\relax
+ \beamer@parseargs
}
\def\beamer@finalargscheck{\beamer@ifnextcharospec\beamer@finalspec\beamer@finalnospec}
@@ -250,29 +279,29 @@
\def\beamer@finalnospec{%
\expandafter\beamer@todo\expandafter{\beamer@ospec}}
-
-
-
\mode
<presentation>
-
% commands for smuggling skips past
\newskip\beamer@lastskipcover
\def\beamer@smuggle#1{%
{}%
- \beamer@lastskipcover=\lastskip%
+ \beamer@lastskipcover=\lastskip
\edef\beamer@lastskiptext{\the\lastskip}%
- \ifx\beamer@lastskiptext\beamer@zeropt\else%
- \ifvmode\unskip\fi\ifhmode\unskip\fi\fi%
+ \ifx\beamer@lastskiptext\beamer@zeropt
+ \else
+ \ifvmode\unskip\fi
+ \ifhmode\unskip\fi
+ \fi
#1%
- \ifx\beamer@lastskiptext\beamer@zeropt\else%
- \ifvmode\vskip\beamer@lastskipcover\fi\ifhmode\hskip\beamer@lastskipcover\fi\fi%
+ \ifx\beamer@lastskiptext\beamer@zeropt
+ \else
+ \ifvmode\vskip\beamer@lastskipcover\fi
+ \ifhmode\hskip\beamer@lastskipcover\fi
+ \fi
}
-
-
%
% Uncovering management
%
@@ -307,54 +336,52 @@
\the\beamer@coveringdepth\endcsname}%
\color{.}%
}}}%
- \ifnum\beamer@slideinframe<\beamer@minimum%ok, at beginning
- {%
- \beamer@saveanother%
- \advance\beamer@minimum by-\beamer@slideinframe%
- \beamer@slideinframe=\beamer@minimum%
- \beamer@uncoverbeforeactions%
- \beamer@restoreanother%
- }%
- \else%
- {%
- \beamer@saveanother%
- \advance\beamer@slideinframe by-\beamer@minimum%
- \beamer@uncoverafteractions%
- \beamer@restoreanother%
- }%
- \fi%
- \beamer@do%
+ \ifnum\beamer@slideinframe<\beamer@minimum %ok, at beginning
+ \begingroup
+ \beamer@saveanother
+ \advance\beamer@minimum by-\beamer@slideinframe
+ \beamer@slideinframe=\beamer@minimum
+ \beamer@uncoverbeforeactions
+ \beamer@restoreanother
+ \endgroup
+ \else
+ \begingroup
+ \beamer@saveanother
+ \advance\beamer@slideinframe by-\beamer@minimum
+ \beamer@uncoverafteractions
+ \beamer@restoreanother
+ \endgroup
+ \fi
+ \beamer@do
}%
}
\def\beamer@endcovered{%
\beamer@smuggle{%
- \csname beamer@doafter\the\beamer@coveringdepth\endcsname%
- \global\advance\beamer@coveringdepth by -1\relax%
+ \csname beamer@doafter\the\beamer@coveringdepth\endcsname
+ \global\advance\beamer@coveringdepth by -1\relax
}%
}%
-
\define@key{beamer@mixin}{still covered}{\def\beamer@uncoverbeforeactions{\ignorespaces#1}}
\define@key{beamer@mixin}{again covered}{\def\beamer@uncoverafteractions{\ignorespaces#1}}
\define@key{beamer@mixin}{invisible}[]{%
- \def\beamer@uncoverbeforeactions{\ignorespaces}
+ \def\beamer@uncoverbeforeactions{\ignorespaces}%
\def\beamer@uncoverafteractions{\ignorespaces}}
\define@key{beamer@mixin}{transparent}[15]{%
- \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1->{#1}}
+ \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1->{#1}}%
\def\beamer@uncoverafteractions{\ignorespaces\opaqueness<1->{#1}}}
\define@key{beamer@mixin}{dynamic}[]{%
- \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}
+ \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}%
\def\beamer@uncoverafteractions{\ignorespaces\opaqueness<1-2>{10}\opaqueness<3->{5}}}
\define@key{beamer@mixin}{highly dynamic}[]{%
- \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}
+ \def\beamer@uncoverbeforeactions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}%
\def\beamer@uncoverafteractions{\ignorespaces\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}}}
-
-\def\setbeamercovered#1{%
+\newrobustcmd*\setbeamercovered[1]{%
\setkeys{beamer@mixin}{invisible}%
\setkeys{beamer@mixin}{#1}}
@@ -369,32 +396,30 @@
\beamer@coveringdepth=0\relax
-
\mode
<article>
{
- \let\setbeamercovered=\@gobble
+ \newrobustcmd*\setbeamercovered[1]{}
}
-
-
-
%
% Pausing
%
+\def\beamer@endpause{}
+
\newenvironment{beamer@framepauses}%internal
{%
- \global\c@beamerpauses=1\relax%
+ \setcounter{beamerpauses}{1}%
\gdef\beamer@endpause{}%
}
{\beamer@endpause}
-\newcommand{\beamer@@pause}[1][]{%
- \beamer@ifempty{#1}%
- {\global\advance\c@beamerpauses by1\relax}%
- {\global\c@beamerpauses=#1\relax}%
- \onslide<\c@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@visibleonslide\@gobble}{\beamer@mainonslide}}}
+ \newrobustcmd*\onslide{\@ifstar{\only}{\@ifnextchar+{\expandafter\beamer@visibleonslide\@gobble}{\beamer@mainonslide}}}
\newcommand<>{\beamer@visibleonslide}{%
\@ifnextchar\bgroup
@@ -446,14 +469,11 @@
\mode
<article>
{
- \newcommand\beamer@@pause[1][]{}
+ \newrobustcmd\beamer@@pause[1][]{}
\newcommand<>{\beamer@noargsonslide}{}
\newcommand<>{\beamer@noargsvisibleonslide}{}
}
-
-
-
%
% Make item overlays
%
@@ -464,26 +484,26 @@
\def\item{%
\@ifnextchar\relax\beamer@origitem{%
- \ifhmode%
- \unskip\unskip\par%
- \fi%
+ \ifhmode
+ \unskip\unskip\par
+ \fi
\beamer@closeitem\gdef\beamer@closeitem{}%
\@ifnextchar<{\beamer@parseitem}{\beamer@itemcheckopt}}}
\def\beamer@itemcheckopt{\@ifnextchar[{\beamer@itemcheckopta}{%
- \ifx\beamer@defaultospec\beamer@emptyospec%
- \let\next=\beamer@callorigitem%
- \else%
- \let\next=\beamer@defaultparse%
- \fi%
- \next%
+ \ifx\beamer@defaultospec\beamer@emptyospec
+ \let\next=\beamer@callorigitem
+ \else
+ \let\next=\beamer@defaultparse
+ \fi
+ \next
}}
\def\beamer@defaultparse{\expandafter\beamer@parseitem\beamer@defaultospec}
\long\def\beamer@itemcheckopta[#1]{\@ifnextchar<{\beamer@itemreverse[{#1}]}{%
- \ifx\beamer@defaultospec\beamer@emptyospec%
- \let\next=\beamer@callorigitem%
- \else%
- \let\next=\beamer@defaultparse%
- \fi%
+ \ifx\beamer@defaultospec\beamer@emptyospec
+ \let\next=\beamer@callorigitem
+ \else
+ \let\next=\beamer@defaultparse
+ \fi
\next[{#1}]}}
\long\def\beamer@itemreverse[#1]<#2>{\beamer@parseitem<#2>[{#1}]}
@@ -495,11 +515,10 @@
%% Local change inside actionenv should survive, and should be
%% always false
\@noparitemfalse}%
-\begin{actionenv}<#1>\beamer@callorigitem}
+ \begin{actionenv}<#1>\beamer@callorigitem}
-
-\def\beamerdefaultoverlayspecification#1{%
- \beamer@ifempty{#1}%
+\newrobustcmd*\beamerdefaultoverlayspecification[1]{%
+ \ifblank{#1}%
{%
\def\beamer@gdefaultospec{<*>}%
\def\beamer@defaultospec{<*>}}%
@@ -510,23 +529,22 @@
}
\beamerdefaultoverlayspecification{}
-
\newcount\beamer@trivlistdepth
\beamer@trivlistdepth=0\relax
\let\beamer@orig@trivlist=\@trivlist
\def\@trivlist{%
- \global\advance\beamer@trivlistdepth by1\relax%
- \expandafter\global\expandafter\let\csname beamer@closeitem\the\beamer@trivlistdepth\endcsname=\beamer@closeitem%
+ \global\advance\beamer@trivlistdepth by1\relax
+ \expandafter\global\expandafter\let\csname beamer@closeitem\the\beamer@trivlistdepth\endcsname=\beamer@closeitem
\gdef\beamer@closeitem{}%
- \beamer@orig@trivlist%
+ \beamer@orig@trivlist
}
\let\beamer@origendtrivlist=\endtrivlist
\def\endtrivlist{%
- \beamer@closeitem%
+ \beamer@closeitem
\expandafter\global\expandafter\let\expandafter\beamer@closeitem\expandafter=\csname
- beamer@closeitem\the\beamer@trivlistdepth\endcsname%
- \global\advance\beamer@trivlistdepth by-1\relax%
+ beamer@closeitem\the\beamer@trivlistdepth\endcsname
+ \global\advance\beamer@trivlistdepth by-1\relax
\beamer@origendtrivlist}
\def\beamer@closeitem{}
@@ -534,7 +552,6 @@
\let\beamer@list=\list
\let\beamer@@trivlist=\@trivlist
-
\mode
<article>
{
@@ -545,16 +562,14 @@
\def\beamer@item{\@ifnextchar[\beamer@@@item\beamer@origitem}
\def\beamer@@@item[#1]{\@ifnextchar<{\beamer@@@@item[{#1}]}{\beamer@origitem[{#1}]}}
\def\beamer@@@@item[#1]<#2>{\beamer@origitem[{#1}]}
+ \newrobustcmd*\beamerdefaultoverlayspecification[1]{}
}
}
-
-
%
% Overlay commands
%
-
\mode
<all>
{
@@ -572,9 +587,9 @@
\long\def\beamer@makecovered#1{\beamer@startcovered#1\beamer@endcovered}
\long\def\beamer@reallymakeinvisible#1{\beamer@begininvisible#1\beamer@endinvisible}
-\newcommand{\uncover}{\alt{\beamer@fakeinvisible}{\beamer@makecovered}}
-\newcommand{\visible}{\alt{\beamer@fakeinvisible}{\beamer@reallymakeinvisible}}
-\newcommand{\invisible}{\alt{\beamer@reallymakeinvisible}{\beamer@fakeinvisible}}
+\newrobustcmd*{\uncover}{\alt{\beamer@fakeinvisible}{\beamer@makecovered}}
+\newrobustcmd*{\visible}{\alt{\beamer@fakeinvisible}{\beamer@reallymakeinvisible}}
+\newrobustcmd*{\invisible}{\alt{\beamer@reallymakeinvisible}{\beamer@fakeinvisible}}
\newenvironment{visibleenv}{\begin{altenv}{\beamer@spacingcover}{\beamer@spacingcover}{\beamer@begininvisible}{\beamer@endinvisible}}{\end{altenv}}
\newenvironment{invisibleenv}{\begin{altenv}{\beamer@begininvisible}{\beamer@endinvisible}{\beamer@spacingcover}{\beamer@spacingcover}}{\end{altenv}}
\newenvironment{uncoverenv}{\begin{altenv}{\beamer@spacingcover}{\beamer@spacingcover}{\beamer@startcovered}{\beamer@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@addto@macro\beamer@lastminutepatches{
+ \g@addto@macro\beamer@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@animht=#1\relax%
- \beamer@animwd=#2\relax%
- \setbox\beamer@areabox=\vbox to#2\bgroup%
- \strut\begin{minipage}[t]{#1}%
+ \beamer@animht=#1\relax
+ \beamer@animwd=#2\relax
+ \setbox\beamer@areabox=\vbox to\beamer@animwd\bgroup
+ \strut\begin{minipage}[t]{\beamer@animht}%
% Make the minipage behave like the main part of the slide
\normalfont
\raggedright
}
{%
- \end{minipage}\vfil%
- \egroup%
- \wd\beamer@areabox=\beamer@animht%
- \ht\beamer@areabox=\beamer@animwd%
- \dp\beamer@areabox=0pt%
- \box\beamer@areabox%
+ \end{minipage}\vfil
+ \egroup
+ \wd\beamer@areabox=\beamer@animht
+ \ht\beamer@areabox=\beamer@animwd
+ \dp\beamer@areabox=0pt %
+ \box\beamer@areabox
}
\mode
@@ -660,40 +671,39 @@
\newenvironment{overlayarea}[2]{}{}% no effect
}
-
\newenvironment{overprint}[1][\textwidth]{%
- \let\beamer@noargsonslide=\beamer@onslide%
- \let\beamer@noargsvisibleonslide=\beamer@onslide%
- \beamer@animht=0pt%
- \beamer@animdp=0pt%
- \beamer@animwd=#1\relax%
- \setbox\beamer@animcurrent=\box\beamer@animshowbox% makes animshowbox empty
+ \let\beamer@noargsonslide=\beamer@onslide
+ \let\beamer@noargsvisibleonslide=\beamer@onslide
+ \beamer@animht=0pt\relax
+ \beamer@animdp=0pt\relax
+ \beamer@animwd=#1\relax
+ \setbox\beamer@animcurrent=\box\beamer@animshowbox % makes animshowbox empty
\setbox\beamer@animcurrent=\hbox{}%
\def\beamer@endaction{}%
}{%
- \beamer@endaction%
- \ifvoid\beamer@animshowbox\setbox\beamer@animshowbox=\hbox{}\fi%
- \ht\beamer@animshowbox=\beamer@animht%
- \dp\beamer@animshowbox=\beamer@animdp%
- \wd\beamer@animshowbox=\beamer@animwd%
- \box\beamer@animshowbox%
+ \beamer@endaction
+ \ifvoid\beamer@animshowbox\setbox\beamer@animshowbox=\hbox{}\fi
+ \ht\beamer@animshowbox=\beamer@animht
+ \dp\beamer@animshowbox=\beamer@animdp
+ \wd\beamer@animshowbox=\beamer@animwd
+ \box\beamer@animshowbox
}
\def\beamer@onslide<#1>{%
- \beamer@endaction%
+ \beamer@endaction
\alt<#1>{%
- \ifvoid\beamer@animshowbox\else\ClassError{beamer}{Overprints may not overlap}{}\fi%
+ \ifvoid\beamer@animshowbox\else\ClassError{beamer}{Overprints may not overlap}{}\fi
\def\beamer@endaction{%
\end{minipage}%
- \egroup%
- \ifdim\beamer@animht<\ht\beamer@animcurrent\beamer@animht=\ht\beamer@animcurrent\fi%
- \ifdim\beamer@animdp<\dp\beamer@animcurrent\beamer@animdp=\dp\beamer@animcurrent\fi%
- \setbox\beamer@animshowbox=\copy\beamer@animcurrent}
+ \egroup
+ \ifdim\beamer@animht<\ht\beamer@animcurrent\beamer@animht=\ht\beamer@animcurrent\fi
+ \ifdim\beamer@animdp<\dp\beamer@animcurrent\beamer@animdp=\dp\beamer@animcurrent\fi
+ \setbox\beamer@animshowbox=\copy\beamer@animcurrent}%
}%
{\def\beamer@endaction{%
\end{minipage}%
- \egroup%
- \ifdim\beamer@animht<\ht\beamer@animcurrent\beamer@animht=\ht\beamer@animcurrent\fi%
+ \egroup
+ \ifdim\beamer@animht<\ht\beamer@animcurrent\beamer@animht=\ht\beamer@animcurrent\fi
\ifdim\beamer@animdp<\dp\beamer@animcurrent\beamer@animdp=\dp\beamer@animcurrent\fi}%
}%
\setbox\beamer@animcurrent=\vbox\bgroup\begin{minipage}[t]{\beamer@animwd}%
@@ -724,7 +734,7 @@
\def\beamer@transdir{}%
\def\beamer@dur{}%
\setkeys{beamertrans}{#1}%
- \edef\beamer@temp{{pdfpagetransition={#2 \beamer@transdir\space\beamer@dur}}}
+ \edef\beamer@temp{{pdfpagetransition={#2 \beamer@transdir\space\beamer@dur}}}%
\expandafter\hypersetup\beamer@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@slideinframe<#1\relax%
- #3=#4\relax%
- \else%
- \ifnum\beamer@slideinframe<#2\relax%
- #3=#4\relax%
- #3=-#3\relax%
- \advance#3 by#5\relax%
- \beamer@animationtempa=#2\relax%
- \advance\beamer@animationtempa by-#1%
- \ifnum\beamer@animationtempa>0%
- \divide#3 by\beamer@animationtempa%
- \fi%
- \beamer@animationtempa=\beamer@slideinframe%
- \advance\beamer@animationtempa by-#1%
- \multiply#3 by\beamer@animationtempa%
- \advance#3 by#4%
+ \ifnum\beamer@slideinframe<#1\relax
+ #3=#4\relax
+ \else
+ \ifnum\beamer@slideinframe<#2\relax
+ #3=#4\relax
+ #3=-#3\relax
+ \advance#3 by#5\relax
+ \beamer@animationtempa=#2\relax
+ \advance\beamer@animationtempa by-#1 %
+ \ifnum\beamer@animationtempa>0 %
+ \divide#3 by\beamer@animationtempa
+ \fi
+ \beamer@animationtempa=\beamer@slideinframe
+ \advance\beamer@animationtempa by-#1 %
+ \multiply#3 by\beamer@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
%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty
index 10532b7e1a8..1b45eae7384 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaserequires.sty
@@ -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
%
-\RequirePackage{beamerbasecompatibility}
+
% Fixes other packages
+\RequirePackage{beamerbasecompatibility}
-\RequirePackage{beamerbasefont}
% Font stuff
+\RequirePackage{beamerbasefont}
-\RequirePackage{beamerbasetranslator}
% Support for translations
+\RequirePackage{beamerbasetranslator}
-\RequirePackage{beamerbasemisc}
% Miscellaneous commands
+\RequirePackage{beamerbasemisc}
-\RequirePackage{beamerbasetwoscreens}
% Stuff for using two screens
+\RequirePackage{beamerbasetwoscreens}
-\RequirePackage{beamerbaseoverlay}
% Overlay stuff
+\RequirePackage{beamerbaseoverlay}
-\RequirePackage{beamerbasetitle}
% Commands for constructing the title page
+\RequirePackage{beamerbasetitle}
-\RequirePackage{beamerbasesection}
% Parts, sections, subsections, appendix
+\RequirePackage{beamerbasesection}
-\RequirePackage{beamerbaseframe}
% Commands for constructing frames
-
+\RequirePackage{beamerbaseframe}
\RequirePackage{beamerbaseverbatim}
-% Commands for constructing frames
-
\RequirePackage{beamerbaseframesize}
-% Commands for constructing frames
-\RequirePackage{beamerbaseframecomponents}
% Headlines, sidebars, columns
+\RequirePackage{beamerbaseframecomponents}
-\RequirePackage{beamerbasecolor}
% Color management
+\RequirePackage{beamerbasecolor}
-\RequirePackage{beamerbasenotes}
% Commands for adding notes
+\RequirePackage{beamerbasenotes}
+% Table of contents formatting
\RequirePackage{beamerbasetoc}
-% Table of Contents Format
-\RequirePackage{beamerbasetemplates}
% For default templates
+\RequirePackage{beamerbasetemplates}
-\RequirePackage{beamerbaselocalstructure}
% Commands for local structure like alert, itemize, etc.
+\RequirePackage{beamerbaselocalstructure}
-\RequirePackage{beamerbasenavigation}
% Navigation buttons
+\RequirePackage{beamerbasenavigation}
-\RequirePackage{beamerbasetheorems}
% Theorems
+\RequirePackage{beamerbasetheorems}
-\RequirePackage{beamerbasethemes}
% Commands for including and building themes
-
+\RequirePackage{beamerbasethemes}
\mode
<all>
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
index 3dbe99247de..01ceaf4bff1 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
@@ -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@lecture}
\let\insertlecturenumber=\thelecture
-\newcommand\lecture{\@dblarg\beamer@lecture}
-\long\def\beamer@lecture[#1]#2#3{
+\newrobustcmd*\lecture{\@dblarg\beamer@lecture}
+\long\def\beamer@lecture[#1]#2#3{%
\beamer@savemode
- \mode<all>
- \refstepcounter{lecture}
- \def\beamer@currentlecturelabel{#3}
+ \mode<all>%
+ \refstepcounter{lecture}%
+ \def\beamer@currentlecturelabel{#3}%
\@onelevel@sanitize\beamer@currentlecturelabel
- \def\beamer@lecturename{#2}
- \def\beamer@shortlecturename{#1}
+ \def\beamer@lecturename{#2}%
+ \def\beamer@shortlecturename{#1}%
\ifx\beamer@onlylecture\@empty
\else
\expandafter\beamer@if@in@clist@TF\expandafter\beamer@onlylecture
\expandafter{\beamer@currentlecturelabel}%
- {\beamer@inlecturetrue}
- {\beamer@inlecturefalse}
+ {\beamer@inlecturetrue}%
+ {\beamer@inlecturefalse}%
\fi
\beamer@atbeginlecture
\beamer@resumemode
}
-
\mode
<all>
{
- \long\def\AtBeginLecture#1{%
+ \newrobustcmd\AtBeginLecture[1]{%
\def\beamer@atbeginlecture{#1}}
\AtBeginLecture{}
- \newcommand\includeonlylecture[1]{%
+ \newrobustcmd*\includeonlylecture[1]{%
\def\beamer@onlylecture{#1}%
\@onelevel@sanitize\beamer@onlylecture
}
@@ -80,20 +79,19 @@
\includeonlylecture{}
}
-\newcommand\insertlecture{\beamer@lecturename}
-\newcommand\insertshortlecture[1][]{%
- {%
+\newrobustcmd*\insertlecture{\beamer@lecturename}
+\newrobustcmd*\insertshortlecture[1][]{%
+ \begingroup
\beamer@setupshort{#1}%
\beamer@insertshort{\beamer@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@part}{\beamer@gobbleoptional}}
\long\def\beamer@part[#1]#2{%
- \beamer@savemode%
+ \beamer@savemode
\mode<all>%
- \ifbeamer@inlecture%
+ \ifbeamer@inlecture
\refstepcounter{part}%
\def\beamer@partname{#2}%
\def\beamer@partnameshort{#1}%
@@ -119,44 +117,43 @@
\protect\beamer@sectionpages{\the\beamer@sectionstartpage}{\the\beamer@tempcount}}}%
\addtocontents{nav}{\protect\headcommand{%
\protect\beamer@subsectionpages{\the\beamer@subsectionstartpage}{\the\beamer@tempcount}}}%
- \beamer@partstartpage=\c@page%
- \beamer@sectionstartpage=\c@page%
- \beamer@subsectionstartpage=\c@page%
+ \beamer@partstartpage=\c@page
+ \beamer@sectionstartpage=\c@page
+ \beamer@subsectionstartpage=\c@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@writebookmark{\the\c@section}{#1}{Outline\the\c@part}{1}{toc}%
- \hyper@anchorstart{Outline\the\c@part}\hyper@anchorend%
- \beamer@atbeginpart%
+ \hyper@anchorstart{Outline\the\c@part}\hyper@anchorend
+ \beamer@atbeginpart
\fi%
\beamer@resumemode}%
\def\insertpart{}
\def\partlinkshort{{Navigation1}{}}
-\def\insertromanpartnumber{\@Roman\c@part}
-\def\insertpartnumber{\@arabic\c@part}
+\newrobustcmd*\insertromanpartnumber{\@Roman\c@part}
+\newrobustcmd*\insertpartnumber{\@arabic\c@part}
-\newcommand\insertshortpart[1][]{%
- {%
+\newrobustcmd*\insertshortpart[1][]{%
+ \begingroup
\beamer@setupshort{#1}%
\beamer@insertshort{\expandafter\hyperlink\partlinkshort}%
- }}
+ \endgroup}
\mode
<all>
{
- \long\def\AtBeginPart#1{%
+ \newrobustcmd\AtBeginPart[1]{%
\def\beamer@atbeginpart{#1}}
\AtBeginPart{}
}
-
\mode
<article>
{
@@ -166,7 +163,6 @@
\fi
}
-
%
% Section Definitions
%
@@ -186,7 +182,7 @@
\mode<all>%
\ifbeamer@inlecture
\refstepcounter{section}%
- \beamer@ifempty{#2}%
+ \ifblank{#2}%
{\long\def\secname{#1}\long\def\lastsection{#1}}%
{\global\advance\beamer@tocsectionnumber by 1\relax%
\long\def\secname{#2}%
@@ -195,7 +191,7 @@
{\the\beamer@tocsectionnumber}}}%
{\let\\=\relax\xdef\sectionlink{{Navigation\the\c@page}{\noexpand\secname}}}%
\beamer@tempcount=\c@page\advance\beamer@tempcount by -1%
- \beamer@ifempty{#1}{}{%
+ \ifblank{#1}{}{%
\addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c@section}{#1}{\the\c@page}{\secname}{\the\c@part}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer@sectionpages{\the\beamer@sectionstartpage}{\the\beamer@tempcount}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer@subsectionpages{\the\beamer@subsectionstartpage}{\the\beamer@tempcount}}}%
@@ -213,7 +209,7 @@
\def\lastsubsection{}%
\Hy@writebookmark{\the\c@section}{\secname}{Outline\the\c@part.\the\c@section}{2}{toc}%
\hyper@anchorstart{Outline\the\c@part.\the\c@section}\hyper@anchorend%
- \beamer@ifempty{#2}{\beamer@atbeginsections}{\beamer@atbeginsection}%
+ \ifblank{#2}{\beamer@atbeginsections}{\beamer@atbeginsection}%
\fi%
\beamer@resumemode}%
\def\insertsection{}
@@ -230,7 +226,7 @@
\mode
<all>
{
- \def\AtBeginSection{\@ifnextchar[{\beamer@AtBeginSection}{\beamer@@AtBeginSection}}
+ \newrobustcmd*\AtBeginSection{\@ifnextchar[{\beamer@AtBeginSection}{\beamer@@AtBeginSection}}
\long\def\beamer@@AtBeginSection#1{\beamer@AtBeginSection[{#1}]{#1}}
\long\def\beamer@AtBeginSection[#1]#2{%
\def\beamer@atbeginsection{#2}%
@@ -260,14 +256,14 @@
\def\beamer@@subsection{\@ifnextchar*\beamer@@ssubsection\beamer@@@subsection}
\long\def\beamer@@ssubsection*#1{\beamer@subsection[{#1}]{}}
%\long\def\beamer@@ssubsection*#1{%
-% \beamer@ifempty{#1}{\beamer@untitledsubsection}{\beamer@subsection[{#1}]{}}}
+% \ifblank{#1}{\beamer@untitledsubsection}{\beamer@subsection[{#1}]{}}}
\def\beamer@@@subsection#1{\beamer@subsection[{#1}]{#1}}
\def\beamer@subsection[#1]#2{%
\beamer@savemode%
\mode<all>%
\ifbeamer@inlecture%
\refstepcounter{subsection}%
- \beamer@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@writebookmark{\the\c@subsection}{#2}{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@page}{3}{toc}%
\hyper@anchorstart{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@page}\hyper@anchorend%
- \beamer@ifempty{#2}{\beamer@atbeginsubsections}{\beamer@atbeginsubsection}%
+ \ifblank{#2}{\beamer@atbeginsubsections}{\beamer@atbeginsubsection}%
\fi%
\beamer@resumemode}
\def\insertsubsection{}
@@ -304,7 +300,7 @@
\mode
<all>
{
- \def\AtBeginSubsection{\@ifnextchar[{\beamer@AtBeginSubsection}{\beamer@@AtBeginSubsection}}
+ \newrobustcmd*\AtBeginSubsection{\@ifnextchar[{\beamer@AtBeginSubsection}{\beamer@@AtBeginSubsection}}
\long\def\beamer@@AtBeginSubsection#1{\beamer@AtBeginSubsection[{#1}]{#1}}
\long\def\beamer@AtBeginSubsection[#1]#2{%
\def\beamer@atbeginsubsection{#2}%
@@ -337,7 +333,7 @@
\mode<all>%
\ifbeamer@inlecture%
\refstepcounter{subsubsection}%
- \beamer@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@writebookmark{\the\c@subsubsection}{#2}{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@subsubsection.\the\c@page}{4}{toc}%
\hyper@anchorstart{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@subsubsection.\the\c@page}\hyper@anchorend%
- \beamer@ifempty{#2}{\beamer@atbeginsubsubsections}{\beamer@atbeginsubsubsection}%
+ \ifblank{#2}{\beamer@atbeginsubsubsections}{\beamer@atbeginsubsubsection}%
\fi%
\beamer@resumemode}
\def\insertsubsubsection{}
@@ -360,7 +356,7 @@
\mode
<all>
{
- \def\AtBeginSubsubsection{\@ifnextchar[{\beamer@AtBeginSubsubsection}{\beamer@@AtBeginSubsubsection}}
+ \newrobustcmd*\AtBeginSubsubsection{\@ifnextchar[{\beamer@AtBeginSubsubsection}{\beamer@@AtBeginSubsubsection}}
\long\def\beamer@@AtBeginSubsubsection#1{\beamer@AtBeginSubsubsection[{#1}]{#1}}
\long\def\beamer@AtBeginSubsubsection[#1]#2{%
\def\beamer@atbeginsubsubsection{#2}%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty
index 0a4b2108e5b..d25e83bdce1 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetemplates.sty
@@ -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@sbttoks
\newcommand<>\defbeamertemplate{
- \beamer@ifempty{#1}
+ \ifblank{#1}
{\def\beamer@@oar{<presentation>}}
{\def\beamer@@oar{#1}}\beamer@defbeamertemplate}
\def\beamer@defbeamertemplate{\@ifstar{\beamer@sbttrue\beamer@sbtoo}{\beamer@sbtfalse\beamer@sbtoo}}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty
index 7326e08fc86..19f672f8bdd 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasethemes.sty
@@ -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@calltheme#1#2#3{%
- \def\beamer@themelist{#2}
+ \def\beamer@themelist{#2}%
\@for\beamer@themename:=\beamer@themelist\do
{\usepackage[{#1}]{#3\beamer@themename}}}
- \newcommand\usetheme[2][]{\beamer@calltheme{#1}{#2}{beamertheme}}
- \newcommand\usecolortheme[2][]{\beamer@calltheme{#1}{#2}{beamercolortheme}}
- \newcommand\usefonttheme[2][]{\beamer@calltheme{#1}{#2}{beamerfonttheme}}
- \newcommand\useoutertheme[2][]{\beamer@calltheme{#1}{#2}{beameroutertheme}}
- \newcommand\useinnertheme[2][]{\beamer@calltheme{#1}{#2}{beamerinnertheme}}
+ \newrobustcmd*\usetheme[2][]{\beamer@calltheme{#1}{#2}{beamertheme}}
+ \newrobustcmd*\usecolortheme[2][]{\beamer@calltheme{#1}{#2}{beamercolortheme}}
+ \newrobustcmd*\usefonttheme[2][]{\beamer@calltheme{#1}{#2}{beamerfonttheme}}
+ \newrobustcmd*\useoutertheme[2][]{\beamer@calltheme{#1}{#2}{beameroutertheme}}
+ \newrobustcmd*\useinnertheme[2][]{\beamer@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
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty
index 7cf3519156d..bc0d95ea381 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetheorems.sty
@@ -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@begintheorem[1][]{%
- \beamer@ifempty{#1}
+ \ifblank{#1}
{\def\inserttheoremaddition{}}
{\def\inserttheoremaddition{#1}}
\usebeamertemplate{theorem begin}#2}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
index 6bd7a0010c4..7f2e998c03e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty
@@ -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@insttitle#1{{\donotcoloroutermaths$^{#1}$}}
+\def\beamer@insttitle#1{\textsuperscript{#1}}
\def\beamer@andtitle{\quad}
\def\beamer@instother#1{}
\def\beamer@andother{\unskip, }
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
index 7e3c3aee688..cf591367cda 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
@@ -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@key{beamertoc}{subsectionstyle}{\beamer@toc@subsectionstyle{#1}}
\define@key{beamertoc}{subsubsectionstyle}{\beamer@toc@subsubsectionstyle{#1}}
\def\beamer@toc@process#1#2#3/#4/{%
- \beamer@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@toc@sprocess#1#2#3#4/#5/#6/{%
- \beamer@ifempty{#5}%
+ \ifblank{#5}%
{\def#1{#4}\def#2{#4}\def#3{#4}}
- {\beamer@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@toc@ssprocess#1#2#3#4#5/#6/#7/#8/{%
- \beamer@ifempty{#6}%
+ \ifblank{#6}%
{\def#1{#5}\def#2{#5}\def#3{#5}\def#4{#5}}
- {\beamer@ifempty{#7}
+ {\ifblank{#7}
{\def#1{#5}\def#2{#6}\def#3{#6}\def#4{#6}\@gobble}
- {\beamer@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@tocifnothide#1{\csname beamer@tocinvcheck@#1\endcsname}
\let\beamer@tocinvcheck@hide\@gobble
+\let\beamer@tocinvcheck@show\@firstofone
\def\beamer@hidetext{hide}
@@ -202,6 +204,9 @@
\mode
<article>
{
+ \long\def\beamer@sectionintoc#1#2#3#4#5{}
+ \long\def\beamer@subsectionintoc#1#2#3#4#5#6{}
+ \long\def\beamer@subsubsectionintoc#1#2#3#4#5#6#7{}
\AtBeginDocument{
\let\beamer@origtableofcontents=\tableofcontents
\renewcommand{\tableofcontents}[1][]{\beamer@origtableofcontents}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty
index 7e044b89477..af617d7ccc5 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetwoscreens.sty
@@ -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@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@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@twoscreenstexttrue
}
\defbeameroption{always typeset second mode}[true]%
-{
- \def\beamer@defaultdosecondmode{#1}
+{%
+ \def\beamer@defaultdosecondmode{#1}%
}
\def\beamer@defaultdosecondmode{false}
-
\long\def\beamer@dosecondscreennow#1{% called from \beamer@doseveralframes
\ifbeamer@dosecondmode%
{%
- \clearpage%
- \def\beamer@currentmode{second}
- \def\beamer@doifnotinframe{}%
+ \clearpage
+ \def\beamer@currentmode{second}%
+ \gdef\beamer@doifnotinframe{}%
\def\beamer@doifinframe{\begin{beamer@frameslide}%
#1%
\end{beamer@frameslide}%
\pgfpagescurrentpagewillbelogicalpage{2}%
- \clearpage%
+ \clearpage
}%
- {\beamer@masterdecode{\beamer@whichframes}}%
- \beamer@donow%
+ \beamer@masterdecode{\beamer@whichframes}%
+ \beamer@donow
}%
- \fi%
+ \fi
}
-
\mode
<all>
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty
index 46b2e4f79ca..4f7db093b61 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty
@@ -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@verbatimreadframe{%
\begingroup
- \let\do\beamer@makeinnocent\dospecials
+ \let\do\@makeother\dospecials
\count@=127 %
\@whilenum\count@<255 \do{%
\advance\count@ by 1 %
\catcode\count@=11 %
}%
- \beamer@makeinnocent\^^L% and whatever other special cases
- \beamer@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@specialprocessframefirstline\let\beamer@temp=}{\beamer@processframefirstline}}%
diff --git a/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty b/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty
index c8a3f11efd1..ef291327a0f 100644
--- a/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty
+++ b/Master/texmf-dist/tex/latex/beamer/emulation/beamerprosper.sty
@@ -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@entry=\@gobble
\DeclareOption{framesassubsections}{\mode<presentation>
- {\def\beamerprosper@entry#1{\beamer@ifempty{#1}{}{\subsection{#1}}}}}
+ {\def\beamerprosper@entry#1{\ifblank{#1}{}{\subsection{#1}}}}}
\ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
index 34ae1c29200..31870918715 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
index 544986b02f6..b962b0b31dc 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty
index 2cf1a881ccc..45d0708f7cb 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty
@@ -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,6 +202,10 @@
\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
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty b/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty
index a6acff2dfd8..bf78ffb1a5a 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemeinfolines.sty
@@ -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@ifempty\expandafter{\beamer@shortinstitute}{}{~~(\insertshortinstitute)}
+ \usebeamerfont{author in head/foot}\insertshortauthor\expandafter\ifblank\expandafter{\beamer@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
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict
new file mode 100644
index 00000000000..4c592e8bc81
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-basic-dictionary/translator-basic-dictionary-Swedish.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict
new file mode 100644
index 00000000000..dd80ed6e166
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-bibliography-dictionary/translator-bibliography-dictionary-Swedish.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict
new file mode 100644
index 00000000000..aed38c11e79
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-environment-dictionary/translator-environment-dictionary-Swedish.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict
new file mode 100644
index 00000000000..a0a1a7645c4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-months-dictionary/translator-months-dictionary-Swedish.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict
new file mode 100644
index 00000000000..fa450d78ece
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-numbers-dictionary/translator-numbers-dictionary-Swedish.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict
index 17413d03e6f..4f83cb5ffcc 100644
--- a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Norsk.dict
@@ -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}
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict
new file mode 100644
index 00000000000..b47e0be1bf3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamer/translator/dicts/translator-theorem-dictionary/translator-theorem-dictionary-Swedish.dict
@@ -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}