summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-19 21:31:22 +0000
committerKarl Berry <karl@freefriends.org>2021-03-19 21:31:22 +0000
commit07361c60a45546dc2e144252c6fae7e5a26d73b1 (patch)
treed50e5bc63c62b2d3e5a416885d3884931db4743b
parentbe5be64bb624a852ee9fae46049cc54a5ad8ed87 (diff)
beamer (19mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58550 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/beamer/AUTHORS.md1
-rw-r--r--Master/texmf-dist/doc/latex/beamer/CHANGELOG.md10
-rw-r--r--Master/texmf-dist/doc/latex/beamer/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdfbin323856 -> 324851 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdfbin531267 -> 531872 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdfbin425054 -> 425300 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.pdfbin1837679 -> 1839214 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.tex2
-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/beamerbasecompatibility.sty45
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty1
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty14
13 files changed, 49 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/AUTHORS.md b/Master/texmf-dist/doc/latex/beamer/AUTHORS.md
index 25368a8c61b..9a1ae9a782c 100644
--- a/Master/texmf-dist/doc/latex/beamer/AUTHORS.md
+++ b/Master/texmf-dist/doc/latex/beamer/AUTHORS.md
@@ -4,6 +4,7 @@
- Louis Stuart <louisstuart96@gmail.com>
- Joseph Wright <joseph.wright@morningstar2.co.uk>
+- samcarter <sam.carter8@aol.com>
## Former
diff --git a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
index 1d675b28be1..25609aee6c7 100644
--- a/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/beamer/CHANGELOG.md
@@ -8,6 +8,12 @@ a major and minor version only.
## [Unreleased]
+## [v3.62]
+
+### Fixed
+- Issue with naming of file hooks (#670)
+- fixed problem with `\insertmainframenumber` in combination with `ignorenonframetext` (see #665)
+
## [v3.61]
### Fixed
@@ -15,6 +21,7 @@ a major and minor version only.
- `\beamer@bibiconwidth` already defined bug (see #652)
- shadowboxes and transparent overlays (see #654)
- workaround for misaligment of biblatex with sidebar theme (see #645)
+- bug with nonshadow rounded boxed (see #660)
## [v3.60]
@@ -123,7 +130,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.61...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.62...HEAD
+[v3.62]: https://github.com/josephwright/beamer/compare/v3.61...v3.62
[v3.61]: https://github.com/josephwright/beamer/compare/v3.60...v3.61
[v3.60]: https://github.com/josephwright/beamer/compare/v3.59...v3.60
[v3.59]: https://github.com/josephwright/beamer/compare/v3.58...v3.59
diff --git a/Master/texmf-dist/doc/latex/beamer/README.md b/Master/texmf-dist/doc/latex/beamer/README.md
index 29bac8c6e3a..a9a23c85e9c 100644
--- a/Master/texmf-dist/doc/latex/beamer/README.md
+++ b/Master/texmf-dist/doc/latex/beamer/README.md
@@ -2,7 +2,7 @@
## Overview
-The `beamer` class is focussed on producing (on-screen) presentations, along
+The `beamer` class is focused on producing (on-screen) presentations, along
with support material such as handouts and speaker notes. Content is created
in a `frame` environment, each of which can be divided up into a number of
slides (actual output pages). A simple 'action' notation is used to specify
@@ -12,7 +12,7 @@ range of environments to enable complex slide relationships to be constructed.
The appearance of slides is controlled by a template system. Many of the
elements of slides can be adjusted by setting simple key-based values in
the preamble. More complex changes can be implemented by altering specific,
-targeted definitions without needing to re-write entire blocks of code. This
+targeted definitions without needing to rewrite entire blocks of code. This
allows a variety of visual appearances to be selected for the same content
source.
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
index 98aa2550195..9f9e5e7b620 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
index c5202584f04..24fec636757 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf
index 21e45e9d4f4..a4e92838cd8 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
index 766914a0bf1..838932df6ea 100644
--- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
index eda698782a6..fd0f7bcadf0 100644
--- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
+++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
@@ -13,7 +13,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.61}
+\def\beamerugversion{3.62}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index cc2bc8082eb..7854b07b04a 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}
- [2021/02/09 v3.61 A class for typesetting presentations]
+ [2021/03/19 v3.62 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 e0430e6aeb4..f855632e28d 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}
- [2021/02/09 v3.61 beamer input in article mode]
+ [2021/03/19 v3.62 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/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
index 4a515689342..75050cfcab3 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty
@@ -51,7 +51,27 @@
%
% Fixes right before the start of the document.
%
-\@ifundefined{AddToHook}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2020-10-01}
+ {%
+ \AddToHook{env/document/begin}[beamer]{\beamer@firstminutepatches}%
+ \AddToHook{env/document/begin}[beamer]{%
+ \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
+ }%
+ \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
+ {%
+ \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
+ % Fix meddline with enumerate items
+ \renewcommand\theenumi{\@arabic\c@enumi}%
+ \renewcommand\theenumii{\@arabic\c@enumii}%
+ \renewcommand\theenumiii{\@arabic\c@enumiii}%
+ \catcode`<=12 \catcode`>=12 %% right place??
+ \beamer@lastminutepatches
+ \ifbeamer@ignorenonframe
+ \expandafter\mode\expandafter*%
+ \fi
+ }
+ }
{%
\let\beamer@origdocument\document
\def\document{%
@@ -82,37 +102,18 @@
\expandafter\mode\expandafter*%
\fi}%
}
- {%
- \AddToHook{env/begin/document}[beamer]{\beamer@firstminutepatches}%
- \AddToHook{env/begin/document}[beamer]{%
- \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
- }%
- \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
- {%
- \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
- % Fix meddline with enumerate items
- \renewcommand\theenumi{\@arabic\c@enumi}%
- \renewcommand\theenumii{\@arabic\c@enumii}%
- \renewcommand\theenumiii{\@arabic\c@enumiii}%
- \catcode`<=12 \catcode`>=12 %% right place??
- \beamer@lastminutepatches
- \ifbeamer@ignorenonframe
- \expandafter\mode\expandafter*%
- \fi
- }
- }
\mode
<article>
{
- \@ifundefined{AddToHook}
+ \IfFormatAtLeastTF{2020-10-01}
+ {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
{%
\let\beamer@origdocument\document
\def\document{%
\beamer@origdocument%
\beamer@lastminutepatches}
}
- {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
\g@addto@macro\beamer@lastminutepatches{%
\ifbeamer@articleactive
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
index d68e0c0c15d..79091d9cd5e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty
@@ -122,6 +122,7 @@
\ifx\beamer@nexttoken\lecture\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\note\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\appendix\let\next=\beamer@stopoutsidemode\fi
+ \ifx\beamer@nexttoken\beamer@appendixwrite\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\againframe\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\section\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\subsection\let\next=\beamer@stopoutsidemode\fi
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
index 9193f5ca45d..b28b9ea853f 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
@@ -372,13 +372,19 @@
\newcommand<>\beamer@appendix{}
\def\beamer@resetappendix{\global\let\appendix\beamer@appendix}
-\newcommand<>\appendix{%
- \beamer@inappendixtrue%
- \only#1{\part{\appendixname}%
+\def\beamer@appendixwrite{%
\immediate\write\@auxout{\string\@writefile{nav}%
{\noexpand\headcommand{\noexpand\gdef\noexpand\insertmainframenumber{\the\c@framenumber}}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer@appendixpages{\the\c@page}}}%
- \beamer@resetappendix}%
+}
+
+\newcommand<>\appendix{%
+ \beamer@inappendixtrue%
+ \only#1{%
+ \part{\appendixname}%
+ \beamer@appendixwrite%
+ \beamer@resetappendix%
+ }%
}
\def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax}