summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-15 23:32:51 +0000
committerKarl Berry <karl@freefriends.org>2012-05-15 23:32:51 +0000
commitbe37809855fc347ecadaacf4969e81e7c730a80d (patch)
treef85f9759920795c35a44ac78ee972db75f1e8fc8 /Master/texmf-dist/tex/latex/beamer
parent7083389477705019f50a254b8b50665343e54c9e (diff)
beamer 3.19 (14may12)
git-svn-id: svn://tug.org/texlive/trunk@26423 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty181
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty4
-rw-r--r--Master/texmf-dist/tex/latex/beamer/themes/outer/beameroutherthemeshadow.sty99
3 files changed, 105 insertions, 179 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
index b1dfb378fe0..8d64935eedf 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty
@@ -8,7 +8,7 @@
%
% See the file doc/licenses/LICENSE for more details.
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseboxes.sty,v 26d0d93c02e9 2012/05/10 15:27:30 joseph $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseboxes.sty,v 56972908a390 2012/05/13 13:45:08 joseph $
\def\beamerboxesdeclarecolorscheme#1#2#3{% scheme name, upper color, lower color
\setbeamercolor{@scheme upper #1}{fg=white,bg={#2}}
@@ -24,12 +24,13 @@
\newif\ifbmb@shadow
\newbox\bmb@box
\newbox\bmb@colorbox
-\newdimen\bmb@boxwidth
-\newdimen\bmb@boxheight
-\newdimen\bmb@prevheight
+\newbox\bmb@boxshadow
+\newbox\bmb@boxshadowball
+\newbox\bmb@boxshadowballlarge
\newdimen\bmb@temp
\newdimen\bmb@dima
\newdimen\bmb@dimb
+\newdimen\bmb@prevheight
\newcommand\beamerboxesrounded[2][]{%
\global\let\beamer@firstlineitemizeunskip=\relax%
@@ -98,20 +99,22 @@
\vskip-1pt%
\ifdim\wd\bmb@box=0pt%
\else%
- \hbox{%
- \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
- \bmb@dima=\bmb@width%
- \advance\bmb@dima by8bp%
- \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
- \pgfusepath{clip}
- {%
- \pgftransformshift{\pgfpoint{-4bp}{0bp}}%
- \pgftext[left,base]{\pgfuseshading{bmb@transition}}%
- }%
- \end{pgfpicture}%
- }%
- \nointerlineskip%
- \vskip-0.5pt%
+ \hbox{%
+ \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
+ \bmb@dima=\bmb@width%
+ \advance\bmb@dima by8bp%
+ \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
+ \pgfusepath{clip}
+ {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
+ \end{pgfpicture}%
+ }%
+ \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}%
@@ -124,66 +127,49 @@
\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@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}{\bmb@boxheight-6bp}
- {%
- color(0bp)=(pgftransparent!0);
- color(8bp)=(pgftransparent!100)
- }%
- \pgfdeclareverticalshading{bmb@shadowvert}{\bmb@boxwidth-4bp}
- {%
- color(0bp)=(pgftransparent!100);
- color(8bp)=(pgftransparent!0)
- }%
- \pgfdeclarefading{bmb@shadowmask}
- {%
- \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}}
- \pgftext[base, at=\pgfpoint{\bmb@boxwidth+4bp}{8bp}]{\pgfuseshading{bmb@shadowhorz}}
- %
- % 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@temp=\wd\bmb@box%
\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%
- \begin{pgfscope}
- \pgfpathrectangle{\pgfpoint{0bp}{-7bp}}
- {\pgfpoint{\bmb@boxwidth+8bp}{\bmb@boxheight+6bp}}
- \pgfsetfading{bmb@shadowmask}{%
- \pgftransformshift{\pgfpoint{0.5\bmb@boxwidth+6bp}{0.5\bmb@boxheight-4bp}}}
- \pgfusepath{fill}
- \end{pgfscope}
+ {\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}
\fi%
\unhbox\bmb@colorbox%
\pgfpathqmoveto{-4bp}{1bp}
@@ -194,11 +180,47 @@
{\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}}
- \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
- \pgfusepath{fill}
+ \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}
}
+ \fi
\end{pgfpicture}%
\box\bmb@box%
}%
@@ -214,11 +236,14 @@
% Shadings
%
-\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}%
-{%
- color(0pt)=(lower.bg);
- color(2pt)=(lower.bg);
- color(4pt)=(upper.bg)
-}
-
+% 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}{%
+ color(0pt)=(lower.bg); color(2pt)=(lower.bg); color(4pt)=(upper.bg)}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
index ebfe227f9f6..713fb70a0bd 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
@@ -10,7 +10,7 @@
% See the file doc/licenses/LICENSE for more details.
% Define beamer version
-\def\beamer@version{3.18}
+\def\beamer@version{3.19}
% Get date and version from RCS Ids
@@ -37,4 +37,4 @@
\ProvidesClass{\beamer@rcsfile}[\beamer@rcsdate\space#2\space (rcs-revision \beamer@rcsrevision)]
}
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v b3cd3cd02c66 2012/05/10 15:28:47 joseph $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v dbbb17cd1fba 2012/05/13 13:54:24 joseph $
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/outer/beameroutherthemeshadow.sty b/Master/texmf-dist/tex/latex/beamer/themes/outer/beameroutherthemeshadow.sty
deleted file mode 100644
index 059366c3838..00000000000
--- a/Master/texmf-dist/tex/latex/beamer/themes/outer/beameroutherthemeshadow.sty
+++ /dev/null
@@ -1,99 +0,0 @@
-% Copyright 2007 by Till Tantau
-%
-% 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.
-
-\mode<presentation>
-
-\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)
-}
-\pgfdeclareverticalshading{beamer@topshade}{200cm}
-{%
- color(0pt)=(pgftransparent!100);
- color(8pt)=(pgftransparent!0)
-}
-
-\pgfdeclarefading{beamer@topshadowmask}{\pgfuseshading{beamer@topshade}}
-
-\addtobeamertemplate{headline}
-{}
-{%
- \vskip0pt
- \begin{pgfpicture}
- \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{4pt}}%
- \pgfsetfading{beamer@topshadowmask}{}%
- \pgfusepath{fill}%
- \end{pgfpicture}
- \vskip-2pt
-}
-
-\defbeamertemplate*{frametitle}{shadow theme}
-{%
- \nointerlineskip%
- \vskip-2pt%
- \hbox{\leavevmode
- \advance\beamer@leftmargin by -12bp%
- \advance\beamer@rightmargin by -12bp%
- \beamer@tempdim=\textwidth%
- \advance\beamer@tempdim by \beamer@leftmargin%
- \advance\beamer@tempdim by \beamer@rightmargin%
- \hskip-\Gm@lmargin\hbox{%
- \setbox\beamer@tempbox=\hbox{%
- \begin{minipage}[b]{\paperwidth}%
- \vbox{}\vskip-.75ex%
- \leftskip0.3cm%
- \rightskip0.3cm plus1fil\leavevmode
- \insertframetitle%
- \ifx\insertframesubtitle\@empty%
- \strut\par%
- \else
- \par{%
- \usebeamerfont*{framesubtitle}{%
- \usebeamercolor[fg]{framesubtitle}%
- \insertframesubtitle}%
- \strut\par%
- }%
- \fi%
- \nointerlineskip
- \vbox{}%
- \end{minipage}%
- }%
- \beamer@tempdim=\ht\beamer@tempbox%
- \advance\beamer@tempdim by 2pt%
- \begin{pgfpicture}{0pt}{0pt}{\paperwidth}{\beamer@tempdim}
- \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%
- }%
- \vskip-2pt
-}
-
-\mode
-<all> \ No newline at end of file