summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-03-13 22:57:30 +0000
committerKarl Berry <karl@freefriends.org>2007-03-13 22:57:30 +0000
commit7528bed5b6dc85d8d97044a2ad1ea49a55b96a90 (patch)
tree60e6c5a19888dc3ac915c729eb139f4f86ec1151 /Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
parent08117c08874292787f9823c3064dbb2acc9b8cf4 (diff)
beamer 3.07 (12mar07)
git-svn-id: svn://tug.org/texlive/trunk@4030 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty26
1 files changed, 17 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
index 8c425e28d28..d46ad2c5b77 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
@@ -1,9 +1,13 @@
-\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbaselocalstructure.sty,v 1.51 2005/04/20 09:51:08 tantau Exp $
-
-% Copyright 2003 by Till Tantau <tantau@users.sourceforge.net>.
+% Copyright 2007 by Till Tantau
+%
+% This file may be distributed and/or modified
%
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
+
+\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau Exp $
\mode<presentation>
@@ -34,16 +38,20 @@
\mode
<all>
{
- \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}}}}
+ \let\beamer@aftersubtitle=\relax
+ \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
}
\mode
<article>
{
- \newcommand<>\frametitle[2][]{\only#3{\gdef\insertframetitle{#2}\beamer@headrenderer}}
- \long\def\useframetitletemplate#1{\def\beamer@headrenderer{#1}}
- \useframetitletemplate{\paragraph*{\insertframetitle}\ \par}
+ \newcommand<>\frametitle[2][]{\only#3{\gdef\insertframetitle{#2}%
+ \@ifnextchar\framesubtitle{\beamer@donextsubtitle}{\usebeamertemplate{frametitle}}}}
+ \def\beamer@donextsubtitle{%
+ % Ugly hack...
+ \def\beamer@aftersubtitle{\usebeamertemplate{frametitle}\let\beamer@aftersubtitle=\relax}
+ }
}