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.sty72
1 files changed, 39 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index eb20e399886..3c4861a2f7f 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.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/beamerbaseframe.sty,v 1.60 2007/01/28 20:48:21 tantau Exp $
+\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbaseframe.sty,v bff0a9294b45 2010/06/06 13:23:19 rivanvx $
-\mode<presentation>
+\mode
+<presentation>
\newbox\beamer@framebox
\newbox\beamer@frametitlebox
@@ -48,7 +50,7 @@
\ifx\beamer@againname\@empty%
{\let\@elt\beamer@restorecounter\beamer@overlaycounterresets}%
\else%
- {\let\@elt\beamer@labelrestorecounter\beamer@overlaycounterresets}%
+ {\let\@elt\beamer@labelrestorecounter\beamer@overlaycounterresets}%
\fi%
\fi%
\global\c@beamerpauses=1\relax%
@@ -58,6 +60,7 @@
}{\clearpage\beamer@notesactions}% cleanup from previous slide
\hypersetup{pdfpagetransition=R}%
\hypersetup{pdfpageduration=}%
+ \thispdfpagelabel{\insertframenumber}
\xdef\beamer@frameendpage{\the\c@page}% every time
\beamer@setuplinks%
\beamer@displaybreak%
@@ -121,7 +124,7 @@
\ifbeamer@shrink%
\beamer@shrinkframebox%
\fi%
- \ifx\beamer@zoomer\@empty
+ \ifx\beamer@zoomer\@empty
\setbox\beamer@framebox=\vbox{%
\nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
\nointerlineskip\unvbox\beamer@frametitlebox%
@@ -161,17 +164,17 @@
%
% Resetting counters
-%
+%
\def\resetcounteronoverlays#1{%
- \@cons\beamer@overlaycounterresets{{c@#1}}%
+ \@cons\beamer@overlaycounterresets{{c@#1}}%
}
\def\resetcountonoverlays#1{%
- \@cons\beamer@overlaycounterresets{{#1}}%
+ \@cons\beamer@overlaycounterresets{{#1}}%
}
\def\beamer@overlaycounterresets{}
-
+
\resetcounteronoverlays{equation}
\resetcounteronoverlays{parentequation}
\resetcounteronoverlays{footnote}
@@ -236,7 +239,7 @@
}
\def\beamer@fragilefalse{}
\def\beamer@fragiletrue{\beamer@isfragiletrue}
-\def\beamer@fragilesingleslide{\beamer@containsverbatimtrue}
+\def\beamer@fragilesingleslide{\beamer@containsverbatimtrue}
\define@key{beamerframe}{c}[true]{% centered
\beamer@frametopskip=0pt plus 1fill\relax%
\beamer@framebottomskip=0pt plus 1.5fill\relax%
@@ -262,6 +265,12 @@
\beamer@framebottomskipautobreak=\beamer@framebottomskip\relax%
\def\beamer@initfirstlineunskip{}%
}
+
+\newif\ifbeamer@noframenumbering
+\beamer@noframenumberingfalse
+
+\define@key{beamerframe}{noframenumbering}[true]{\beamer@noframenumberingtrue}
+
\define@key{beamerframe}{environment}{\def\beamer@frameenvironmentsubst{#1}}
\define@key{beamerframe}{typeset second}[true]{\csname beamer@dosecondmode#1\endcsname}
@@ -314,7 +323,7 @@
\let\@next=\beamer@process@envbody % A little tricky! Note the grouping
\@checkend{#2}%
\else%
- % ok, just expand it, presumably it will generate the desired \end{frame}
+ % ok, just expand it, presumably it will generate the desired \end{frame}
\let\@next=\beamer@process@expander%
\fi
\else
@@ -372,7 +381,7 @@
\expandafter\beamer@framecommand\beamer@frameoptions\bgroup}%
}
-
+
% Check for old version:
\def\beamer@framecommand{%
@@ -423,7 +432,11 @@
\setkeys{beamerframe}{environment=frame}%
\setkeys{beamerframe}{#2}%
\beamer@frametemplate%
- \refstepcounter{framenumber}%
+ \ifbeamer@noframenumbering%
+ \beamer@noframenumberingfalse%
+ \else%
+ \refstepcounter{framenumber}%
+ \fi%
{\let\@elt\beamer@savecounter\beamer@overlaycounterresets}
\gdef\beamer@framestartpage{}%
\gdef\beamer@whichframes{#1}%
@@ -467,7 +480,7 @@
\ifbeamer@isfragile%
\let\beamer@howtotreatframe\beamer@doexternalframe%
\fi%
- \fi%
+ \fi%
\beamer@howtotreatframe}
\long\def\beamer@donoframe{%
\beamer@slideinframe=1\relax%
@@ -542,10 +555,10 @@
\def\beamer@doframeinput{\@ifnextchar<{\beamer@frameinput}{\beamer@frameinput<*>}}
\def\beamer@frameinput<#1>{\@ifnextchar[{\beamer@@frameinput<#1>}{\beamer@@frameinput<#1>[]}}
\def\beamer@@frameinput<#1>[{\@ifnextchar<{\beamer@@@@frameinput<#1>[}{\beamer@@@frameinput<#1>[<*>][}}
-\def\beamer@@@@frameinput<#1>[#2]{\@ifnextchar[{\beamer@@@frameinput<#1>[#2]}{\beamer@@@frameinput<#1>[#2][]}}
+\def\beamer@@@@frameinput<#1>[#2]{\@ifnextchar[{\beamer@@@frameinput<#1>[{#2}]}{\beamer@@@frameinput<#1>[{#2}][]}}
\def\beamer@@@frameinput<#1>[#2][#3]{%
\global\advance\c@framenumber by-1\relax%
- \edef\beamer@temp{\noexpand\frame<#1>[#2][#3,fragile=false]%
+ \edef\beamer@temp{\noexpand\frame<#1>[#2][{#3,fragile=false}]%
{\begingroup\noexpand\input{\beamer@verbfilename}\endgroup}}%
\beamer@temp%
\ifx\beamer@frameenvironmentsubst\beamer@frametext%
@@ -567,7 +580,7 @@
\protect\slideentry{\the\c@section}{\the\c@subsection}{\the\c@subsectionslide}%
{\beamer@framestartpage/\beamer@frameendpage}{\lastsubsection}{\the\c@part}}}%
\addtocontents{nav}%
- {\protect\headcommand{%
+ {\protect\headcommand{%
\protect\beamer@framepages{\beamer@framestartpage}{\beamer@frameendpage}}}%
\clearpage\beamer@notesactions%
}
@@ -618,7 +631,7 @@
<article>
{
\def\endframe{\egroup}
-
+
\def\frame{\@ifnextchar<\beamer@frame{\beamer@frame<*>}}
\def\beamer@frame<#1>{\@ifnextchar[{\beamer@@frame<#1>}{\beamer@@frame<#1>[]}}
\long\def\beamer@@frame<#1>[#2]{%
@@ -659,11 +672,11 @@
\let\beamer@next=\beamer@article@framecmd%
\fi%
\beamer@next}%
-
+
\def\beamer@article@framecmd{%
\afterassignment\beamer@checkframetitle
\let\beamer@next=}
-
+
\providecommand\includeonlyframes[1]{}% no effect
}
@@ -693,8 +706,8 @@
\mode
<all>
{
- \renewcommand<>{\pagebreak}[1][4]{\only#2{\beameroriginal\pagebreak[#1]}}
- \renewcommand<>{\nopagebreak}[1][4]{\only#2{\beameroriginal\nopagebreak[#1]}}
+ \renewcommand<>{\pagebreak}[1][4]{\only#2{\beameroriginal\pagebreak[{#1}]}}
+ \renewcommand<>{\nopagebreak}[1][4]{\only#2{\beameroriginal\nopagebreak[{#1}]}}
\def\framebreak{\pagebreak<presentation>}
\def\noframebreak{\nopagebreak<presentation>}
}
@@ -705,6 +718,7 @@
%
\renewcommand<>{\\}{\only#1{\beameroriginal\\}}
\renewcommand<>{\@centercr}{\only#1{\beameroriginal\@centercr}}
+\renewcommand<>{\@normalcr}{\only#1{\beameroriginal\@normalcr}}
\mode
<article>
@@ -739,13 +753,13 @@
\def\againframe{\@ifnextchar<{\beamer@againframe}{\beamer@againframe<*>}}
\def\beamer@againframe<#1>{\@ifnextchar[{\beamer@@againframe<#1>}{\beamer@@againframe<#1>[]}}
\def\beamer@@againframe<#1>[{\@ifnextchar<{\beamer@@@@againframe<#1>[}{\beamer@@@againframe<#1>[<*>][}}
-\def\beamer@@@@againframe<#1>[#2]{\@ifnextchar[{\beamer@@@againframe<#1>[#2]}{\beamer@@@againframe<#1>[#2][]}}
+\def\beamer@@@@againframe<#1>[#2]{\@ifnextchar[{\beamer@@@againframe<#1>[{#2}]}{\beamer@@@againframe<#1>[{#2}][]}}
\def\beamer@@@againframe<#1>[#2][#3]#4{%
\@ifundefined{beamer@again@#4}%
{\ClassError{beamer}{No frame has been designated to resume under
the name "#4"}{}}%
{%
- \def\beamer@temp{\frame<#1>[#2][#3,relabel=#4]}%
+ \def\beamer@temp{\frame<#1>[#2][{#3,relabel=#4}]}%
\expandafter\let\expandafter\beamer@templet\csname beamer@again@#4\endcsname%
\expandafter\beamer@temp\beamer@templet}%
}
@@ -756,18 +770,10 @@
\def\againframe{\@ifnextchar<{\beamer@againframe}{\beamer@againframe<>}}
\def\beamer@againframe<#1>{\@ifnextchar[{\beamer@@againframe<#1>}{\beamer@@againframe<#1>[]}}
\def\beamer@@againframe<#1>[{\@ifnextchar<{\beamer@@@@againframe<#1>[}{\beamer@@againframe<#1>[<*>][}}
- \def\beamer@@@@againframe<#1>[#2]{\@ifnextchar[{\beamer@@@againframe<#1>[#2]}{\beamer@@@againframe<#1>[#2][]}}
+ \def\beamer@@@@againframe<#1>[#2]{\@ifnextchar[{\beamer@@@againframe<#1>[{#2}]}{\beamer@@@againframe<#1>[{#2}][]}}
\def\beamer@@@againframe<#1>[#2][#3]#4{} % do nothing
}
-
\mode
<all>
-% End in common mode
-
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex"
-%%% End: