summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-13 22:52:08 +0000
committerKarl Berry <karl@freefriends.org>2011-09-13 22:52:08 +0000
commit72c8eee56c474d51318b0296700506a912d726ff (patch)
tree02ca21faf7cf7e175c46e4effc038911beefb081 /Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
parentf503033f36e49df5beb6e09aa7ca2cb6d6b31820 (diff)
beamer 3.11 (12sep11)
git-svn-id: svn://tug.org/texlive/trunk@23934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty28
1 files changed, 23 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index aa1a587d1ff..0583df9fed1 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2011 by Vedran Mileti\'c, Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -8,7 +9,7 @@
%
% See the file doc/licenses/LICENSE for more details.
-\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/beamerbaseframe.sty,v bff0a9294b45 2010/06/06 11:23:19 rivanvx $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseframe.sty,v 70f9d8411e54 2011/09/12 18:58:34 joseph $
\mode
<presentation>
@@ -27,6 +28,9 @@
\beamer@inframefalse
}
+\def\refcounter#1{\protected@edef\@currentlabel%
+ {\csname p@#1\endcsname\csname the#1\endcsname}}%
+
%
% Slide Definitions
@@ -55,12 +59,13 @@
\fi%
\global\c@beamerpauses=1\relax%
\expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{%
- \refstepcounter{subsectionslide}%
+ \stepcounter{subsectionslide}%
\xdef\beamer@framestartpage{\the\c@page}% only first time
}{\clearpage\beamer@notesactions}% cleanup from previous slide
\hypersetup{pdfpagetransition=R}%
\hypersetup{pdfpageduration=}%
- \thispdfpagelabel{\insertframenumber}
+ \@ifundefined{thispdfpagelabel}{}{%
+ \thispdfpagelabel{\insertframenumber}}%
\xdef\beamer@frameendpage{\the\c@page}% every time
\beamer@setuplinks%
\beamer@displaybreak%
@@ -79,6 +84,7 @@
\beamer@inframetrue%
\let\frame=\framelatex% inside frames, use LaTeX's \frame command
\begin{beamer@framepauses}%
+ \refcounter{framenumber}%use frame number for \label
\ifbeamer@shrink%
\hsize=\beamer@shrinkfactorinv\hsize%
\textwidth=\beamer@shrinkfactorinv\textwidth%
@@ -435,7 +441,7 @@
\ifbeamer@noframenumbering%
\beamer@noframenumberingfalse%
\else%
- \refstepcounter{framenumber}%
+ \stepcounter{framenumber}%do not set \label here - it interferes with AtBegin*
\fi%
{\let\@elt\beamer@savecounter\beamer@overlaycounterresets}
\gdef\beamer@framestartpage{}%
@@ -480,6 +486,9 @@
\ifbeamer@isfragile%
\let\beamer@howtotreatframe\beamer@doexternalframe%
\fi%
+ \ifbeamer@containsverbatim
+ \let\beamer@howtotreatframe\beamer@dosingleframe
+ \fi
\fi%
\beamer@howtotreatframe}
\long\def\beamer@donoframe{%
@@ -541,7 +550,16 @@
\immediate\openout\beamer@verbatimfileout=\beamer@verbfilename%
\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@frametitle#1{%
+ \@ifnextchar\bgroup{\beamer@verbatim@framesubtitle{#1}}
+ {%
+ \@temptokena{#1}%
+ \edef\@tempa{\string\frametitle\string{\the\@temptokena\string}}%
+ \@temptokena\expandafter{\@tempa}%
+ \immediate\write\beamer@verbatimfileout{\the\@temptokena}%
+ \beamer@verbatimreadframe
+ }%
+}
\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{%