summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty27
1 files changed, 16 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index b7393b9420b..eb20e399886 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -1,9 +1,13 @@
-\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbaseframe.sty,v 1.58 2005/06/02 14:36:48 tantau Exp $
-
-% Copyright 2003 by Till Tantau <tantau@users.sourceforge.net>.
+% 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.
%
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
+% See the file doc/licenses/LICENSE for more details.
+
+\ProvidesPackageRCS $Header: /cvsroot/latex-beamer/latex-beamer/base/beamerbaseframe.sty,v 1.60 2007/01/28 20:48:21 tantau Exp $
\mode<presentation>
@@ -147,11 +151,7 @@
{
\def\beamer@checkframetitle{\@ifnextchar\bgroup\beamer@inlineframetitle{}}
\def\beamer@inlineframetitle#1{%
- \frametitle{#1}%
- \@ifnextchar\bgroup{\beamer@inlineframesubtitle}{}%
- }
- \def\beamer@inlineframesubtitle#1{%
- \framesubtitle{#1}%
+ \@ifnextchar\bgroup{\frametitle{#1}\framesubtitle}{\frametitle{#1}\relax}%
}
}
@@ -526,7 +526,10 @@
\edef\beamer@verbfilename{\jobname\ifx\beamer@againname\@empty\else.\insertframenumber\fi.vrb}% .vrb for `verbatim'
\beamer@setupstoppers{\beamer@frameenvironmentsubst}%
\immediate\openout\beamer@verbatimfileout=\beamer@verbfilename%
- \expandafter\beamer@verbatimreadframe\@gobble}
+ \expandafter\beamer@checktitleverbatim\@gobble}
+\def\beamer@checktitleverbatim{\@ifnextchar\bgroup{\beamer@verbatim@frametitle}{\beamer@verbatimreadframe}}
+\def\beamer@verbatim@frametitle#1{\@ifnextchar\bgroup{\beamer@verbatim@framesubtitle{#1}}{\beamer@verbatimreadframe\frametitle{#1}}}
+\def\beamer@verbatim@framesubtitle#1#2{\beamer@verbatimreadframe\frametitle{#1}\framesubtitle{#2}}
% will return to following command with frame contents written to \beamer@verbfilename
\def\beamer@afterexternalframe{%
\ifx\beamer@frameenvironmentsubst\beamer@frametext%
@@ -619,6 +622,8 @@
\def\frame{\@ifnextchar<\beamer@frame{\beamer@frame<*>}}
\def\beamer@frame<#1>{\@ifnextchar[{\beamer@@frame<#1>}{\beamer@@frame<#1>[]}}
\long\def\beamer@@frame<#1>[#2]{%
+ \global\let\insertframetitle=\@empty%
+ \global\let\insertframesubtitle=\@empty%
\beamer@slideinframe=1\relax%
\refstepcounter{framenumber}%
\beamer@slideinframe=0\relax%