summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-20 21:15:06 +0000
committerKarl Berry <karl@freefriends.org>2018-09-20 21:15:06 +0000
commit1524fc8f28ac4b71a54848fe991859ca7b2d30d2 (patch)
tree37d432099396309b3b20cc47be8b471bc36a76c4 /Master/texmf-dist/tex/latex/beamer
parent1d9ef3a849a3a4fabbcddae9c6e3e035f0789f58 (diff)
beamer (20sep18)
git-svn-id: svn://tug.org/texlive/trunk@48706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerarticle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty1
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty9
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty1
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty8
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty5
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty6
9 files changed, 18 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index 8e4302f997d..099829fd4d9 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamer.cls
+++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2018/09/06 v3.53 A class for typesetting presentations]
+ [2018/09/20 v3.54 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
index f824355c245..8675483053b 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2018/09/06 v3.53 beamer input in article mode]
+ [2018/09/20 v3.54 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
index a32a3531994..6d784381e25 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasearticle.sty
@@ -36,6 +36,7 @@
\DeclareOption{notheorems}{\beamer@blocksfalse}
\DeclareOption{noamsthm}{\beamer@blocksfalse\beamer@amsfalse}
\DeclareOption{noamssymb}{\beamer@amssymbfalse}
+\DeclareOption{nokeywords}{\beamer@keywordsfalse}
\DeclareOption{envcountsect}{\beamer@countsecttrue}
\DeclareOption{activeospeccharacters}{\beamer@articleactivetrue}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index 4dce70e9317..099df8c845b 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -108,13 +108,8 @@
\fi%
}
-\mode
-<presentation>
-{
- \colorlet{fg}{black}
- \colorlet{bg}{white}
-}
-
+\colorlet{fg}{black}
+\colorlet{bg}{white}
\mode
<article>
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
index 064046da488..5699abe9f03 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
@@ -66,6 +66,7 @@
\renewcommand\theenumiii{\@arabic\c@enumiii}%
}%
\AtBeginDocument{% Allow for paralist loading
+ \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}
% \let\labelitemi\beamer@labelitemi
% \let\labelitemii\beamer@labelitemii
% \let\itemize\beamer@itemize
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index e8af2264193..a4e742f2a5d 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -272,7 +272,6 @@
}
\newif\ifbeamer@noframenumbering
-\beamer@noframenumberingfalse
\define@key{beamerframe}{noframenumbering}[true]{\beamer@noframenumberingtrue}
@@ -423,6 +422,7 @@
\beamer@autobreakcount=0\relax%
\beamer@autobreaklastheight=16000pt%
\beamer@zoomcount=0\relax%
+ \beamer@noframenumberingfalse%
\beamer@containsverbatimfalse%
\beamer@isfragilefalse%
\beamer@autobreakfalse%
@@ -435,7 +435,9 @@
\setkeys{beamerframe}{#2}%
\beamer@frametemplate%
\ifbeamer@noframenumbering%
- \beamer@noframenumberingfalse%
+ \ifbeamer@isfragile%Fragile frames will be processed twice
+ \stepcounter{framenumber}%
+ \fi%
\else%
\stepcounter{framenumber}%do not set \label here - it interferes with AtBegin*
\fi%
@@ -602,7 +604,7 @@
{\protect\headcommand{%
\protect\beamer@framepages{\beamer@framestartpage}{\beamer@frameendpage}}}%
\clearpage\beamer@notesactions%
- }
+ }%
}
\def\beamer@reseteecodes{\gdef\beamer@entrycode{}\gdef\beamer@exitcode{}%
\beamer@slideinframe=1\relax\beamer@resumemode}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
index 2c0f347c77b..94ab6414823 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframesize.sty
@@ -204,6 +204,7 @@
\global\setbox\beamer@splitbox=\box\voidb@x%
\ifbeamer@autobreak%
% Ok, frame was overful -> split it!
+ \splittopskip\baselineskip%
\setbox\@tempboxa=\vsplit\beamer@framebox to\beamer@autobreakfactor\textheight%
\global\setbox\beamer@splitbox=\box\beamer@framebox%
\@tempdima=\ht\beamer@splitbox%
@@ -249,7 +250,9 @@
\newtoks\beamer@framesubtitletoks
\def\beamer@continueautobreak{%
- \refstepcounter{framenumber}%
+ \ifbeamer@noframenumbering\else%
+ \refstepcounter{framenumber}%
+ \fi%
\expandafter\beamer@frametitletoks\expandafter{\beamer@frametitle}%
\expandafter\beamer@framesubtitletoks\expandafter{\beamer@shortframetitle}%
\edef\beamer@callframetitle{\noexpand\frametitle[\the\beamer@framesubtitletoks]{\the\beamer@frametitletoks}}%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
index d83218620ba..d68e0c0c15d 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
@@ -131,8 +131,6 @@
\ifx\beamer@nexttoken\mode\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\common\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\presentation\let\next=\beamer@stopoutsidemode\fi
- \ifx\beamer@nexttoken\include\let\next=\beamer@stopoutsidemode\fi
- \ifx\beamer@nexttoken\input\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\begin\let\next=\beamer@checkbeginframe\fi
\ifx\beamer@nexttoken\end\let\next=\beamer@checkenddoc\fi
\next}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
index 6618b7e1f56..4587a7f0137 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty
@@ -122,7 +122,7 @@
\fi%
\def\inserttocsection{\hyperlink{Navigation#3}{#2}}%
\beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@cs\else\beamer@toc@os\fi}%
- {
+ {%
\ifbeamer@pausesections\pause\fi%
\ifx\beamer@toc@ooss\beamer@hidetext
\vskip1.5em
@@ -136,7 +136,7 @@
\par%
}%
}%
- }
+ }%
}%
\beamer@restoreanother%
}
@@ -167,7 +167,7 @@
}%
}}%
\beamer@restoreanother%
- }
+ }%
\beamer@todo%
\fi\fi%
}