diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty index f50accfc4f3..5ba9d50e017 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.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/beamerbaseframecomponents.sty,v 1.41 2007/01/28 20:48:21 tantau Exp $ +\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbaseframecomponents.sty,v efa082c6111d 2010/05/01 13:27:03 rivanvx $ -\mode<presentation> +\mode +<presentation> % % Setting the left and right margin @@ -84,7 +86,7 @@ \setbox\beamer@tempbox=\hbox{{\lower\beamer@tempdim\hbox{\box\beamer@tempbox}}}% \wd\beamer@tempbox=0pt\ht\beamer@tempbox=0pt\dp\beamer@tempbox=0pt% \box\beamer@tempbox% - }% + }% {% print right sidebar first, since it should be overwritten by headline \setbox\beamer@tempbox=\hbox{\hskip\textwidth\hskip\beamer@rightmargin% {\setbox\beamer@tempbox=\hbox{\vbox to \sidebarheight{% @@ -175,7 +177,7 @@ \advance\textheight by-\headheight% \@colht\textheight% \@colroom\textheight% - \vsize\textheight% + \vsize\textheight% } @@ -220,7 +222,7 @@ \beamer@colentrycode% \def\beamer@colclose{}\ignorespaces}% {\beamer@colclose\def\beamer@colclose{}\beamer@colexitcode\end{actionenv}}% - + \mode <article> { @@ -266,8 +268,8 @@ \setkeys{beamer@col}{#1}% \begin{minipage}[\beamer@colalign]{#2}% \leavevmode\raggedright\beamer@colheadskip\ignorespaces} - - + + \mode <article> { @@ -275,7 +277,7 @@ \newcommand<>{\beamer@columncom}[2][]{} } - + % % @@ -372,8 +374,3 @@ \mode <all> - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex" -%%% End: |