diff options
author | Norbert Preining <norbert@preining.info> | 2020-12-15 03:01:41 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-12-15 03:01:41 +0000 |
commit | 2e0b1124510825b03d99a6bfbf50dc2a8391a635 (patch) | |
tree | 6ebb25de75664b553d91d7335dec42590ba22002 /macros/latex/contrib/beamer | |
parent | 5fc9e4626c1b64fd01838f967954fc43a268398e (diff) |
CTAN sync 202012150301
Diffstat (limited to 'macros/latex/contrib/beamer')
30 files changed, 127 insertions, 149 deletions
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md index 1dee6206af..0b681d414e 100644 --- a/macros/latex/contrib/beamer/CHANGELOG.md +++ b/macros/latex/contrib/beamer/CHANGELOG.md @@ -8,6 +8,19 @@ a major and minor version only. ## [Unreleased] +## [v3.60] + +### Changed + +- added translations for author, institute and date indicator of inmargin theme (see #616) +- re-introducing transparent shadows from v3.51 (see #492) + +### Fixed + +- Margins in frame title color box (see #614) +- adding font substitution (see #630) +- delaying fixes for biblatex styles until the bibliography (see #625) + ## [v3.59] ### Changed @@ -102,7 +115,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.59...HEAD +[Unreleased]: https://github.com/josephwright/beamer/compare/v3.60...HEAD +[v3.60]: https://github.com/josephwright/beamer/compare/v3.59...v3.60 [v3.59]: https://github.com/josephwright/beamer/compare/v3.58...v3.59 [v3.58]: https://github.com/josephwright/beamer/compare/v3.57...v3.58 [v3.57]: https://github.com/josephwright/beamer/compare/v3.56...v3.57 diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls index 376c5d7aa9..c776f7d4d3 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} - [2020/07/22 v3.59 A class for typesetting presentations] + [2020/11/26 v3.60 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 90b6b97afc..8cc1969bc6 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} - [2020/07/22 v3.59 beamer input in article mode] + [2020/11/26 v3.60 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/beamerbaseboxes.sty b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty index ee3ecd9064..566393c88f 100644 --- a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty +++ b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty @@ -23,9 +23,9 @@ \newif\ifbmb@shadow \newbox\bmb@box \newbox\bmb@colorbox -\newbox\bmb@boxshadow -\newbox\bmb@boxshadowball -\newbox\bmb@boxshadowballlarge +\newdimen\bmb@boxwidth +\newdimen\bmb@boxheight +\newdimen\bmb@prevheight \newdimen\bmb@temp \newdimen\bmb@dima \newdimen\bmb@dimb @@ -110,11 +110,6 @@ \nointerlineskip% \vskip-0.5pt% \fi% - \ifbmb@shadow% - \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}% - \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}% - \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}% - \fi% \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}% \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}% \vskip2pt% @@ -126,49 +121,66 @@ \def\endbeamerboxesrounded{% \end{minipage}\egroup% - \wd\bmb@box=\bmb@width% \bmb@temp=\dp\bmb@box% \advance\bmb@temp by.5pt% \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}% \dp\bmb@box=0pt% - \bmb@temp=\wd\bmb@box% + \bmb@boxwidth=\bmb@width% + \bmb@boxheight=\ht\bmb@box% + \advance\bmb@boxheight by4bp% + \advance\bmb@boxheight by\bmb@prevheight% + \ifbmb@shadow% + \pgfdeclareradialshading{bmb@shadowball}{\pgfpointorigin} + {% + color(0bp)=(pgftransparent!50); + color(4bp)=(pgftransparent!100) + }% + \pgfdeclareradialshading{bmb@shadowballlarge}{\pgfpointorigin} + {% + color(0bp)=(pgftransparent!0); + color(8bp)=(pgftransparent!100) + }% + \pgfdeclarehorizontalshading{bmb@shadowhorz\the\bmb@boxheight}{\bmb@boxheight-6bp} + {% + color(0bp)=(pgftransparent!0); + color(8bp)=(pgftransparent!100) + }% + \pgfdeclareverticalshading{bmb@shadowvert\the\bmb@boxwidth}{\bmb@boxwidth-4bp} + {% + color(0bp)=(pgftransparent!100); + color(8bp)=(pgftransparent!0) + }% + \pgfdeclarefading{bmb@shadowmask\the\bmb@boxwidth\the\bmb@boxheight} + {% + \begin{pgfpicture} + \pgftext[at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowball}} + \pgftext[at=\pgfpoint{\bmb@boxwidth}{8bp}]{\pgfuseshading{bmb@shadowballlarge}} + \pgftext[at=\pgfpoint{\bmb@boxwidth+4bp}{\bmb@boxheight+2bp}]{\pgfuseshading{bmb@shadowball}} + \pgftext[left, at=\pgfpoint{4bp}{4bp}]{\pgfuseshading{bmb@shadowvert\the\bmb@boxwidth}} + \pgftext[base, at=\pgfpoint{\bmb@boxwidth+4bp}{8bp}]{\pgfuseshading{bmb@shadowhorz\the\bmb@boxheight}} + % + % clipping is needed because shadow is typeset on top of box + \begin{pgfscope} + \pgfsetcolor{black} + \pgfpathrectangle{\pgfpoint{4bp}{8bp}}{\pgfpoint{\bmb@boxwidth-0.2bp}{\bmb@boxheight-2bp}} + \pgfusepath{fill} + \end{pgfscope} + \end{pgfpicture} + }% + \fi% + \bmb@temp=\bmb@width% \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp% \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp% \hbox{% \begin{pgfpicture}{0bp}{0bp}{0bp}{0bp} \ifbmb@shadow% - {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}} - \begin{pgfscope} - {% - \advance\bmb@temp by-1bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}% - \pgfusepath{clip} - }% - {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}} - \end{pgfscope} - \begin{pgfscope} - \advance\bmb@temp by-4bp% - \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}} - \pgfusepath{clip} - {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}% - \end{pgfscope} - \begin{pgfscope} - \advance\bmb@temp by 4bp% - \bmb@dima=\ht\bmb@box% - \advance\bmb@dima by\bmb@prevheight% - \advance\bmb@dima by 4bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}} - \pgfusepath{clip} - \advance\bmb@dima by-4bp% - {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}} - \advance\bmb@dima by-1bp% - \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}} - \pgfusepath{clip} - \advance\bmb@temp by4bp% - {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}% - \pgftransformrotate{90}% - \pgftext[left,base]{\box\bmb@boxshadow}}% - \end{pgfscope} + \begin{pgfscope} + \pgfpathrectangle{\pgfpoint{0bp}{-7bp}} + {\pgfpoint{\bmb@boxwidth+8bp}{\bmb@boxheight+6bp}} + \pgfsetfading{bmb@shadowmask\the\bmb@boxwidth\the\bmb@boxheight}{% + \pgftransformshift{\pgfpoint{0.5\bmb@boxwidth+6bp}{0.5\bmb@boxheight-4bp}}} + \pgfusepath{fill} + \end{pgfscope} \fi% \unhbox\bmb@colorbox% \pgfpathqmoveto{-4bp}{1bp} @@ -179,47 +191,11 @@ {\pgfpoint{\the\bmb@dimb}{-1.2bp}}% {\pgfpoint{\the\bmb@dimb}{1bp}}% { - \bmb@dima=\ht\bmb@box% - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}} - \pgfusepath{fill} - } - \ifbmb@shadow% - { - \color{black!50!bg} - \pgfsetlinewidth{0pt} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{-.5bp}} \bmb@dima=\ht\bmb@box% - \advance\bmb@dima by\bmb@prevheight% - \advance\bmb@dima by 1bp% - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \bmb@temp=\bmb@dima - \advance\bmb@dima by 1bp% - \color{black!31!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1bp% - \advance\bmb@temp by 1bp% - \color{black!19!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1bp% - \advance\bmb@temp by 1bp% - \color{black!6!bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} - \advance\bmb@dima by 1.5bp% - \advance\bmb@temp by 1bp% - \color{bg} - \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}} - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfusepath{stroke} + \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}} + \pgfusepath{fill} } - \fi \end{pgfpicture}% \box\bmb@box% }% @@ -231,17 +207,7 @@ \egroup% of \vbox\bgroup } -% % Shadings -% - -% Shadows -\pgfdeclareradialshading[black,bg]{bmb@shadowball}{\pgfpointorigin}{% - color(0bp)=(black!50!bg); color(4bp)=(bg)} -\pgfdeclareradialshading[black,bg]{bmb@shadowballlarge}{\pgfpointorigin}{% - color(0bp)=(black!50!bg); color(4bp)=(black!50!bg); color(8bp)=(bg)} -\pgfdeclareverticalshading[black,bg]{bmb@shadow}{200cm}{% - color(0bp)=(bg); color(4bp)=(black!50!bg); color(8bp)=(black!50!bg)} % Transition line \pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{% diff --git a/macros/latex/contrib/beamer/base/beamerbasecolor.sty b/macros/latex/contrib/beamer/base/beamerbasecolor.sty index 6818db39bd..83393f62df 100644 --- a/macros/latex/contrib/beamer/base/beamerbasecolor.sty +++ b/macros/latex/contrib/beamer/base/beamerbasecolor.sty @@ -214,7 +214,7 @@ \hskip-\beamer@colbox@colseps% }\fi% \ifdim\wd\beamer@tempbox>\textwidth% - \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@leftmargin\relax}% + \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@rightmargin\relax}% \fi% \box\beamer@tempbox% \fi% diff --git a/macros/latex/contrib/beamer/base/beamerbasefont.sty b/macros/latex/contrib/beamer/base/beamerbasefont.sty index 1a611e3f92..01fdd9b6bb 100644 --- a/macros/latex/contrib/beamer/base/beamerbasefont.sty +++ b/macros/latex/contrib/beamer/base/beamerbasefont.sty @@ -176,7 +176,7 @@ <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% }{} - +\DeclareFontShape{OT1}{cmss}{b}{n}{<->ssub * cmss/bx/n}{} \newcommand*{\beamer@font@check}{% \def\beamer@cmr{cmr}% diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty index c0d85832b5..453275f6b4 100644 --- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty +++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty @@ -503,19 +503,23 @@ \mode<presentation>{\setbeamertemplate{bibliography item}{\insertbiblabel}}} \csappto{blx@filehook@postload@authoryear.bbx}{% \mode<presentation>{% - \newlength{\beamer@bibiconwidth} - \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}} - \setlength{\labelwidth}{-\beamer@bibiconwidth} - \addtolength{\labelwidth}{2\labelsep} - \addtolength{\bibhang}{\labelsep} + \pretocmd{\bibsetup}{% + \newlength{\beamer@bibiconwidth}% + \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}% + \setlength{\labelwidth}{-\beamer@bibiconwidth}% + \addtolength{\labelwidth}{2\labelsep}% + \addtolength{\bibhang}{\labelsep}% + }{}{}% }} \csappto{blx@filehook@postload@authortitle.bbx}{% \mode<presentation>{% - \newlength{\beamer@bibiconwidth} - \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}} - \setlength{\labelwidth}{-\beamer@bibiconwidth} - \addtolength{\labelwidth}{2\labelsep} - \addtolength{\bibhang}{\labelsep} + \pretocmd{\bibsetup}{% + \newlength{\beamer@bibiconwidth}% + \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}% + \setlength{\labelwidth}{-\beamer@bibiconwidth}% + \addtolength{\labelwidth}{2\labelsep}% + \addtolength{\bibhang}{\labelsep}% + }{}{}% }} diff --git a/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty b/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty index 534d3cd9d7..276dab1075 100644 --- a/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty +++ b/macros/latex/contrib/beamer/base/themes/inner/beamerinnerthemeinmargin.sty @@ -52,11 +52,10 @@ {\leavevmode% \inserttocsubsubsection\par\vskip.5ex} - \def\inserttitleindicator{} -\def\insertauthorindicator{Who?} -\def\insertinstituteindicator{From?} -\def\insertdateindicator{When?} +\def\insertauthorindicator{\translate{Who?}} +\def\insertinstituteindicator{\translate{From?}} +\def\insertdateindicator{\translate{When?}} \defbeamertemplate*{title page}{inmargin} { diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty index 9e4385341d..de2c9775cb 100644 --- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty +++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty @@ -12,30 +12,33 @@ \useoutertheme{split} - \setbeamercolor{frametitle}{parent=subsection in head/foot} \setbeamercolor{frametitle right}{parent=section in head/foot} - \pgfdeclarehorizontalshading[frametitle.bg,frametitle right.bg]{beamer@frametitleshade}{\paperheight}{% color(0pt)=(frametitle.bg); - color(\paperwidth)=(frametitle right.bg)} + color(\paperwidth)=(frametitle right.bg) +} -\AtBeginDocument{ - \pgfdeclareverticalshading{beamer@topshade}{\paperwidth}{% - color(0pt)=(bg); - color(4pt)=(black!50!bg)} +\pgfdeclareverticalshading{beamer@topshade}{2\paperwidth}{% + color(0pt)=(pgftransparent!100); + color(8pt)=(pgftransparent!0) } +\pgfdeclarefading{beamer@topshadowmask}{\pgfuseshading{beamer@topshade}} + \addtobeamertemplate{headline} {} {% - \vskip-0.2pt - \pgfuseshading{beamer@topshade} + \vskip0pt + \begin{pgfpicture} + \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{4pt}}% + \pgfsetfading{beamer@topshadowmask}{}% + \pgfusepath{fill}% + \end{pgfpicture} \vskip-2pt } - \defbeamertemplate*{frametitle}{shadow theme} {% \nointerlineskip% @@ -61,23 +64,26 @@ \beamer@tempdim=\ht\beamer@tempbox% \advance\beamer@tempdim by 2pt% \begin{pgfpicture}{0pt}{0pt}{\paperwidth}{\beamer@tempdim} - \usebeamercolor{frametitle right} - \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}} - \pgfusepath{clip} - \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}} + \begin{pgfscope} + \pgfsetfillcolor{black}% + \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{8pt}}% + \pgfsetfading{beamer@topshadowmask}{}% + \pgfusepath{fill}% + \end{pgfscope} + \begin{pgfscope} + \usebeamercolor{frametitle right}% + \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}}% + \pgfusepath{clip}% + \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}}% + \end{pgfscope} \end{pgfpicture} \hskip-\paperwidth% \box\beamer@tempbox% }% \hskip-\Gm@rmargin% }% - \nointerlineskip - \vskip-0.2pt - \hbox to\textwidth{\hskip-\Gm@lmargin\pgfuseshading{beamer@topshade}\hskip-\Gm@rmargin} - \vskip-2pt + \vskip-2pt } - - \mode <all> diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf Binary files differindex b05dc1386d..de9e15bfbf 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf Binary files differindex e5c8a0d6dc..b9dfe363a9 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf Binary files differindex 1869a743bc..d23e1dfcee 100644 --- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf +++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf diff --git a/macros/latex/contrib/beamer/doc/beamerthemeexamplebase.tex b/macros/latex/contrib/beamer/doc/beamerthemeexamplebase.tex index e537d7cd3a..4b8ce8ca96 100644 --- a/macros/latex/contrib/beamer/doc/beamerthemeexamplebase.tex +++ b/macros/latex/contrib/beamer/doc/beamerthemeexamplebase.tex @@ -12,8 +12,6 @@ \beamertemplatesolidbackgroundcolor{black!5} \beamertemplatetransparentcovered -\usepackage{times} - \title{There Is No Largest Prime Number} \subtitle{With an introduction to a new proof technique} diff --git a/macros/latex/contrib/beamer/doc/beamerug-elements.tex b/macros/latex/contrib/beamer/doc/beamerug-elements.tex index b3ac8910c9..cf05fe2a37 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-elements.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-elements.tex @@ -72,6 +72,8 @@ In the following examples, the color themes |seahorse| and |rose| are used to sh This theme is a ``dirty'' inner theme since it messes with things that an inner theme should not mess with. In particular, it changes the width of the left sidebar to a large value. However, you can still use it together with most outer themes. Using columns inside this theme is problematic. Most of the time, the result will not be what you expect. + + The indicators for the title page can be adjusted by redefining |\inserttitleindicator|, |\insertauthorindicator|, |\insertinstituteindicator| and |\insertdateindicator|. \end{innerthemeexample} diff --git a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex index 943a1b098e..d24d9cf460 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex @@ -579,7 +579,7 @@ sectionstyle=show/shaded,subsectionstyle=show/show/shaded \articlenote The options are ignored in |article| mode. - \begin{element}{section/subsection in toc}\semiyes\no\no + \begin{element}{sections/subsections in toc}\semiyes\no\no This is a parent template, whose children are |section in toc| and |subsection in toc|. This means that if you use the |\setbeamertemplate| command on this template, the command is instead called for both of these children (with the same arguments). \begin{templateoptions} @@ -602,7 +602,7 @@ sectionstyle=show/shaded,subsectionstyle=show/show/shaded If none of the above options suits you, you have to change the templates |section in toc| and |subsection in toc| directly. \end{element} - \begin{element}{section/subsection in toc shaded}\semiyes\no\no + \begin{element}{sections/subsections in toc shaded}\semiyes\no\no A parent template with children |section in toc shaded| and |subsection in toc shaded|. They are used to render section and subsection entries when they are currently shaded; like all non-current subsections in |\tableofcontents[currentsubsection]|. \begin{templateoptions} diff --git a/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex b/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex index 0aef255f40..36a994a397 100644 --- a/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex +++ b/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex @@ -26,7 +26,7 @@ When you start to create a presentation, the very first thing you should worry a \item A simple rule for the number of frames is that you should have at most one frame per minute. \item - In most situations, you will have less time for your presentation that you would like. + In most situations, you will have less time for your presentation than you would like. \item \emph{Do not try to squeeze more into a presentation than time allows for.} No matter how important some detail seems to you, it is better to leave it out, but get the main message across, than getting neither the main message nor the detail across. \end{itemize} diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf Binary files differindex 9475391209..81b81739c1 100644 --- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf +++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex index 1f315dcfd2..fa16f72b30 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.59} +\def\beamerugversion{3.60} \def\beamerugpgfversion{1.00} \def\beamerugxcolorversion{2.00} diff --git a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex index 4e8ba17d19..6aad848d79 100644 --- a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex +++ b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex @@ -9,7 +9,9 @@ % $Header$ -\documentclass[notes]{beamer} +\documentclass{beamer} + +\setbeameroption{show notes} % You might wish to try this instead of the above line: %\documentclass[class=article]{beamer} @@ -24,7 +26,6 @@ \definecolor{sidebackground}{RGB}{230,242,250} \color{beamerstructure} \usetheme{Goettingen} - \usepackage{times} \userightsidebarcolortemplate{\color{sidebackground}} \beamertemplateballitem } diff --git a/macros/latex/contrib/beamer/doc/examples/a-conference-talk/beamerexample-conference-talk.tex b/macros/latex/contrib/beamer/doc/examples/a-conference-talk/beamerexample-conference-talk.tex index f5faef720e..1c8faa4c8d 100644 --- a/macros/latex/contrib/beamer/doc/examples/a-conference-talk/beamerexample-conference-talk.tex +++ b/macros/latex/contrib/beamer/doc/examples/a-conference-talk/beamerexample-conference-talk.tex @@ -31,7 +31,6 @@ \usepackage[english]{babel} \usepackage[latin1]{inputenc} -\usepackage{times} \usepackage[T1]{fontenc} diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-style.tex b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-style.tex index e24a409cfb..6e76330447 100644 --- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-style.tex +++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-style.tex @@ -12,10 +12,8 @@ \usepackage[german]{babel} \usepackage[latin1]{inputenc} -\usepackage{times} \mode<article> { - \usepackage{times} \usepackage{mathptmx} \usepackage[left=1.5cm,right=6cm,top=1.5cm,bottom=3cm]{geometry} } diff --git a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.de.tex b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.de.tex index 7f602b7347..1ef3fc74e2 100644 --- a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.de.tex +++ b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.de.tex @@ -40,7 +40,6 @@ \usepackage[latin1]{inputenc} % oder was auch immer -\usepackage{times} \usepackage[T1]{fontenc} % Oder was auch immer. Zu beachten ist, das Font und Encoding passen % müssen. Falls T1 nicht funktioniert, kann man versuchen, die Zeile diff --git a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.en.tex b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.en.tex index 6b9195dc67..a862251513 100644 --- a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.en.tex +++ b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.en.tex @@ -39,7 +39,6 @@ \usepackage[latin1]{inputenc} % or whatever -\usepackage{times} \usepackage[T1]{fontenc} % Or whatever. Note that the encoding and the font should match. If T1 % does not look nice, try deleting the line with the fontenc. diff --git a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.fr.tex b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.fr.tex index cf7d86018b..5130d341ef 100644 --- a/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.fr.tex +++ b/macros/latex/contrib/beamer/doc/solutions/conference-talks/conference-ornate-20min.fr.tex @@ -38,7 +38,6 @@ \usepackage[latin1]{inputenc} % or autre -\usepackage{times} \usepackage[T1]{fontenc} % Or autre. Notez que le codage et la fonte doivent être assortis. Si T1 % ne paraît pas très esthétique, essayer d'effacer la ligne contenant fontenc. diff --git a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.de.tex b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.de.tex index ea2729cd8c..a120adaff0 100644 --- a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.de.tex +++ b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.de.tex @@ -41,7 +41,6 @@ \usepackage[latin1]{inputenc} % oder was auch immer -\usepackage{times} \usepackage[T1]{fontenc} % Oder was auch immer. Zu beachten ist, das Font und Encoding passen % müssen. Falls T1 nicht funktioniert, kann man versuchen, die Zeile diff --git a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.en.tex b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.en.tex index a07a6f15df..00eb0ad756 100644 --- a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.en.tex +++ b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.en.tex @@ -39,7 +39,6 @@ \usepackage[latin1]{inputenc} % or whatever -\usepackage{times} \usepackage[T1]{fontenc} % Or whatever. Note that the encoding and the font should match. If T1 % does not look nice, try deleting the line with the fontenc. diff --git a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.fr.tex b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.fr.tex index e75f14788d..05dee8bc86 100644 --- a/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.fr.tex +++ b/macros/latex/contrib/beamer/doc/solutions/generic-talks/generic-ornate-15min-45min.fr.tex @@ -42,7 +42,6 @@ \usepackage[latin1]{inputenc} % or autre -\usepackage{times} \usepackage[T1]{fontenc} % Or autre. Notez que le codage et la fonte doivent être assortis. Si T1 % ne paraît pas très esthétique, essayer d'effacer la ligne contenant fontenc. diff --git a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.de.tex b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.de.tex index a64b6e3ac4..7c7d6d88ea 100644 --- a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.de.tex +++ b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.de.tex @@ -37,7 +37,6 @@ \usepackage[latin1]{inputenc} % Oder was auch immer -\usepackage{times} \usepackage[T1]{fontenc} % Oder was auch immer. Zu beachten ist, das Font und Encoding passen % müssen. Falls T1 nicht funktioniert, kann man versuchen, die Zeile diff --git a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.en.tex b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.en.tex index 35a654a384..b3cae19bda 100644 --- a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.en.tex +++ b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.en.tex @@ -37,7 +37,6 @@ \usepackage[latin1]{inputenc} % or whatever -\usepackage{times} \usepackage[T1]{fontenc} % Or whatever. Note that the encoding and the font should match. If T1 % does not look nice, try deleting the line with the fontenc. diff --git a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.fr.tex b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.fr.tex index d7b3969d12..7b0e4ab39b 100644 --- a/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.fr.tex +++ b/macros/latex/contrib/beamer/doc/solutions/short-talks/speaker_introduction-ornate-2min.fr.tex @@ -38,7 +38,6 @@ shading][bottom=white,top=structure.fg!25] \usepackage[latin1]{inputenc} % or autre -\usepackage{times} \usepackage[T1]{fontenc} % Or autre. Notez que le codage et la fonte doivent être assortis. Si T1 % ne paraît pas très esthétique, essayer d'effacer la ligne contenant fontenc. |