diff options
author | Karl Berry <karl@freefriends.org> | 2012-03-09 01:23:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-03-09 01:23:18 +0000 |
commit | e05558c39687645238e2cf0f3381560580fe122a (patch) | |
tree | 3e33f40ea272a114f6f4340bc35ad149321e69fd /Master/texmf-dist/tex | |
parent | 46ee7396c790858808d1c5cb91ea167ecec56008 (diff) |
beamer 3.14 (7mar12)
git-svn-id: svn://tug.org/texlive/trunk@25583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
8 files changed, 105 insertions, 260 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty.orig b/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty.orig deleted file mode 100644 index 02952f0c442..00000000000 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseboxes.sty.orig +++ /dev/null @@ -1,224 +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. - -\RequirePackage{keyval} - -\def\beamerboxesdeclarecolorscheme#1#2#3{% scheme name, upper color, lower color - \setbeamercolor{@scheme upper #1}{fg=white,bg=#2} - \setbeamercolor{@scheme lower #1}{bg=#3} -} - -\define@key{beamerboxes}{scheme}{\def\bmb@upper{@scheme upper #1}\def\bmb@lower{@scheme lower #1}} -\define@key{beamerboxes}{upper}{\def\bmb@upper{#1}} -\define@key{beamerboxes}{lower}{\def\bmb@lower{#1}} -\define@key{beamerboxes}{width}{\edef\bmb@width{#1}} -\define@key{beamerboxes}{shadow}[true]{\csname bmb@shadow#1\endcsname} - -\newif\ifbmb@shadow -\newbox\bmb@box -\newbox\bmb@colorbox -\newdimen\bmb@boxwidth -\newdimen\bmb@boxheight -\newdimen\bmb@prevheight -\newdimen\bmb@temp -\newdimen\bmb@dima -\newdimen\bmb@dimb - -\newcommand\beamerboxesrounded[2][] -{% - \global\let\beamer@firstlineitemizeunskip=\relax% - \vbox\bgroup% - \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}% - \setkeys{beamerboxes}{#1}% - {% - \usebeamercolor{\bmb@lower}% - \globalcolorstrue% - \colorlet{lower.bg}{bg}% - }% - {% - \usebeamercolor{\bmb@upper}% - \globalcolorstrue% - \colorlet{upper.bg}{bg}% - }% - % - % Typeset head - % - \vskip4bp - \setbox\bmb@box=\hbox{% - \begin{minipage}[b]{\bmb@width}% - \usebeamercolor[fg]{\bmb@upper}% - #2% - \end{minipage}}% - \ifdim\wd\bmb@box=0pt% - \setbox\bmb@box=\hbox{}% - \ht\bmb@box=1.5pt% - \bmb@prevheight=-4.5pt% - \else% - \wd\bmb@box=\bmb@width% - \bmb@temp=\dp\bmb@box% - \ifdim\bmb@temp<1.5pt% - \bmb@temp=1.5pt% - \fi% - \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}% - \dp\bmb@box=0pt% - \bmb@prevheight=\ht\bmb@box% - \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}{+-\ht\bmb@box}{0bp}{+-\ht\bmb@box} - \ifdim\wd\bmb@box=0pt% - \color{lower.bg}% - \else% - \color{upper.bg}% - \fi% - \pgfpathqmoveto{-4bp}{-1bp} - \pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp} - \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}} - \pgfpathcurveto% - {\pgfpoint{\bmb@dima}{3bp}}% - {\pgfpoint{\bmb@dimb}{1.2bp}}% - {\pgfpoint{\bmb@dimb}{-1bp}}% - \bmb@dima=-\ht\bmb@box% - \advance\bmb@dima by-2pt% - \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}} - \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}} - \pgfusepath{fill} - \end{pgfpicture}% - \copy\bmb@box% - }% - \nointerlineskip% - \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% - \fi% - \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}% - \setbox\bmb@box=\hbox% - \bgroup% - \begin{minipage}[b]{\bmb@width}% - \vskip2pt% - \usebeamercolor[fg]{\bmb@lower}% - \colorlet{beamerstructure}{upper.bg}% - \colorlet{structure}{upper.bg}% - %\color{.}% -} - -\def\endbeamerboxesrounded -{% - \end{minipage}% - \egroup% - \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@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} - \fi% - \unhbox\bmb@colorbox% - \pgfpathqmoveto{-4bp}{1bp} - \pgfpathqcurveto{-4bp}{-1.2bp}{-2.2bp}{-3bp}{0bp}{-3bp} - \pgfpathlineto{\pgfpoint{\the\bmb@temp}{-3bp}} - \pgfpathcurveto% - {\pgfpoint{\the\bmb@dima}{-3bp}}% - {\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} - } - \end{pgfpicture}% - \box\bmb@box% - }% - \ifbmb@shadow% - \vskip4bp minus 2bp% - \else% - \vskip2bp% - \fi% - \egroup% of \vbox\bgroup -} - -% Shadings -% 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/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty index a9ece8b36c4..ad4fedd36fd 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasemisc.sty,v bff0a9294b45 2010/06/06 11:23:19 rivanvx $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasemisc.sty,v 2ff5461be705 2012/02/24 19:44:11 joseph $ \mode <presentation> @@ -212,6 +212,13 @@ \ifx\includegraphics\@undefined \else \renewcommand<>\includegraphics[2][]{\only#3{\beameroriginal\includegraphics[{#1}]{#2}}\ignorespaces} + % Deal with star case (unique for overlay-aware commands) + \let\beamer@includegraphics@maybe@star\includegraphics + \DeclareRobustCommand\includegraphics{% + \@ifstar + {\Gin@cliptrue \beamer@includegraphics@maybe@star} + {\Gin@clipfalse \beamer@includegraphics@maybe@star}% + } \fi \ifx\pgfuseimage\@undefined @@ -222,30 +229,3 @@ } -\AtBeginDocument{ - % The following code was send to me by Rolf Niepraschk - \@ifundefined{Gin@driver}{}% - {% - \ifx\Gin@driver\@empty\else% - \filename@parse{\Gin@driver}\@tempswafalse% - \def\reserved@a{dvips}% - \ifx\filename@base\reserved@a\@tempswatrue\fi% - \def\reserved@a{dvipdfm}% - \ifx\filename@base\reserved@a\@tempswatrue\fi% - \if@tempswa% - \AtBeginDvi{% - \special{papersize=\the\paperwidth,\the\paperheight}}% - \fi% - \def\reserved@a{pdftex}% - \ifx\filename@base\reserved@a - \pdfpagewidth\paperwidth\pdfpageheight\paperheight% - \fi% - \def\reserved@a{vtex}% - \ifx\filename@base\reserved@a - \mediawidth\paperwidth\mediaheight\paperheight% - \fi% - \fi - } - } - - diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty index 927437a0e1a..9035e98b7f9 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.13} +\def\beamer@version{3.14} % Get date and version from RCS Ids diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty index f374a477f95..ca1165777ed 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasetoc.sty,v f102fc5026b5 2012/02/22 08:51:00 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasetoc.sty,v 138681b92320 2012/02/28 20:40:40 joseph $ \mode <presentation> @@ -57,8 +57,8 @@ \define@key{beamertoc}{currentsection}[]{\beamer@toc@sectionstyle{show/shaded}\beamer@toc@subsectionstyle{show/shaded}\beamer@toc@subsubsectionstyle{show/shaded}} \define@key{beamertoc}{currentsubsection}[]{\beamer@toc@subsectionstyle{show/shaded}\beamer@toc@subsubsectionstyle{show/shaded}} -\define@key{beamertoc}{hideallsubsections}[]{\beamer@toc@subsectionstyle{hide}} -\define@key{beamertoc}{hideothersubsections}[]{\beamer@toc@subsectionstyle{show/show/hide}} +\define@key{beamertoc}{hideallsubsections}[]{\beamer@toc@subsectionstyle{hide}\beamer@toc@subsubsectionstyle{hide}} +\define@key{beamertoc}{hideothersubsections}[]{\beamer@toc@subsectionstyle{show/show/hide}\beamer@toc@subsubsectionstyle{show/shaded/hide}} \define@key{beamertoc}{part}{\beamer@showpartnumber=#1\relax} \define@key{beamertoc}{sections}{\beamer@parsetocsections#1[]} diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedove.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedove.sty index 14faaee6b4b..d45cfd1e6d0 100644 --- a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedove.sty +++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedove.sty @@ -7,7 +7,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemedove.sty,v d02a7cf4d8ae 2010/06/17 09:11:41 rivanvx $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemedove.sty,v 406bcaf3a3c7 2012/02/23 13:55:34 joseph $ \mode<presentation> @@ -17,7 +17,20 @@ \setbeamercolor*{example text}{fg=black} \setbeamercolor*{structure}{fg=black} -\setbeamerfont{alerted text}{series=\bfseries} +\providecommand*{\beamer@bftext@only}{% + \relax + \ifmmode + \expandafter\beamer@bftext@warning + \else + \expandafter\bfseries + \fi +} +\providecommand*{\beamer@bftext@warning}{% + \ClassWarning{beamer} + {Cannot use bold for alerted text in math mode}% +} + +\setbeamerfont{alerted text}{series=\beamer@bftext@only} \setbeamercolor{palette primary}{fg=black,bg=white} \setbeamercolor{palette secondary}{fg=black,bg=white} diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemeseagull.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemeseagull.sty index 9e94a70e310..7f890614a87 100644 --- a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemeseagull.sty +++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemeseagull.sty @@ -7,7 +7,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemeseagull.sty,v d02a7cf4d8ae 2010/06/17 09:11:41 rivanvx $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemeseagull.sty,v 406bcaf3a3c7 2012/02/23 13:55:34 joseph $ \mode<presentation> @@ -17,7 +17,20 @@ \setbeamercolor*{example text}{fg=black} \setbeamercolor*{structure}{fg=black} -\setbeamerfont{alerted text}{series=\bfseries} +\providecommand*{\beamer@bftext@only}{% + \relax + \ifmmode + \expandafter\beamer@bftext@warning + \else + \expandafter\bfseries + \fi +} +\providecommand*{\beamer@bftext@warning}{% + \ClassWarning{beamer} + {Cannot use bold for alerted text in math mode}% +} + +\setbeamerfont{alerted text}{series=\beamer@bftext@only} \setbeamercolor*{palette primary}{fg=black,bg=black!20} \setbeamercolor*{palette secondary}{fg=black,bg=black!25} diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemespruce.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemespruce.sty new file mode 100755 index 00000000000..ed448f1d7d2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemespruce.sty @@ -0,0 +1,40 @@ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemespruce.sty,v adfc58636b1f 2012/03/07 18:35:25 amunn $ + +% Copyright 2012 by Alan Munn <amunn@msu.edu> Modified for MSU colours +% Copyright 2004 by Madhusudan Singh <madhusudan.singh@gmail.com> +% +% 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> + +\definecolor{MSUgreen}{RGB}{0,102,51} +% Approximate match for Michigan State University; official colour appears too dark + +\setbeamercolor{alerted text}{fg=MSUgreen!80!white} +\setbeamercolor*{palette primary}{fg=MSUgreen!60!black,bg=white!85!MSUgreen} +\setbeamercolor*{palette secondary}{fg=MSUgreen!70!black,bg=white!60!MSUgreen} +\setbeamercolor*{palette tertiary}{bg=MSUgreen!80!black,fg=white!50!MSUgreen} +\setbeamercolor*{palette quaternary}{fg=MSUgreen,bg=white!20!MSUgreen} + +\setbeamercolor*{sidebar}{fg=MSUgreen,bg=MSUgreen!75!white} + +\setbeamercolor*{palette sidebar primary}{fg=MSUgreen!10!black} +\setbeamercolor*{palette sidebar secondary}{fg=white} +\setbeamercolor*{palette sidebar tertiary}{fg=MSUgreen!50!black} +\setbeamercolor*{palette sidebar quaternary}{fg=white!10!MSUgreen} + +\setbeamercolor*{titlelike}{parent=palette primary} +\setbeamercolor{frametitle}{bg=white!90!MSUgreen} +\setbeamercolor{frametitle right}{bg=white!60!MSUgreen} + +\setbeamercolor*{separation line}{} +\setbeamercolor*{fine separation line}{} +\setbeamercolor{block body}{parent=normal text,use=block title,bg=red!0,fg=} +\mode +<all> diff --git a/Master/texmf-dist/tex/latex/beamer/themes/theme/beamerthemeEastLansing.sty b/Master/texmf-dist/tex/latex/beamer/themes/theme/beamerthemeEastLansing.sty new file mode 100755 index 00000000000..3ba67b842f2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/beamer/themes/theme/beamerthemeEastLansing.sty @@ -0,0 +1,23 @@ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/theme/beamerthemeEastLansing.sty,v adfc58636b1f 2012/03/07 18:35:25 amunn $ + +% Copyright 2012 by Alan Munn <amunn@msu.edu> Modified for MSU colours +% Copyright 2004 by Madhusudan Singh <madhusudan.singh@gmail.com> +% +% 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> + +\useinnertheme{rounded} +\useoutertheme{infolines} +\usecolortheme{spruce} +\setbeamerfont{block title}{size=\large} +\setbeamertemplate{itemize subitem}[triangle] +\setbeamercolor{titlelike}{parent=structure,bg=white!85!MSUgreen} +\mode +<all> |