summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/beamer')
-rw-r--r--macros/latex/contrib/beamer/CHANGELOG.md18
-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/beamerbaseauxtemplates.sty21
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty36
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty23
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenavigation.sty237
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenavigationsymbols.tex246
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdfbin343911 -> 253191 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdfbin547609 -> 430812 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdfbin441714 -> 368027 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-fonts.tex2
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-frames.tex64
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex3
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-introduction.tex17
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-overlays.tex8
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.pdfbin2219543 -> 2155731 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.tex4
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpgbin861 -> 36833 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpgbin1634 -> 4290 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpgbin471 -> 40020 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpgbin613 -> 27790 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpgbin435 -> 49011 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpgbin1244 -> 27779 bytes
24 files changed, 375 insertions, 308 deletions
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md
index ff3c75b7a7..5048678abf 100644
--- a/macros/latex/contrib/beamer/CHANGELOG.md
+++ b/macros/latex/contrib/beamer/CHANGELOG.md
@@ -8,11 +8,22 @@ a major and minor version only.
## [Unreleased]
+## [v3.69]
+
+### Fixed
+
+- protect the frametitle continuation so it can be used with \MakeUppercase (see #802)
+- first aid for metropolis theme (see #802)
+- fixed indentation of multiline section titles in `square` and `ball unnumbered` toc templates (see #817)
+- using `bibliography entry ...` font in biblatex generated bibliographies
+
## [v3.68]
### Changed
- simplified non-text links for navigation symbols and framezoom
+- doc: re-organised section about navigation symbols
+- moved parts of `beamerbasenavigation.sty` to `beamerbasenavigationsymbols.tex`
### Fixed
- fixed height of non-text links to prevent overlaps in vertically stacked miniframes (see #780)
@@ -49,7 +60,7 @@ a major and minor version only.
- fixed bullet colour of alerted items for custom item colour (see #735)
- workaround to make miniframes clickable in xelatex (see #332)
- added missing encoding value to multimedia sound macro (see #607)
-- imporoved problem with shadow of blocks without title (see #647)
+- improved problem with shadow of blocks without title (see #647)
- reduced artefacts in poppler based viewers for shadow blocks (see #647)
- workaround to make `\framezoom` clickable in xelatex (see #619)
- exclude invisible frames from being counted (see #592)
@@ -60,7 +71,7 @@ a major and minor version only.
### Added
- new continuation count template "singleframecheck" which will only show the continuation count if a break actually occurs (see #423)
-- new templated for lined note pages (#704)
+- new template for lined note pages (#704)
### Changed
@@ -212,7 +223,8 @@ a major and minor version only.
- Support for `noxcolor` with `beamerarticle` (see #483)
- Treatment of mixed overlay/alert specifications
-[Unreleased]: https://github.com/josephwright/beamer/compare/v3.68...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.69...HEAD
+[v3.69]: https://github.com/josephwright/beamer/compare/v3.68...v3.69
[v3.68]: https://github.com/josephwright/beamer/compare/v3.67...v3.68
[v3.67]: https://github.com/josephwright/beamer/compare/v3.66...v3.67
[v3.66]: https://github.com/josephwright/beamer/compare/v3.65...v3.66
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 475d5d0ab6..fc81e2b3ef 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}
- [2022/09/13 v3.68 A class for typesetting presentations]
+ [2023/02/20 v3.69 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 1de9be15f6..b43f0c808d 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}
- [2022/09/13 v3.68 beamer input in article mode]
+ [2023/02/20 v3.69 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/beamerbaseauxtemplates.sty b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
index b3638febe5..42b47c5037 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
@@ -254,14 +254,14 @@
% (sub-)section in toc: square
\defbeamertemplate{section in toc}{square}
-{\leavevmode\leftskip=1.75ex%
+{\leavevmode\leftskip=3ex%
\llap{%
\usebeamerfont*{section number projected}%
\usebeamercolor[bg]{section number projected}%
\vrule width2.25ex height1.85ex depth.4ex%
\hskip-2.25ex%
- \hbox to2.25ex{\hfil\color{fg}\inserttocsectionnumber\hfil}}%
- \kern1.25ex\inserttocsection\par}
+ \hbox to2.25ex{\hfil\color{fg}\inserttocsectionnumber\hfil}\kern1.25ex}%
+ \inserttocsection\par}
\defbeamertemplate{subsection in toc}{square}
{\leavevmode\leftskip=5ex\llap{%
@@ -281,17 +281,20 @@
% (sub-)section in toc: ball
\defbeamertemplate{section in toc}{ball unnumbered}
-{\leavevmode\raise0.1ex\beamer@usesphere{section number projected}{bigsphere}\kern1.25ex\inserttocsection\par}
+{\leavevmode\leftskip=2.25ex%
+ \llap{%
+ \raise0.1ex\beamer@usesphere{section number projected}{bigsphere}\kern1.25ex}%
+ \inserttocsection\par}
\defbeamertemplate{subsection in toc}{ball unnumbered}
-{\leavevmode\leftskip=1.5em\raise0.2ex\beamer@usesphere{subsection number projected}{smallsphere}%
- \kern1ex\inserttocsubsection\par}
+{\leavevmode\leftskip=5.1ex\llap{%
+ \raise0.2ex\beamer@usesphere{subsection number projected}{smallsphere}\kern1ex}\inserttocsubsection\par}
\defbeamertemplate{subsubsection in toc}{ball unnumbered}
{\leavevmode\normalsize\usebeamerfont{subsection in
- toc}\leftskip=3em\usebeamerfont{subsubsection in toc}%
- \beamer@usesphere{subsubsection number projected}{smallsphere}%
- \kern0.75ex\inserttocsubsubsection\par}
+ toc}\leftskip=8.2ex\usebeamerfont{subsubsection in toc}%
+ \llap{%
+ \beamer@usesphere{subsubsection number projected}{smallsphere}\kern0.75ex}\inserttocsubsubsection\par}
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 02abbad55a..140b3d3641 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -249,6 +249,42 @@
}{}
%
+% Fix for metropolis theme
+% https://github.com/josephwright/beamer/issues/802
+%
+% metropolis patches an old version of the \beamer@@frametitle
+% definition and throws an error if it does not find the outdated
+% code. To avoid breaking all metropolis persentations, we revert
+% back to the old definition at the start of the file and then
+% overwrite again with the current implimentation at the end
+%
+\AddToHook{file/beamerfontthememetropolis.sty/before}{%
+ \long\def\beamer@@frametitle[#1]#2{%
+ \ifblank{#2}{}{%
+ \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
+ \gdef\beamer@frametitle{#2}%
+ \gdef\beamer@shortframetitle{#1}%
+ }%
+ }
+}
+\AddToHook{file/beamerfontthememetropolis.sty/after}{%
+ \long\def\beamer@@frametitle[#1]#2{%
+ \ifblank{#2}{}{%
+ \gdef\insertframetitle{{%
+ \metropolis@frametitleformat{#2}%
+ \ifnum\beamer@autobreakcount>0
+ \relax{}\space%
+ \beamer@insertframetitlecontinuation%
+ \fi%
+ }}%
+ \gdef\beamer@frametitle{#2}%
+ \gdef\beamer@shortframetitle{#1}%
+ }%
+ }
+}
+
+
+%
% Obsolete commands from old versions of beamer
%
\mode
diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
index 59dcb77a89..8e7114c099 100644
--- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
@@ -22,13 +22,22 @@
% The \frametitle command
%
%
+\protected\def\beamer@insertframetitlecontinuation{\usebeamertemplate*{frametitle continuation}}
+
\newcommand<>\frametitle{\alt#1{\@dblarg\beamer@@frametitle}{\beamer@gobbleoptional}}
+% if this definition changes, also update beamerbasecompatibility.sty under the comment "Fix for metropolis theme"
\long\def\beamer@@frametitle[#1]#2{%
\ifblank{#2}{}{%
- \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
- \gdef\beamer@frametitle{#2}%
- \gdef\beamer@shortframetitle{#1}%
-}%
+ \gdef\insertframetitle{{%
+ #2%
+ \ifnum\beamer@autobreakcount>0
+ \relax{}\space%
+ \beamer@insertframetitlecontinuation%
+ \fi%
+ }}%
+ \gdef\beamer@frametitle{#2}%
+ \gdef\beamer@shortframetitle{#1}%
+ }%
}
\newcommand\insertshortframetitle[1][]{%
@@ -486,16 +495,16 @@
{\let\makelabel\beamer@biblabeltemplate}{}{}
\apptocmd{\abx@macro@begentry}
{\let\bbx@tempa\@empty%
- \usebeamercolor[fg]{bibliography entry author}}{}{}
+ \usebeamercolor[fg]{bibliography entry author}\usebeamerfont{bibliography entry author}}{}{}
\pretocmd{\abx@macro@labeltitle}
{\ifboolexpr{ test {\ifcsundef{abx@field@label}}
and test {\ifcsundef{abx@field@labeltitle}} }{}{\let\bbx@tempa\labelnamepunct}}{}{}
\pretocmd{\abx@macro@title}
{\ifcsundef{abx@name@labelname}{}{\let\bbx@tempa\labelnamepunct}%
- \bbx@tempa\newblock\unspace\usebeamercolor[fg]{bibliography entry title}}{}{}
+ \bbx@tempa\newblock\unspace\usebeamercolor[fg]{bibliography entry title}\usebeamerfont{bibliography entry title}}{}{}
\apptocmd{\abx@macro@title}
{\ifcsundef{abx@field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}%
- \newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}}
+ \newblock\unspace\usebeamercolor[fg]{bibliography entry note}\usebeamerfont{bibliography entry note}}{}{}}
{}}
% Adding patches to some biblatex styles
diff --git a/macros/latex/contrib/beamer/base/beamerbasenavigation.sty b/macros/latex/contrib/beamer/base/beamerbasenavigation.sty
index 408fa4bfe4..9caf1839e4 100644
--- a/macros/latex/contrib/beamer/base/beamerbasenavigation.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasenavigation.sty
@@ -228,242 +228,7 @@
}%
}
-\pgfdefobject{beamerslidenavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
- {\pgfpathqmoveto{4bp}{0.5bp}
- \pgfpathqlineto{2bp}{2bp}
- \pgfpathqlineto{4bp}{3.5bp}
- \pgfusepathqfill
- \pgfpathqmoveto{16bp}{0.5bp}
- \pgfpathqlineto{18bp}{2bp}
- \pgfpathqlineto{16bp}{3.5bp}
- \pgfusepathqfill}
-\pgfdefobject{beamerslidenavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfpathrectangle{\pgfpoint{8.3pt}{0.8pt}}{\pgfpoint{3.4pt}{2.4pt}}%
- \pgfusepathqstroke%
-}
-
-\def\insertslidenavigationsymbol{%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamerslidenavstrong}%
- \usebeamercolor[fg]{navigation symbols dimmed}
- \pgfuseobject{beamerslidenavlight}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinkslideprev{\beamer@linkspace{6pt}}%
- \Acrobatmenu{GoToPage}{\beamer@linkspace{8pt}}%
- \hyperlinkslidenext{\beamer@linkspace{6pt}}}
-
-\pgfdefobject{beamerframenavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
- {\pgfpathqmoveto{4bp}{0.5bp}
- \pgfpathqlineto{2bp}{2bp}
- \pgfpathqlineto{4bp}{3.5bp}
- \pgfpathqmoveto{16bp}{0.5bp}
- \pgfpathqlineto{18bp}{2bp}
- \pgfpathqlineto{16bp}{3.5bp}
- \pgfusepathqfill}
-\pgfdefobject{beamerframenavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfpathrectangle{\pgfpoint{7pt}{0pt}}{\pgfpoint{3.4pt}{2.4pt}}
- \pgfpathqmoveto{7.8bp}{2.4bp}
- \pgfpathqlineto{7.8bp}{3.2bp}
- \pgfpathqlineto{11.2bp}{3.2bp}
- \pgfpathqlineto{11.2bp}{.8bp}
- \pgfpathqlineto{10.4bp}{.8bp}
- \pgfpathqmoveto{8.6bp}{3.2bp}
- \pgfpathqlineto{8.6bp}{4bp}
- \pgfpathqlineto{12bp}{4bp}
- \pgfpathqlineto{12bp}{1.6bp}
- \pgfpathqlineto{11.2bp}{1.6bp}
- \pgfusepathqstroke}
-
-\def\insertframenavigationsymbol{%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamerframenavstrong}%
- \usebeamercolor[fg]{navigation symbols dimmed}
- \pgfuseobject{beamerframenavlight}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinkframeendprev{\beamer@linkspace{5pt}}%
- \hyperlinkframestart{\beamer@linkspace{5pt}}%
- \hyperlinkframeend{\beamer@linkspace{5pt}}%
- \hyperlinkframestartnext{\beamer@linkspace{5pt}}}
-
-\pgfdefobject{beamersubsectionnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfpathqmoveto{4bp}{0.5bp}
- \pgfpathqlineto{2bp}{2bp}
- \pgfpathqlineto{4bp}{3.5bp}
- \pgfpathqmoveto{16bp}{0.5bp}
- \pgfpathqlineto{18bp}{2bp}
- \pgfpathqlineto{16bp}{3.5bp}
- \pgfusepathqfill
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{8bp}{4bp}
- \pgfpathqlineto{11bp}{4bp}
- \pgfpathqmoveto{9bp}{2bp}
- \pgfpathqlineto{12bp}{2bp}
- \pgfpathqmoveto{8bp}{1bp}
- \pgfpathqlineto{11bp}{1bp}
- \pgfpathqmoveto{9bp}{0bp}
- \pgfpathqlineto{12bp}{0bp}
- \pgfusepathqstroke}
-\pgfdefobject{beamersubsectionnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{9bp}{3bp}
- \pgfpathqlineto{12bp}{3bp}
- \pgfusepathqstroke}
-
-\def\insertsubsectionnavigationsymbol{%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamersubsectionnavstrong}%
- \usebeamercolor[fg]{navigation symbols dimmed}
- \pgfuseobject{beamersubsectionnavlight}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinksubsectionendprev{\beamer@linkspace{5pt}}%
- \hyperlinksubsectionstart{\beamer@linkspace{5pt}}%
- \hyperlinksubsectionend{\beamer@linkspace{5pt}}%
- \hyperlinksubsectionstartnext{\beamer@linkspace{5pt}}}
-
-\pgfdefobject{beamersectionnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfpathqmoveto{4bp}{0.5bp}
- \pgfpathqlineto{2bp}{2bp}
- \pgfpathqlineto{4bp}{3.5bp}
- \pgfpathqmoveto{16bp}{0.5bp}
- \pgfpathqlineto{18bp}{2bp}
- \pgfpathqlineto{16bp}{3.5bp}
- \pgfusepathqfill
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{8bp}{1bp}
- \pgfpathqlineto{11bp}{1bp}
- \pgfpathqmoveto{9bp}{0bp}
- \pgfpathqlineto{12bp}{0bp}
- \pgfusepathqstroke}
-\pgfdefobject{beamersectionnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{8bp}{4bp}
- \pgfpathqlineto{11bp}{4bp}
- \pgfpathqmoveto{9bp}{3bp}
- \pgfpathqlineto{12bp}{3bp}
- \pgfpathqmoveto{9bp}{2bp}
- \pgfpathqlineto{12bp}{2bp}
- \pgfusepathqstroke
-}
-
-\def\insertsectionnavigationsymbol{%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamersectionnavstrong}%
- \usebeamercolor[fg]{navigation symbols dimmed}
- \pgfuseobject{beamersectionnavlight}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinksectionendprev{\beamer@linkspace{5pt}}%
- \hyperlinksectionstart{\beamer@linkspace{5pt}}%
- \hyperlinksectionend{\beamer@linkspace{5pt}}%
- \hyperlinksectionstartnext{\beamer@linkspace{5pt}}}
-
-\pgfdefobject{beamerdocnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfpathqmoveto{10bp}{-.5bp}
- \pgfpathqlineto{10bp}{4.5bp}
- \pgfusepathqstroke
-}
-\pgfdefobject{beamerdocnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{4bp}{4bp}
- \pgfpathqlineto{7bp}{4bp}
- \pgfpathqmoveto{5bp}{3bp}
- \pgfpathqlineto{8bp}{3bp}
- \pgfpathqmoveto{5bp}{2bp}
- \pgfpathqlineto{8bp}{2bp}
- \pgfpathqmoveto{3bp}{1bp}
- \pgfpathqlineto{7bp}{1bp}
- \pgfpathqmoveto{5bp}{0bp}
- \pgfpathqlineto{8bp}{0bp}
- \pgfpathqmoveto{12bp}{3bp}
- \pgfpathqlineto{15bp}{3bp}
- \pgfpathqmoveto{13bp}{2bp}
- \pgfpathqlineto{16bp}{2bp}
- \pgfpathqmoveto{13bp}{1bp}
- \pgfpathqlineto{16bp}{1bp}
- \pgfusepathqstroke
-}
-
-\pgfdefobject{beamerdocnavstrongsingle}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{%
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{8bp}{4bp}
- \pgfpathqlineto{11bp}{4bp}
- \pgfpathqmoveto{9bp}{3bp}
- \pgfpathqlineto{12bp}{3bp}
- \pgfpathqmoveto{9bp}{2bp}
- \pgfpathqlineto{12bp}{2bp}
- \pgfpathqmoveto{8bp}{1bp}
- \pgfpathqlineto{11bp}{1bp}
- \pgfpathqmoveto{9bp}{0bp}
- \pgfpathqlineto{12bp}{0bp}
- \pgfusepathqstroke%
-}
-
-\def\insertdocnavigationsymbol{%
- \ifx\beamer@startpageofappendix\@empty%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamerdocnavstrongsingle}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinkpresentationstart{\beamer@linkspace{9pt}}%
- \hyperlinkpresentationend{\beamer@linkspace{11pt}}%
- \else%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamerdocnavstrong}%
- \usebeamercolor[fg]{navigation symbols dimmed}
- \pgfuseobject{beamerdocnavlight}%
- \end{pgfpicture}\kern-20pt%
- \hyperlinkpresentationstart{\beamer@linkspace{5pt}}%
- \hyperlinkpresentationend{\beamer@linkspace{5pt}}%
- \hyperlinkappendixstart{\beamer@linkspace{3.5pt}}%
- \hyperlinkappendixend{\beamer@linkspace{6.5pt}}%
- \fi}
-
-\pgfdefobject{beamerbackfindforwardnav}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
-{
- % search symbol
- \pgfsetlinewidth{0.6pt}
- \pgfpathqmoveto{10.4bp}{1.6bp}
- \pgfpathqlineto{12bp}{0bp}
- \pgfusepathqstroke
- \pgfsetlinewidth{0.4pt}
- \pgfpathcircle{\pgfpoint{9.5pt}{2.5pt}}{1.2pt}
- \pgfusepathqstroke
- % left arrow
- \pgfsetroundcap
- \pgfpathqmoveto{4bp}{0bp}
- \pgfpathqcurveto{5.1pt}{0pt}{6bp}{0.9bp}{6bp}{2bp}
- \pgfpathqcurveto{6bp}{3.1bp}{5.1bp}{4bp}{4bp}{4bp}
- \pgfpathqcurveto{2.9bp}{4bp}{2bp}{3.1bp}{2bp}{2bp}
- \pgfpathqmoveto{3.2bp}{2.6bp}
- \pgfpathqlineto{2bp}{1.6bp}
- \pgfpathqlineto{0.8bp}{2.6bp}
- % right arrow
- \pgfpathqmoveto{16bp}{0bp}
- \pgfpathqcurveto{14.9bp}{0bp}{14bp}{0.9bp}{14bp}{2bp}
- \pgfpathqcurveto{14bp}{3.1bp}{14.9bp}{4bp}{16bp}{4bp}
- \pgfpathqcurveto{17.1bp}{4bp}{18bp}{3.1bp}{18bp}{2bp}
- \pgfpathqmoveto{19.2bp}{2.6bp}
- \pgfpathqlineto{18bp}{1.6bp}
- \pgfpathqlineto{16.8bp}{2.6bp}
- \pgfusepathqstroke
-}
-
-\def\insertbackfindforwardnavigationsymbol{%
- \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
- \pgfuseobject{beamerbackfindforwardnav}%
- \end{pgfpicture}\kern-20pt%
- \Acrobatmenu{GoBack}{\beamer@linkspace{7pt}}%
- \Acrobatmenu{Find}{\beamer@linkspace{6pt}}%
- \Acrobatmenu{GoForward}{\beamer@linkspace{7pt}}}
-
-
+\input{beamerbasenavigationsymbols}
%
% User Buttons
diff --git a/macros/latex/contrib/beamer/base/beamerbasenavigationsymbols.tex b/macros/latex/contrib/beamer/base/beamerbasenavigationsymbols.tex
new file mode 100644
index 0000000000..b8d2081a76
--- /dev/null
+++ b/macros/latex/contrib/beamer/base/beamerbasenavigationsymbols.tex
@@ -0,0 +1,246 @@
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017,2018 by Louis Stuart, Joseph Wright
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
+
+\pgfdefobject{beamerslidenavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+ {\pgfpathqmoveto{4bp}{0.5bp}
+ \pgfpathqlineto{2bp}{2bp}
+ \pgfpathqlineto{4bp}{3.5bp}
+ \pgfusepathqfill
+ \pgfpathqmoveto{16bp}{0.5bp}
+ \pgfpathqlineto{18bp}{2bp}
+ \pgfpathqlineto{16bp}{3.5bp}
+ \pgfusepathqfill}
+\pgfdefobject{beamerslidenavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfpathrectangle{\pgfpoint{8.3pt}{0.8pt}}{\pgfpoint{3.4pt}{2.4pt}}%
+ \pgfusepathqstroke%
+}
+
+\def\insertslidenavigationsymbol{%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamerslidenavstrong}%
+ \usebeamercolor[fg]{navigation symbols dimmed}
+ \pgfuseobject{beamerslidenavlight}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinkslideprev{\beamer@linkspace{6pt}}%
+ \Acrobatmenu{GoToPage}{\beamer@linkspace{8pt}}%
+ \hyperlinkslidenext{\beamer@linkspace{6pt}}}
+
+\pgfdefobject{beamerframenavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+ {\pgfpathqmoveto{4bp}{0.5bp}
+ \pgfpathqlineto{2bp}{2bp}
+ \pgfpathqlineto{4bp}{3.5bp}
+ \pgfpathqmoveto{16bp}{0.5bp}
+ \pgfpathqlineto{18bp}{2bp}
+ \pgfpathqlineto{16bp}{3.5bp}
+ \pgfusepathqfill}
+\pgfdefobject{beamerframenavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfpathrectangle{\pgfpoint{7pt}{0pt}}{\pgfpoint{3.4pt}{2.4pt}}
+ \pgfpathqmoveto{7.8bp}{2.4bp}
+ \pgfpathqlineto{7.8bp}{3.2bp}
+ \pgfpathqlineto{11.2bp}{3.2bp}
+ \pgfpathqlineto{11.2bp}{.8bp}
+ \pgfpathqlineto{10.4bp}{.8bp}
+ \pgfpathqmoveto{8.6bp}{3.2bp}
+ \pgfpathqlineto{8.6bp}{4bp}
+ \pgfpathqlineto{12bp}{4bp}
+ \pgfpathqlineto{12bp}{1.6bp}
+ \pgfpathqlineto{11.2bp}{1.6bp}
+ \pgfusepathqstroke}
+
+\def\insertframenavigationsymbol{%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamerframenavstrong}%
+ \usebeamercolor[fg]{navigation symbols dimmed}
+ \pgfuseobject{beamerframenavlight}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinkframeendprev{\beamer@linkspace{5pt}}%
+ \hyperlinkframestart{\beamer@linkspace{5pt}}%
+ \hyperlinkframeend{\beamer@linkspace{5pt}}%
+ \hyperlinkframestartnext{\beamer@linkspace{5pt}}}
+
+\pgfdefobject{beamersubsectionnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfpathqmoveto{4bp}{0.5bp}
+ \pgfpathqlineto{2bp}{2bp}
+ \pgfpathqlineto{4bp}{3.5bp}
+ \pgfpathqmoveto{16bp}{0.5bp}
+ \pgfpathqlineto{18bp}{2bp}
+ \pgfpathqlineto{16bp}{3.5bp}
+ \pgfusepathqfill
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{8bp}{4bp}
+ \pgfpathqlineto{11bp}{4bp}
+ \pgfpathqmoveto{9bp}{2bp}
+ \pgfpathqlineto{12bp}{2bp}
+ \pgfpathqmoveto{8bp}{1bp}
+ \pgfpathqlineto{11bp}{1bp}
+ \pgfpathqmoveto{9bp}{0bp}
+ \pgfpathqlineto{12bp}{0bp}
+ \pgfusepathqstroke}
+\pgfdefobject{beamersubsectionnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{9bp}{3bp}
+ \pgfpathqlineto{12bp}{3bp}
+ \pgfusepathqstroke}
+
+\def\insertsubsectionnavigationsymbol{%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamersubsectionnavstrong}%
+ \usebeamercolor[fg]{navigation symbols dimmed}
+ \pgfuseobject{beamersubsectionnavlight}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinksubsectionendprev{\beamer@linkspace{5pt}}%
+ \hyperlinksubsectionstart{\beamer@linkspace{5pt}}%
+ \hyperlinksubsectionend{\beamer@linkspace{5pt}}%
+ \hyperlinksubsectionstartnext{\beamer@linkspace{5pt}}}
+
+\pgfdefobject{beamersectionnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfpathqmoveto{4bp}{0.5bp}
+ \pgfpathqlineto{2bp}{2bp}
+ \pgfpathqlineto{4bp}{3.5bp}
+ \pgfpathqmoveto{16bp}{0.5bp}
+ \pgfpathqlineto{18bp}{2bp}
+ \pgfpathqlineto{16bp}{3.5bp}
+ \pgfusepathqfill
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{8bp}{1bp}
+ \pgfpathqlineto{11bp}{1bp}
+ \pgfpathqmoveto{9bp}{0bp}
+ \pgfpathqlineto{12bp}{0bp}
+ \pgfusepathqstroke}
+\pgfdefobject{beamersectionnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{8bp}{4bp}
+ \pgfpathqlineto{11bp}{4bp}
+ \pgfpathqmoveto{9bp}{3bp}
+ \pgfpathqlineto{12bp}{3bp}
+ \pgfpathqmoveto{9bp}{2bp}
+ \pgfpathqlineto{12bp}{2bp}
+ \pgfusepathqstroke
+}
+
+\def\insertsectionnavigationsymbol{%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamersectionnavstrong}%
+ \usebeamercolor[fg]{navigation symbols dimmed}
+ \pgfuseobject{beamersectionnavlight}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinksectionendprev{\beamer@linkspace{5pt}}%
+ \hyperlinksectionstart{\beamer@linkspace{5pt}}%
+ \hyperlinksectionend{\beamer@linkspace{5pt}}%
+ \hyperlinksectionstartnext{\beamer@linkspace{5pt}}}
+
+\pgfdefobject{beamerdocnavlight}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfpathqmoveto{10bp}{-.5bp}
+ \pgfpathqlineto{10bp}{4.5bp}
+ \pgfusepathqstroke
+}
+\pgfdefobject{beamerdocnavstrong}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{4bp}{4bp}
+ \pgfpathqlineto{7bp}{4bp}
+ \pgfpathqmoveto{5bp}{3bp}
+ \pgfpathqlineto{8bp}{3bp}
+ \pgfpathqmoveto{5bp}{2bp}
+ \pgfpathqlineto{8bp}{2bp}
+ \pgfpathqmoveto{3bp}{1bp}
+ \pgfpathqlineto{7bp}{1bp}
+ \pgfpathqmoveto{5bp}{0bp}
+ \pgfpathqlineto{8bp}{0bp}
+ \pgfpathqmoveto{12bp}{3bp}
+ \pgfpathqlineto{15bp}{3bp}
+ \pgfpathqmoveto{13bp}{2bp}
+ \pgfpathqlineto{16bp}{2bp}
+ \pgfpathqmoveto{13bp}{1bp}
+ \pgfpathqlineto{16bp}{1bp}
+ \pgfusepathqstroke
+}
+
+\pgfdefobject{beamerdocnavstrongsingle}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{%
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{8bp}{4bp}
+ \pgfpathqlineto{11bp}{4bp}
+ \pgfpathqmoveto{9bp}{3bp}
+ \pgfpathqlineto{12bp}{3bp}
+ \pgfpathqmoveto{9bp}{2bp}
+ \pgfpathqlineto{12bp}{2bp}
+ \pgfpathqmoveto{8bp}{1bp}
+ \pgfpathqlineto{11bp}{1bp}
+ \pgfpathqmoveto{9bp}{0bp}
+ \pgfpathqlineto{12bp}{0bp}
+ \pgfusepathqstroke%
+}
+
+\def\insertdocnavigationsymbol{%
+ \ifx\beamer@startpageofappendix\@empty%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamerdocnavstrongsingle}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinkpresentationstart{\beamer@linkspace{9pt}}%
+ \hyperlinkpresentationend{\beamer@linkspace{11pt}}%
+ \else%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamerdocnavstrong}%
+ \usebeamercolor[fg]{navigation symbols dimmed}
+ \pgfuseobject{beamerdocnavlight}%
+ \end{pgfpicture}\kern-20pt%
+ \hyperlinkpresentationstart{\beamer@linkspace{5pt}}%
+ \hyperlinkpresentationend{\beamer@linkspace{5pt}}%
+ \hyperlinkappendixstart{\beamer@linkspace{3.5pt}}%
+ \hyperlinkappendixend{\beamer@linkspace{6.5pt}}%
+ \fi}
+
+\pgfdefobject{beamerbackfindforwardnav}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{20pt}{5pt}}
+{
+ % search symbol
+ \pgfsetlinewidth{0.6pt}
+ \pgfpathqmoveto{10.4bp}{1.6bp}
+ \pgfpathqlineto{12bp}{0bp}
+ \pgfusepathqstroke
+ \pgfsetlinewidth{0.4pt}
+ \pgfpathcircle{\pgfpoint{9.5pt}{2.5pt}}{1.2pt}
+ \pgfusepathqstroke
+ % left arrow
+ \pgfsetroundcap
+ \pgfpathqmoveto{4bp}{0bp}
+ \pgfpathqcurveto{5.1pt}{0pt}{6bp}{0.9bp}{6bp}{2bp}
+ \pgfpathqcurveto{6bp}{3.1bp}{5.1bp}{4bp}{4bp}{4bp}
+ \pgfpathqcurveto{2.9bp}{4bp}{2bp}{3.1bp}{2bp}{2bp}
+ \pgfpathqmoveto{3.2bp}{2.6bp}
+ \pgfpathqlineto{2bp}{1.6bp}
+ \pgfpathqlineto{0.8bp}{2.6bp}
+ % right arrow
+ \pgfpathqmoveto{16bp}{0bp}
+ \pgfpathqcurveto{14.9bp}{0bp}{14bp}{0.9bp}{14bp}{2bp}
+ \pgfpathqcurveto{14bp}{3.1bp}{14.9bp}{4bp}{16bp}{4bp}
+ \pgfpathqcurveto{17.1bp}{4bp}{18bp}{3.1bp}{18bp}{2bp}
+ \pgfpathqmoveto{19.2bp}{2.6bp}
+ \pgfpathqlineto{18bp}{1.6bp}
+ \pgfpathqlineto{16.8bp}{2.6bp}
+ \pgfusepathqstroke
+}
+
+\def\insertbackfindforwardnavigationsymbol{%
+ \begin{pgfpicture}{0pt}{-1.5pt}{20pt}{5.5pt}
+ \pgfuseobject{beamerbackfindforwardnav}%
+ \end{pgfpicture}\kern-20pt%
+ \Acrobatmenu{GoBack}{\beamer@linkspace{7pt}}%
+ \Acrobatmenu{Find}{\beamer@linkspace{6pt}}%
+ \Acrobatmenu{GoForward}{\beamer@linkspace{7pt}}}
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
index e18033ad3c..e4d84100e2 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
index cd5a3421d6..ddbf2d0f2d 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
index 2555657089..3dd19e6a9f 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
index 1d044cc6f2..e9801d3f94 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
@@ -193,7 +193,7 @@ To use a \beamer-font, you can use the command |\usebeamerfont|. Inside the temp
\example |\usebeamerfont{frametitle}|
In the unstarred version of this command, the font is changed according to the attributes specified in the \meta{beamer-font name}, but unspecified attributes remain unchanged. For example, if the font specifies that the font should be ``bold,'' but specifies nothing else, and if the current font is large, then |\usebeamerfont| causes the current font to become large and bold.
- In the starred version of this command, the font is first reset before the font's attributes are applied. Thus, in the above example of a \beamer-font having only the attribute ``boldface'' set, saying |\usebeamerfont*| will \emph{always} cause the current font to become a normal-size, normal-shape, bold, default-family font.
+ In the starred version of this command, the font is first reset before the font's attributes are applied. Thus, in the above example of a \beamer-font having only the attribute ``boldface'' set, saying |\usebeamerfont*| will \emph{always} cause the current font to become a normal-shape, bold, default-family font (the font size won't be reset).
\end{command}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-frames.tex b/macros/latex/contrib/beamer/doc/beamerug-frames.tex
index 6084846432..dff2440e7e 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-frames.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-frames.tex
@@ -385,7 +385,7 @@ Figure \ref{fig:framelayers} shows an overview of the order in which the differe
}
\end{tikzpicture}
-\caption{Diagram of the order in which the different frame components are drawn (Image originally created by \href{https://tex.stackexchange.com/a/27302}{Andrew Stacey})}
+\caption{Diagram of the order in which the different frame components are drawn (image originally created by \href{https://tex.stackexchange.com/a/27302}{Andrew Stacey})}
\label{fig:framelayers}
\end{figure}
@@ -934,47 +934,37 @@ By clicking on the document title in a navigation bar (not all themes show it),
\subsubsection{The Navigation Symbols}
\label{section-navigation-symbols}
-Navigation symbols are small icons that are shown on every slide in |beamer| mode by default. The following symbols are shown:
-\begin{enumerate}
-\item
- A slide icon, which is depicted as a single rectangle. To the left and right of this symbol, a left and right arrow are shown.
-\item
- A frame icon, which is depicted as three slide icons ``stacked on top of each other''. This symbol is framed by arrows.
-\item
- A subsection icon, which is depicted as a highlighted subsection entry in a table of contents. This symbol is framed by arrows.
-\item
- A section icon, which is depicted as a highlighted section entry (together with all subsections) in a table of contents. This symbol is framed by arrows.
-\item
- A presentation icon, which is depicted as a completely highlighted table of contents.
-\item
- An appendix icon, which is depicted as a completely highlighted table of contents consisting of only one section. (This icon is only shown if there is an appendix.)
-\item
- Back and forward icons, depicted as circular arrows.
-\item
- A ``search'' or ``find'' icon, depicted as a detective's magnifying glass.
-\end{enumerate}
-
-Clicking on the left arrow next to an icon always jumps to (the last slide of) the previous slide, frame, subsection, or section. Clicking on the right arrow next to an icon always jumps to (the first slide of) the next slide, frame, subsection, or section.
+\begingroup
+\makeatletter
+\newcommand{\beamer@linkspace}[1]{}
+\renewcommand{\Acrobatmenu}[2]{}
+\renewcommand{\usebeamercolor}[2][]{\color{.!20}}
+\makeatother
-Clicking \emph{on} any of these icons has different effects:
-\begin{enumerate}
-\item
+Navigation symbols are small icons that are shown on every slide in |beamer| mode by default. The following symbols are shown:
+\begin{description}
+\item[{\makebox[0.7cm][l]{\insertslidenavigationsymbol}}]
+ A slide icon, which is depicted as a single rectangle. To the left and right of this symbol, a left and right arrow are shown.\newline
If supported by the viewer application, clicking on a slide icon pops up a window that allows you to enter a slide number to which you wish to jump.
-\item
+\item[{\makebox[0.7cm][l]{\insertframenavigationsymbol}}]
+ A frame icon, which is depicted as three slide icons ``stacked on top of each other''. This symbol is framed by arrows.\newline
Clicking on the left side of a frame icon will jump to the first slide of the frame, clicking on the right side will jump to the last slide of the frame (this can be useful for skipping overlays).
-\item
+\item[{\makebox[0.7cm][l]{\insertsubsectionnavigationsymbol}}]
+ A subsection icon, which is depicted as a highlighted subsection entry in a table of contents. This symbol is framed by arrows.\newline
Clicking on the left side of a subsection icon will jump to the first slide of the subsection, clicking on the right side will jump to the last slide of the subsection.
-\item
+\item[{\makebox[0.7cm][l]{\insertsectionnavigationsymbol}}]
+ A section icon, which is depicted as a highlighted section entry (together with all subsections) in a table of contents. This symbol is framed by arrows.\newline
Clicking on the left side of a section icon will jump to the first slide of the section, clicking on the right side will jump to the last slide of the section.
-\item
- Clicking on the left side of the presentation icon will jump to the first slide, clicking on the right side will jump to the last slide of the presentation. However, this does \emph{not} include the appendix.
-\item
- Clicking on the left side of the appendix icon will jump to the first slide of the appendix, clicking on the right side will jump to the last slide of the appendix.
-\item
- If supported by the viewer application, clicking on the back and forward symbols jumps to the previously visited slides.
-\item
- If supported by the viewer application, clicking on the search icon pops up a window that allows you to enter a search string. If found, the viewer application will jump to this string.
-\end{enumerate}
+\item[{\makebox[0.7cm][l]{\insertdocnavigationsymbol}}]
+ A presentation icon, which is depicted as a completely highlighted table of contents and an appendix icon, which is depicted as a completely highlighted table of contents consisting of only one section. (This icon is only shown if there is an appendix.)\newline
+ Clicking on the left side of the presentation icon will jump to the first slide, clicking on the right side will jump to the last slide of the presentation. However, this does \emph{not} include the appendix. Clicking on the left side of the appendix icon will jump to the first slide of the appendix, clicking on the right side will jump to the last slide of the appendix.
+\item[{\makebox[0.7cm][l]{\insertbackfindforwardnavigationsymbol}}]
+ Back and forward icons, depicted as circular arrows and a ``search'' or ``find'' icon, depicted as a detective's magnifying glass.\newline
+ If supported by the viewer application, clicking on the back and forward symbols jumps to the previously visited slides and clicking on the search icon pops up a window that allows you to enter a search string. If found, the viewer application will jump to this string.
+\end{description}
+\endgroup
+
+Clicking on the left arrow next to an icon always jumps to (the last slide of) the previous slide, frame, subsection, or section. Clicking on the right arrow next to an icon always jumps to (the first slide of) the next slide, frame, subsection, or section.
You can reduce the number of icons that are shown or their layout by adjusting the |navigation symbols| template.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
index 175ec3ab15..9058356c1e 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
@@ -608,7 +608,8 @@ sectionstyle=show/shaded,subsectionstyle=show/show/shaded
\example
|subsectionstyle=show/shaded/hide| causes all subsections outside the current section to be suppressed and only the current subsection in the current section to be highlighted.
\item
- \declare{|subsubsectionstyle=|\meta{style for current subsubsection}|/|\meta{style for other subsubsections in current subsection}|/|\\\meta{style for subsubsections in other subsections in current section}|/|\meta{style for subsubsections in other subsections in other sections}} specifies how subsubsections should be displayed. The same styles as for the |sectionstyle| option may be given. You can omit the last style, in which case the second also applies to the last, and you can omit the last two, in which case the first applies to all.
+ \declare{|subsubsectionstyle=|\meta{style for current subsubsection}|/|\meta{style for other subsubsections in current subsection}|/|\\\meta{style for subsubsections in other subsections in current section}|/|\meta{style for subsubsections in other subsections in other sections}} specifies how subsubsections should be displayed.
+ The same styles as for the |sectionstyle| option may be given. You can omit styles from the end of the list, in which case the last given style will also be applied to the omitted styles.
This option operates in an analogous manner to |subsectionstyle|.
\end{itemize}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
index 317ab826bd..e31c838a23 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
@@ -105,20 +105,21 @@ This user's guide contains descriptions of all ``public'' commands, environments
Unfortunately, it is not quite trivial to come up with a good definition for some templates. Fortunately, there are often \emph{predefined options} for a template. These are indicated like this:
\begin{itemize}
- \itemoption{square}{}
- causes a small square to be used to render the template.
- \itemoption{circle}{\marg{radius}}
- causes circles of the given radius to be used to render the template.
+ \itemoption{rose}{}
+ causes a rose be used to render the template.
+ \itemoption{shamrock}{\marg{number of leaves}}
+ causes a shamrock with a given number of leaves to be used to render the template.
\end{itemize}
You can install such a predefined option like this:
\begin{verbatim}
-\setbeamertemplate{some beamer element}[square]
-%% Now squares are used
+\setbeamertemplate{some beamer element}[rose]
+%% Now a rose is used
-\setbeamertemplate{some beamer element}[circle]{3pt}
-%% Now a circle is used
+\setbeamertemplate{some beamer element}[shamrock]{3}
+%% Now a shamrock is used
\end{verbatim}
+ Note that not all templates have predefined options and that not all templates with predefined options allow an additional argument.
\beamer-colors are explained in Section~\ref{section-colors}. Here is the essence: To change the foreground of the color to, say, red, use
\begin{verbatim}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-overlays.tex b/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
index 82767756f5..e21d605d9d 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
@@ -508,14 +508,14 @@ This section explains how to define new commands that are overlay specification-
\end{actionenv}}
\begin{frame}
- \begin{myboldblock}<2>
+ \begin{myboldblock}{A title for the theorem}<2>
This theorem is shown only on the second slide.
\end{myboldblock}
\end{frame}
\end{verbatim}
\example
- Text in the following environment is normally bold and italic on non-specified slides:
+ Text in the following environment is bold on specified slides and of normal weight on non-specified slides:
\begin{verbatim}
\newenvironment<>{boldornormal}
{\begin{altenv}#1
@@ -545,13 +545,15 @@ This section explains how to define new commands that are overlay specification-
\end{verbatim}
\end{command}
-In a similar way |\NewDocumentCommand|, |\NewDocumentEnvironment| etc. can be used to define overlay aware commands and environments. The overlay argument can be specified via |d<>| (without default value) or |D<>{}| (with default value) type arguments.
+In a similar way |\NewDocumentCommand|, |\NewDocumentEnvironment| etc.\ can be used to define overlay aware commands and environments. The overlay argument can be specified via |d<>| (without default value) or |D<>{}| (with default value) type arguments.
\example
\begin{verbatim}
\NewDocumentCommand{\makeblue}{D<>{.-} m}{{\color<#1>{blue}#2}}
\end{verbatim}
+Note that by using |\NewDocumentCommand|, |\NewDocumentEnvironment| etc.\ the original definition of the command or environment won't be retained as |\beameroriginal{...}| or |\begin{original...}|.
+
The following two commands can be used to ensure that a certain counter is automatically reset on subsequent slides of a frame. This is necessary for example for the equation count. You might want this count to be increased from frame to frame, but certainly not from overlay slide to overlay slide. For equation counters and footnote counters (you should not use footnotes), these commands have already been invoked.
\begin{command}{\resetcounteronoverlays\marg{counter name}}
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
index 2c93b611ac..3939ee7a71 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex
index 1380e2307d..cdca8af0e8 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.tex
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.tex
@@ -13,7 +13,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.68}
+\def\beamerugversion{3.69}
\def\beamerugpgfversion{3.1.7}
\def\beamerugxcolorversion{2.00}
@@ -29,7 +29,9 @@
\usepackage[left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
\usepackage{translator}
\usepackage{tikz}
+\usepackage{beamerarticle}
+\input{beamerbasenavigationsymbols}
\input{beamerug-macros}
\makeindex
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
index a97f0e3d65..7fbce74d3e 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
index 78dada67f5..958a7f288b 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
index 8c3282ad20..67c4bce95c 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
index 64adaf5d9b..fd6c9c1b22 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
index 1e203002e8..0a18dc5a73 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
index 9a2d23dc25..fb451d9195 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
Binary files differ