summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-01 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2019-10-01 03:01:24 +0000
commit31d84cec65917cfc6ef446f1bf6031cff7c6dc7b (patch)
tree5288bd8601943a9038885a87d93b71b8fbc0b0dc /macros/latex/contrib/beamer/base
parentbbbe8128e7ae9d816a221377dbf5ff3969bb203b (diff)
CTAN sync 201910010301
Diffstat (limited to 'macros/latex/contrib/beamer/base')
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls2
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecolor.sty1
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty4
-rw-r--r--macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty74
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty2
6 files changed, 79 insertions, 6 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index fd632ab15c..f3564e183c 100644
--- a/macros/latex/contrib/beamer/base/beamer.cls
+++ b/macros/latex/contrib/beamer/base/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2019/07/23 v3.56 A class for typesetting presentations]
+ [2019/09/29 v3.57 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index 8889a66dac..2972dd7fb0 100644
--- a/macros/latex/contrib/beamer/base/beamerarticle.sty
+++ b/macros/latex/contrib/beamer/base/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2019/07/23 v3.56 beamer input in article mode]
+ [2019/09/29 v3.57 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerbasecolor.sty b/macros/latex/contrib/beamer/base/beamerbasecolor.sty
index 099df8c845..6818db39bd 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecolor.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecolor.sty
@@ -184,6 +184,7 @@
\ifdim\beamer@colbox@colseps>\z@\vskip\beamer@colbox@colseps\fi%
\fi%
\egroup\color@endgroup\egroup%
+ \wd\beamer@tempbox=\beamer@colbox@wd%
\ifx\beamer@colbox@ht\@empty\else\ht\beamer@tempbox=\beamer@colbox@ht\fi%
\ifx\beamer@colbox@dp\@empty\else\dp\beamer@tempbox=\beamer@colbox@dp\fi%
\ifbeamer@colbox@rounded%
diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
index 182a5f8873..adf021aae7 100644
--- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
@@ -107,7 +107,7 @@
\begin{actionenv}#2%
\def\insertblocktitle{#1}%
\par%
- \mode<presentation>{%\usebeamerfont{block}%
+ \only<presentation>{%\usebeamerfont{block}%
\setbeamercolor{local structure}{parent=alerted text}}%
\usebeamertemplate{block alerted begin}}
{\par%
@@ -118,7 +118,7 @@
\begin{actionenv}#2%
\def\insertblocktitle{#1}%
\par%
- \mode<presentation>{%\usebeamerfont{block}%
+ \only<presentation>{%\usebeamerfont{block}%
\setbeamercolor{local structure}{parent=example text}}%
\usebeamertemplate{block example begin}}
{\par%
diff --git a/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty b/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty
index 7853b36d70..b10e4325ab 100644
--- a/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty
+++ b/macros/latex/contrib/beamer/base/patch/beamerpatchparalist.sty
@@ -9,7 +9,7 @@
\mode<presentation>
-\if@plnewitem
+\if@plnewenum
\def\enumerate{%
\ifnum \@enumdepth >\tw@
\@toodeep
@@ -42,6 +42,45 @@
\raggedright%
\beamer@firstlineitemizeunskip%
}
+\fi
+\def\compactenum{%
+ \ifnum \@enumdepth >\tw@
+ \@toodeep
+ \else
+ \advance\@enumdepth \@ne
+ \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
+ \advance\@itemdepth \@ne%
+ \fi
+ \def\@enum@widestlabel{7}%
+ \beamer@computepref\@enumdepth%
+ \expandafter\edef\csname label\@enumctr\endcsname{\noexpand\usebeamertemplate{enumerate \beameritemnestingprefix item}}%
+ \@ifnextchar[{\beamer@@cenum@}{\beamer@compactenum@}}
+\def\beamer@@cenum@[{\@ifnextchar<{\beamer@cenumdefault[}{\beamer@@@cenum@[}}
+\def\beamer@cenumdefault[#1]{\def\beamer@defaultospec{#1}%
+ \@ifnextchar[{\beamer@@@cenum@}{\beamer@compactenum@}}
+\def\beamer@@@cenum@[#1]{\@enumlabel@{\beamer@compactenum@}[[#1]} % Here a token is gobbled in paralist package
+\def\beamer@compactenum@{%
+ \beamer@computepref\@itemdepth%
+ \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
+ \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
+ \@adjust@enum@labelwidth
+ \expandafter\list\csname label\@enumctr\endcsname{%
+ \usecounter{\@enumctr}%
+ \parsep\plparsep
+ \itemsep\plitemsep
+ \topsep\pltopsep
+ \partopsep\plpartopsep
+ \labelwidth
+ \csname leftmargin\romannumeral\@listdepth\endcsname
+ \advance\labelwidth-\labelsep
+ \let\makelabel\enumlabel}%
+ \beamer@cramped%
+ \raggedright%
+ \beamer@firstlineitemizeunskip%
+}
+\def\endcompactenum{\ifhmode\par\fi\endlist}
+
+\if@plnewitem
\def\itemize{%
\ifnum \@itemdepth >\tw@
\@toodeep
@@ -71,6 +110,39 @@
\beamer@firstlineitemizeunskip%
}
\fi
+\def\compactitem{%
+ \ifnum \@itemdepth >\tw@
+ \@toodeep
+ \else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \fi
+ \beamer@computepref\@itemdepth%
+ \expandafter\edef\csname\@itemitem\endcsname{\noexpand\usebeamertemplate{itemize \beameritemnestingprefix item}}%
+ \@ifnextchar[{\beamer@@citem@}{\beamer@compactitem@}}%
+\def\beamer@@citem@[{\@ifnextchar<{\beamer@citemdefault[}{\beamer@@@citem@[}}
+\def\beamer@citemdefault[#1]{\def\beamer@defaultospec{#1}%
+ \@ifnextchar[{\beamer@@@citem@}{\beamer@compactitem@}}
+\def\beamer@@@citem@[#1]{\@itemlabel@{\beamer@compactitem@}[#1]}
+\def\beamer@compactitem@{%
+ \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
+ \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
+ \@adjust@item@labelwidth
+ \expandafter\list\csname\@itemitem\endcsname{%
+ \parsep\plparsep
+ \itemsep\plitemsep
+ \topsep\pltopsep
+ \partopsep\plpartopsep
+ \labelwidth
+ \csname leftmargin\romannumeral\@listdepth\endcsname
+ \advance\labelwidth-\labelsep
+ \let\makelabel\itemlabel}%
+ \beamer@cramped%
+ \raggedright%
+ \beamer@firstlineitemizeunskip%
+}
+\def\endcompactitem{\ifhmode\par\fi\endlist}
+
\if@plflushright
\def\enumlabel#1{{\usebeamerfont*{enumerate \beameritemnestingprefix item}%
\usebeamercolor[fg]{enumerate \beameritemnestingprefix item}\hss#1}}
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty
index c8aff5287b..ad003c9aef 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesplit.sty
@@ -68,7 +68,7 @@
\usebeamerfont{author in head/foot}\insertshortauthor
\end{beamercolorbox}%
\begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
- \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}
+ \usebeamerfont{title in head/foot}\insertshorttitle\nobreak\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}
\end{beamercolorbox}}%
\vskip0pt%
}