diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty index 81791cc812e..5c52aff3914 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty @@ -1,4 +1,5 @@ -% Copyright 2007 by Till Tantau +% Copyright 2003--2007 by Till Tantau +% Copyright 2010 by Vedran Mileti\'c % % This file may be distributed and/or modified % @@ -7,9 +8,10 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbasecolor.sty,v 1.42 2007/01/28 20:48:20 tantau Exp $ +\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbasecolor.sty,v d1a9b48be06d 2010/06/06 13:34:07 rivanvx $ -\mode<presentation> +\mode +<presentation> % % Color theme stuff @@ -26,7 +28,7 @@ {\expandafter\def\csname beamer@thcuse@\beamer@temp\endcsname{% \@for\@temp:={#1}\do{\expandafter\beamer@thc@usecolor\expandafter{\@temp}}}} -\def\beamer@thc@prepcolor{% +\def\beamer@thc@prepcolor{% \let\beamer@thc@fg=\@empty% \let\beamer@thc@bg=\@empty% } @@ -53,7 +55,7 @@ } \def\setbeamercolor{\@ifstar{\beamer@clearbeamercolor}{\beamer@setbeamercolor}} - + \newcommand\beamer@clearbeamercolor[2]{% \def\beamer@temp{#1}% \expandafter\let\csname beamer@thcfg@#1\endcsname=\relax% @@ -91,12 +93,12 @@ \else% \colorlet{temp@bg}{\csname beamer@thc@bg\endcsname}% \fi% - \@namelet{\string\color@ parent.fg}{\string\color@ fg}% + \@namelet{\string\color@ parent.fg}{\string\color@ fg}% \@namelet{\string\color@ parent.bg}{\string\color@ bg}% - \@namelet{\string\color@ fg}{\string\color@ temp@fg}% + \@namelet{\string\color@ fg}{\string\color@ temp@fg}% \@namelet{\string\color@ bg}{\string\color@ temp@bg}% \begingroup% - \global\@namelet{\string\color@ #2.fg}{\string\color@ temp@fg}% + \global\@namelet{\string\color@ #2.fg}{\string\color@ temp@fg}% \global\@namelet{\string\color@ #2.bg}{\string\color@ temp@bg}% \endgroup% \def\beamer@temp{#1}% @@ -129,9 +131,9 @@ \define@key{beamercolbox}{dp}{\def\beamer@colbox@dp{#1}} \define@key{beamercolbox}{leftskip}{\def\beamer@colbox@ls{#1}} \define@key{beamercolbox}{rightskip}{\def\beamer@colbox@rs{#1}} -\define@key{beamercolbox}{left}[]{\def\beamer@colbox@ls{0pt}\def\beamer@colbox@rs{0pt plus1fill}} -\define@key{beamercolbox}{center}[]{\def\beamer@colbox@ls{0pt plus1fill}\def\beamer@colbox@rs{0pt plus1fill}} -\define@key{beamercolbox}{right}[]{\def\beamer@colbox@ls{0pt plus1fill}\def\beamer@colbox@rs{0pt}} +\define@key{beamercolbox}{left}[0pt]{\def\beamer@colbox@ls{0pt}\def\beamer@colbox@rs{#1 plus1fill}} +\define@key{beamercolbox}{center}[0pt]{\def\beamer@colbox@ls{#1 plus1fill}\def\beamer@colbox@rs{#1 plus1fill}} +\define@key{beamercolbox}{right}[0pt]{\def\beamer@colbox@ls{#1 plus1fill}\def\beamer@colbox@rs{0pt}} \define@key{beamercolbox}{sep}{\def\beamer@colbox@sep{#1}} \define@key{beamercolbox}{colsep}{\def\beamer@colbox@colsep{#1}} \define@key{beamercolbox}{colsep*}{\def\beamer@colbox@colseps{#1}} @@ -207,7 +209,7 @@ \box\beamer@tempbox% \fi% \else% - \if@tempswa\setbox\beamer@tempbox=\vbox{% + \if@tempswa\setbox\beamer@tempbox=\hbox{\vbox{% \usebeamercolor{\beamer@colbox@color}% \advance\hsize by \beamer@colbox@colseps\relax% \advance\hsize by \beamer@colbox@colseps\relax% @@ -218,7 +220,7 @@ \hskip\beamer@colbox@colseps% }% \hskip-\beamer@colbox@colseps% - }\fi% + }}\fi% \ifdim\@tempdima>\textwidth% \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@rightmargin\relax}% \fi% @@ -266,7 +268,7 @@ \ifbeamercolorempty[fg]{math text displayed}{}{\color{fg}\aftergroup\ignorespaces}}% \newcommand\donotcolorouterdisplaymaths{% - \everydisplay{\everydisplay{\beamer@setdisplaymathcolor}}} + \everydisplay{\everydisplay{\beamer@setdisplaymathcolor}}} \AtBeginDocument { @@ -282,11 +284,11 @@ % Fix $ usage in underline: \let\beamer@orig@underline=\underline \def\underline#1{{\donotcoloroutermaths\beamer@orig@underline{#1}}} - + % Fix $ usage in underline: \let\beamer@orig@@textsuperscript=\@textsuperscript \def\@textsuperscript#1{{\donotcoloroutermaths\beamer@orig@@textsuperscript{#1}}} - + % Fix $ usage in parbox: \let\beamer@orig@pboxswture=\@pboxswtrue \def\@pboxswtrue{\donotcoloroutermaths\beamer@orig@pboxswture} @@ -294,15 +296,15 @@ % Fix $$ usage in align: \let\beamer@orig@start@align=\start@align \def\start@align{\donotcolorouterdisplaymaths\donotcoloroutermaths\beamer@setdisplaymathcolor\beamer@orig@start@align} - + % Fix $$ usage in gather: \let\beamer@orig@start@gather=\start@gather \def\start@gather{\donotcolorouterdisplaymaths\donotcoloroutermaths\beamer@setdisplaymathcolor\beamer@orig@start@gather} - + % Fix $$ usage in multicolumn: \let\beamer@orig@start@multline=\start@multline \def\start@multline{\donotcolorouterdisplaymaths\donotcoloroutermaths\beamer@setdisplaymathcolor\beamer@orig@start@multline} - + % Fix $$ usage in eqnarray: \let\beamer@orig@eqnarray=\eqnarray \def\eqnarray{\donotcolorouterdisplaymaths\donotcoloroutermaths\beamer@setdisplaymathcolor\beamer@orig@eqnarray} @@ -341,7 +343,7 @@ \applycolormixins{beamer@tempcolor}% \@namelet{current@color}{\string\color@beamer@tempcolor}% \beamerorig@reset@color% - \pgfsys@color@unstacked{beamer@tempcolor}% + \pgfsys@color@unstacked{beamer@tempcolor}% \fi% \ifx\beamer@lastskiptexta\beamer@zeropt% \else% @@ -364,7 +366,7 @@ <article> { \def\beamersetaveragebackground#1{} - + \ifbeamer@articlexcolor \colorlet{averagebackgroundcolor}{white} \fi @@ -388,15 +390,9 @@ \colorlet{beamerstructure}{black} \colorlet{structure}{beamerstructure} \fi - + } \mode <all> - - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex" -%%% End: |