Commits

Anonymous committed 7fec35d

added notes stuff

  • Participants
  • Parent commits 3a4f548

Comments (0)

Files changed (11)

 	  themes no longer needed.
 
 	Changed:
+	- Every frame is now put into a box internally. Slides will never
+	  be split over two pages.
 	- \pause commands now transcends blocks (very useful!)
 	- Extended syntax of \item: A second overlay specification will
 	  now cause the item to be alerted (very useful!).
 beamer/base/beamerbaselocalstructure.sty
 beamer/base/beamerbasemodes.sty
 beamer/base/beamerbasemisc.sty
+beamer/base/beamerbasenotes.sty
 beamer/base/beamerbasenavigation.sty
 beamer/base/beamerbaseoverlay.sty
+beamer/base/beamerbaseoptions.sty
 beamer/base/beamerbasesection.sty
 beamer/base/beamerbasetemplates.sty
 beamer/base/beamerbasetitle.sty

File base/beamer.cls

 \newif\ifbeamer@compress
 \newif\ifbeamer@centered
 \newif\ifbeamer@draftmode
-\newif\ifbeamer@compressnotes
 \newif\ifbeamer@suppressreplacements % decides whether fonts should be substituted
+\newif\ifbeamer@frameswithnotesonly
 
 
+\RequirePackage{beamerbaseoptions}
+% For option management
 
-\RequirePackage{pgf}
-% For all sorts of things...
-
-\RequirePackage{xxcolor}
-% For color management.
-
-\RequirePackage{amssymb}
-% For \blacktriangleright
-
-\RequirePackage{keyval}
-% For \tableofcontents parameters
-
-\RequirePackage[%
-  papersize={12.80cm,9.60cm},
-  hmargin=1cm,%
-  vmargin=0cm,%
-  head=0.5cm,% will be changed later
-  headsep=0pt,%
-  foot=0.5cm% will be changed later
-  ]{geometry}
-% For the page layout
-
-\RequirePackage[implicit=false,%
-  bookmarks=true,%
-  bookmarksopen=true,%
-  pdfborder={0 0 0},%
-  pdfhighlight={/N}%
-  ]{hyperref}
-% For hyperlinks
 
 
 %
 \beamer@notesnormalstrue
 \beamer@compressfalse
 \beamer@draftmodefalse
-\beamer@compressnotesfalse
+\beamer@frameswithnotesonlyfalse
 
-\DeclareOption{inrow}
-{\ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}}
-
-\DeclareOption{compress}
+\DeclareOptionBeamer{compress}
 {\beamer@compresstrue}
 
-\DeclareOption{compressnotes}
-{\beamer@compressnotestrue}
-
-\DeclareOption{slidescentered}
+\DeclareOptionBeamer{slidescentered}
 {\beamer@centeredtrue}
 
-\DeclareOption{slidestop}
+\DeclareOptionBeamer{slidestop}
 {\beamer@centeredfalse}
 
-\DeclareOption{blue}
-{\definecolor{structure}{rgb}{0.2,0.2,0.7}}
+\DeclareOptionBeamer{blue}{\def\beamer@structurecolor{0.2,0.2,0.7}}
+\DeclareOptionBeamer{red}{\def\beamer@structurecolor{0.7,0.2,0.2}}
+\DeclareOptionBeamer{blackandwhite}{\def\beamer@structurecolor{0.2,0.2,0.2}}
+\DeclareOptionBeamer{brown}{\def\beamer@structurecolor{0.66,0.4,0.166}}
 
-\DeclareOption{red}
-{\definecolor{structure}{rgb}{0.7,0.2,0.2}}
-
-\DeclareOption{blackandwhite}
-{\definecolor{structure}{rgb}{0.2,0.2,0.2}}
-
-\DeclareOption{brown}
-{\definecolor{structure}{rgb}{0.66,0.4,0.166}}
-
-\DeclareOption{leqno}{\input{leqno.clo}}
-\DeclareOption{fleqn}{\input{fleqn.clo}}
+\DeclareOptionBeamer{leqno}{\input{leqno.clo}}
+\DeclareOptionBeamer{fleqn}{\input{fleqn.clo}}
 
 \def\beamer@currentmode{default}
-\DeclareOption{handout}{\gdef\beamer@currentmode{handout}}
-\DeclareOption{trans}{\gdef\beamer@currentmode{trans}}
+\DeclareOptionBeamer{handout}{\gdef\beamer@currentmode{handout}}
+\DeclareOptionBeamer{trans}{\gdef\beamer@currentmode{trans}}
 
-\DeclareOption{notes}{\beamer@notestrue}
-\DeclareOption{notesonly}{\beamer@notestrue\beamer@notesnormalsfalse}
+\DeclareOptionBeamer{notes}[show]{\csname beamer@notesaction@#1\endcsname}
 
-\DeclareOption{sans}{%
+\def\beamer@notesaction@hide{\beamer@notesfalse}
+\def\beamer@notesaction@show{\beamer@notestrue}
+\def\beamer@notesaction@only{\beamer@notestrue\beamer@notesnormalsfalse}
+\def\beamer@notesaction@frameswithnotes{\beamer@notestrue\beamer@frameswithnotesonlytrue}
+
+\DeclareOptionBeamer{sans}{%
   \def\familydefault{\sfdefault}
   \def\mathfamilydefault{\sfdefault}
   \beamer@sansmathtrue
 }
-\DeclareOption{serif}{%
+\DeclareOptionBeamer{serif}{%
   \def\familydefault{\rmdefault}
   \def\mathfamilydefault{\rmdefault}
   \beamer@sansmathfalse
 }
 
-\DeclareOption{mathsans}{\def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue}
-\DeclareOption{mathserif}{\def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
+\DeclareOptionBeamer{mathsans}{\def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue}
+\DeclareOptionBeamer{mathserif}{\def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
 
-\DeclareOption{professionalfont}{\beamer@suppressreplacementstrue}
+\DeclareOptionBeamer{professionalfont}{\beamer@suppressreplacementstrue}
 
-\DeclareOption{nodefaultblocks}{\beamer@blocksfalse}
+\DeclareOptionBeamer{nodefaultblocks}{\beamer@blocksfalse}
 
-\DeclareOption{pdftex}{}% Used by hyperref
-\DeclareOption{nativepdf}{}% Used by hyperref
-\DeclareOption{pdfmark}{}% Used by hyperref
-\DeclareOption{dvips}{}% Used by hyperref
-\DeclareOption{dviwindo}{}% Used by hyperref
-\DeclareOption{dvipsone}{}% Used by hyperref
-\DeclareOption{vtex}{}% Used by hyperref
-\DeclareOption{ps2pdf}{}% Used by hyperref
+\DeclareOptionBeamer{pdftex}{}% Used by hyperref
+\DeclareOptionBeamer{nativepdf}{}% Used by hyperref
+\DeclareOptionBeamer{pdfmark}{}% Used by hyperref
+\DeclareOptionBeamer{dvips}{}% Used by hyperref
+\DeclareOptionBeamer{dviwindo}{}% Used by hyperref
+\DeclareOptionBeamer{dvipsone}{}% Used by hyperref
+\DeclareOptionBeamer{vtex}{}% Used by hyperref
+\DeclareOptionBeamer{ps2pdf}{}% Used by hyperref
 
 \def\beamer@size{{size11.clo}}
-\DeclareOption{bigger}{\def\beamer@size{{size12.clo}}}
-\DeclareOption{smaller}{\def\beamer@size{{size10.clo}}}
+\DeclareOptionBeamer{bigger}{\def\beamer@size{{size12.clo}}}
+\DeclareOptionBeamer{smaller}{\def\beamer@size{{size10.clo}}}
 
-\DeclareOption{8pt}{\def\beamer@size{{size8.clo}}}
-\DeclareOption{9pt}{\def\beamer@size{{size9.clo}}}
-\DeclareOption{10pt}{\def\beamer@size{{size10.clo}}}
-\DeclareOption{11pt}{\def\beamer@size{{size11.clo}}}
-\DeclareOption{12pt}{\def\beamer@size{{size12.clo}}}
-\DeclareOption{14pt}{\def\beamer@size{{size14.clo}}}
-\DeclareOption{17pt}{\def\beamer@size{{size17.clo}}}
-\DeclareOption{20pt}{\def\beamer@size{{size20.clo}}}
+\DeclareOptionBeamer{8pt}{\def\beamer@size{{size8.clo}}}
+\DeclareOptionBeamer{9pt}{\def\beamer@size{{size9.clo}}}
+\DeclareOptionBeamer{10pt}{\def\beamer@size{{size10.clo}}}
+\DeclareOptionBeamer{11pt}{\def\beamer@size{{size11.clo}}}
+\DeclareOptionBeamer{12pt}{\def\beamer@size{{size12.clo}}}
+\DeclareOptionBeamer{14pt}{\def\beamer@size{{size14.clo}}}
+\DeclareOptionBeamer{17pt}{\def\beamer@size{{size17.clo}}}
+\DeclareOptionBeamer{20pt}{\def\beamer@size{{size20.clo}}}
 
-\DeclareOption{draft}{\beamer@draftmodetrue}
+\DeclareOptionBeamer{draft}{\beamer@draftmodetrue}
 \AtBeginDocument{
   \ifbeamer@draftmode
   \gdef\beamer@foottemplate{%
 
 \def\beamer@activecjk{}
 
-\DeclareOption{CJK}{\ExecuteOptions{cjk}}
-\DeclareOption{cjk}{
+\DeclareOptionBeamer{CJK}{\ExecuteOptions{cjk}}
+\DeclareOptionBeamer{cjk}{
   \hypersetup{CJKbookmarks=true}
 
   \def\beamer@activecjk{
     }
   }  
 }
- 
+
+
+% obsolete options
+\DeclareOptionBeamer{inrow}
+{\ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}}
+
+\DeclareOptionBeamer{compressnotes}{%
+  \ClassWarning{beamer}{``compressnotes'' option no longer supported. Use
+    \noexpand\beamertemplatenotecompress instead}
+  \AtBeginDocument{\beamertemplatenotecompress}}
+
+\DeclareOptionBeamer{notesonly}{\ClassWarning{beamer}{``notesonly'' no
+    longer supported. Use notes=only instead}\beamer@notesaction@only}
+
+
+
+\PassOptionsToPackage{bookmarks=true,bookmarksopen=true,pdfborder={0 0 0},pdfhighlight={/N}}{hyperref}
+  
+\DeclareOptionBeamer{pgf}{\PassOptionsToPackage{#1}{pgf}}
+\DeclareOptionBeamer{hyperref}{\PassOptionsToPackage{#1}{hyperref}}
+\DeclareOptionBeamer{color}{\PassOptionsToPackage{#1}{color}}
+\DeclareOptionBeamer{xcolor}{\PassOptionsToPackage{#1}{xcolor}}
 
 %
 % Process Options
 %
-\ExecuteOptions{blue,sans,slidescentered}
 
-\ProcessOptions
+\ExecuteOptionsBeamer{blue,sans,slidescentered}
+
+\ProcessOptionsBeamer
   
+\RequirePackage{pgf}
+% For all sorts of things...
+
+\RequirePackage{xxcolor}
+% For color management.
+
+\RequirePackage{amssymb}
+% For \blacktriangleright
+
+\RequirePackage[%
+  papersize={12.80cm,9.60cm},
+  hmargin=1cm,%
+  vmargin=0cm,%
+  head=0.5cm,% will be changed later
+  headsep=0pt,%
+  foot=0.5cm% will be changed later
+  ]{geometry}
+% For the page layout
+
+\RequirePackage[implicit=false]{hyperref}
+% For hyperlinks
+
+\hypersetup{pdfcreator={LaTeX with beamer class}}
+
+
 \expandafter\input\beamer@size
 \geometry{headsep=0pt}
+\definecolor{structure}{rgb}{\beamer@structurecolor}
 
 
 \RequirePackage{beamerbasecompatibility}
 \RequirePackage{beamerbaseoverlay}
 % Overlay stuff
 
+\RequirePackage{beamerbasenotes}
+% Commands for adding notes
+
 \RequirePackage{beamerbasetoc}
 % Table of Contents Format
 

File base/beamerbasearticle.sty

 \RequirePackage{beamerbaseframe}
 % Commands for constructing frames
 
+\RequirePackage{beamerbasenotes}
+% Commands for constructing frames
+
 \RequirePackage{beamerbaseframecomponents}
 % Headlines, sidebars, columns
 

File base/beamerbaseframe.sty

   \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{%
     \refstepcounter{subsectionslide}%
     \xdef\beamer@framestartpage{\the\c@page}% only first time
-  }{\clearpage}% cleanup from previous slide
+  }{\clearpage\beamer@notesactions}% cleanup from previous slide
   \hypersetup{pdfpagetransition=R}%
   \hypersetup{pdfpageduration=}%
   \xdef\beamer@frameendpage{\the\c@page}% every time
     \fi%
   \fi%
   % Start slide:
-  \setbox\beamer@framebox=\vbox to\textheight\bgroup\vbox{}\par%
-  \beamer@entrycode\begin{beamer@framepauses}%\vspace*{-\baselineskip}%
-  \vfill}%
-  {\beamer@exitcode\vskip0pt plus 1.5fill\end{beamer@framepauses}%}%
-  \egroup\box\beamer@framebox}
+  \beamer@framenotesbegin%
+    \setbox\beamer@framebox=\vbox to\textheight\bgroup\vbox{}\par%
+    \beamer@entrycode\begin{beamer@framepauses}%\vspace*{-\baselineskip}%
+    \vfill}%
+  {\beamer@exitcode\vskip0pt plus 1.5fill\end{beamer@framepauses}%
+  \egroup%
+  \beamer@framenotesend%  
+  \box\beamer@framebox}
 
 
 
   \else% again mode
     \let\beamer@howtotreatframe\beamer@doseveralframes%
   \fi%
-  \ifbeamer@notesnormals\else\let\beamer@howtotreatframe\beamer@donoframe\fi%
+%  \ifbeamer@notesnormals%
+%  \else%
+%    \let\beamer@howtotreatframe\beamer@donoframe%
+%  \fi%
   \beamer@howtotreatframe}
 \long\def\beamer@donoframe{%
   \beamer@slideinframe=1\relax%
     \addtocontents{nav}%
       {\protect\headcommand{% 
         \protect\beamer@framepages{\beamer@framestartpage}{\beamer@frameendpage}}}%
-    \clearpage%
+    \clearpage\beamer@notesactions%
   }
 }
 \def\beamer@reseteecodes{\gdef\beamer@entrycode{}\gdef\beamer@exitcode{}\beamer@resumemode}
 
 
 
-%
-% Notes
-%
-
-\long\def\note#1{%
-  \ifbeamer@notes
-  {
-  \def\@oddhead{}
-  \def\@oddfoot{}
-  \let\@evenhead\@oddhead
-  \let\@evenfoot\@oddfoot
-  \def\beamer@backgroundtemplate{}
-  \vbox{%
-    \let\\=\space%
-    \vskip-\headheight%
-    \ifbeamer@compressnotes
-      \insertvrule{2.5em}{white!90!black}
-      \vskip2.5em
-      \nointerlineskip
-      \tiny
-      \setbox\beamer@tempbox=\hbox{\raise7em\hbox{\insertsection}}%
-      \ht\beamer@tempbox=0pt
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\raise6em\hbox{\quad\insertsubsection}}%
-      \ht\beamer@tempbox=0pt
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\raise5em\hbox{\quad\quad\insertframetitle}}%
-      \ht\beamer@tempbox=0pt
-      \box\beamer@tempbox
-      \nointerlineskip
-    \else    
-      \insertvrule{8em}{white!90!black}
-      \vskip-8.5em
-      \hbox{\vbox{
-      \begin{pgfpicture}{0cm}{0cm}{0cm}{0cm}
-        \begin{pgfrotateby}{\pgfdegree{90}}
-          \pgfputat{\pgfpoint{-2cm}{0.25cm}}{\pgfbox[base,left]{\footnotesize\the\year-\ifnum\month<10\relax0\fi\the\month-\ifnum\day<10\relax0\fi\the\day}}
-        \end{pgfrotateby}
-      \end{pgfpicture}}}
-      \hbox{\vbox{\begin{minipage}[t]{8cm}\insertshorttitle\end{minipage}}}%
-      \setbox\beamer@tempbox=\hbox{\insertsection}%
-      \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip4pt\raise3pt\hbox{\vrule width0.4pt height9pt\vrule width 9pt height0.4pt}}\hskip1pt\hbox{\vbox{\begin{minipage}[t]{8cm}\let\\=\space\insertsection\end{minipage}}}\fi}%
-      \setbox\beamer@tempbox=\hbox{\insertsubsection}%
-      \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip17.4pt\raise3pt\hbox{\vrule width0.4pt height9pt\vrule width 9pt height0.4pt}}\hskip1pt\hbox{\vbox{\begin{minipage}[t]{8cm}\let\\=\space\insertsubsection\end{minipage}}}\fi}%
-      \setbox\beamer@tempbox=\hbox{\insertframetitle}%
-      \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip30.8pt\raise3pt\hbox{\vrule width0.4pt height9pt\vrule width 9pt height0.4pt}}\hskip1pt\hbox{\vbox{\begin{minipage}[t]{8cm}\let\\=\space\insertframetitle\end{minipage}}}\fi}%
-    \fi
-    }
-  \ifbeamer@compressnotes
-  \vskip-2em  
-  \else
-  \vskip2.5em
-  \fi
-  \small
-  #1%
-  \clearpage
-  }\fi}
-
-\long\def\noteitems#1{\note{\begin{itemize}#1\end{itemize}}}
-
-
-\article
-{
-  \long\def\note#1{}
-  \long\def\noteitems#1{}
-}
-
-
-
 \common
 % End in common mode
 

File base/beamerbaselocalstructure.sty

 \def\beamer@structure#1{\begin{structureenv}#1\end{structureenv}}
 
 \long\def\usealerttemplate#1#2{%
-  \gdef\beamer@templatestartalert{#1}\gdef\beamer@templateendalert{#2}}
+  \def\beamer@templatestartalert{#1}\def\beamer@templateendalert{#2}}
 \long\def\usestructuretemplate#1#2{%
-  \gdef\beamer@templatestartstructure{#1}\gdef\beamer@templateendstructure{#2}}
+  \def\beamer@templatestartstructure{#1}\def\beamer@templateendstructure{#2}}
 
 \usealerttemplate{%
   \def\bmb@scheme{alert}%
 \common
 {
   \long\def\useblocktemplate#1#2{%
-    \gdef\beamer@beginblocktemplate{#1}
-    \gdef\beamer@endblocktemplate{#2}}
+    \def\beamer@beginblocktemplate{#1}
+    \def\beamer@endblocktemplate{#2}}
 
   \long\def\usealertblocktemplate#1#2{%
-    \gdef\beamer@beginalertblocktemplate{#1}
-    \gdef\beamer@endalertblocktemplate{#2}}
+    \def\beamer@beginalertblocktemplate{#1}
+    \def\beamer@endalertblocktemplate{#2}}
 
   \long\def\useexampleblocktemplate#1#2{%
-    \gdef\beamer@beginexampleblocktemplate{#1}
-    \gdef\beamer@endexampleblocktemplate{#2}}
+    \def\beamer@beginexampleblocktemplate{#1}
+    \def\beamer@endexampleblocktemplate{#2}}
 }
 \newoverlayenvironment{block}[1]{%
   \def\insertblockname{#1}%
 \def\endenumerate{\ifhmode\unskip\fi\endlist\csname\@enumctr endtemplate\endcsname}
 
 \def\useenumerateitemminitemplate#1{%
-  \gdef\beamer@autoenumtemplate{#1}}
+  \def\beamer@autoenumtemplate{#1}}
 \useenumerateitemminitemplate{\color{beamerstructure}\insertenumlabel}
 
 
 \def\enditemize{\ifhmode\unskip\fi\endlist\csname\@itemctr endtemplate\endcsname}
 
 \def\useenumerateitemtemplate#1{% 
-  \gdef\labelenumi{\def\insertenumlabel{\theenumi}#1}}
+  \def\labelenumi{\def\insertenumlabel{\theenumi}#1}}
 
 \def\useenumeratetemplate#1#2{% before and after
-  \gdef\enumistarttemplate{#1}%
-  \gdef\enumiendtemplate{#2}}
+  \def\enumistarttemplate{#1}%
+  \def\enumiendtemplate{#2}}
 
 \def\usesubenumerateitemtemplate#1{%
-  \gdef\labelenumii{\def\insertenumlabel{\theenumi}\def\insertsubenumlabel{\theenumii}#1}}
+  \def\labelenumii{\def\insertenumlabel{\theenumi}\def\insertsubenumlabel{\theenumii}#1}}
 
 \def\usesubenumeratetemplate#1#2{% before and after
-  \gdef\enumiistarttemplate{#1}%
-  \gdef\enumiiendtemplate{#2}}
+  \def\enumiistarttemplate{#1}%
+  \def\enumiiendtemplate{#2}}
 
 
 \def\useitemizeitemtemplate#1{%
-  \gdef\labelitemi{#1}\let\beamer@labelitemi\labelitemi}%itemilabeltemplate{#1}}
+  \def\labelitemi{#1}\let\beamer@labelitemi\labelitemi}%itemilabeltemplate{#1}}
 
 \def\useitemizetemplate#1#2{% before and after
-  \gdef\itemistarttemplate{#1}%
-  \gdef\itemiendtemplate{#2}}
+  \def\itemistarttemplate{#1}%
+  \def\itemiendtemplate{#2}}
 
 \def\usesubitemizeitemtemplate#1{%
-  \gdef\labelitemii{#1}\let\beamer@labelitemii\labelitemii}%itemiilabeltemplate{#1}}
+  \def\labelitemii{#1}\let\beamer@labelitemii\labelitemii}%itemiilabeltemplate{#1}}
 
 \def\usesubitemizetemplate#1#2{% before and after
-  \gdef\itemiistarttemplate{#1}%
-  \gdef\itemiiendtemplate{#2}}
+  \def\itemiistarttemplate{#1}%
+  \def\itemiiendtemplate{#2}}
 
 
 \def\description{\@ifnextchar[{\@description}{\beamer@descdefault\beamer@descdefaulttemp\@@description}}
 \long\def\beamer@descriptionitem#1{\def\insertdescriptionitem{#1}%
   \hfil\hspace\labelsep\normalfont\descriptionitemtemplate}
 
-\def\usedescriptionitemtemplate#1#2{\gdef\descriptionitemtemplate{#1}\global\beamer@descdefaulttemp=#2%
+\def\usedescriptionitemtemplate#1#2{\def\descriptionitemtemplate{#1}\global\beamer@descdefaulttemp=#2%
   \global\advance\beamer@descdefaulttemp by \labelsep}
 \usedescriptionitemtemplate{\color{beamerstructure}\insertdescriptionitem}{2cm}
 
   \setbox\beamer@tempbox=\hbox{\ }\hskip-\wd\beamer@tempbox\setbox\beamer@tempbox=\hbox{}\ht\beamer@tempbox=1.5em\box\beamer@tempbox}
 
 \long\def\usebibitemtemplate#1{%
-  \gdef\biblabeltemplate{#1}}
+  \def\biblabeltemplate{#1}}
 
 \long\def\usebibliographyblocktemplate#1#2#3#4{%
-  \gdef\firstblocktemplate{#1}%
-  \gdef\secondblocktemplate{#2}%
-  \gdef\thirdblocktemplate{#3}%
-  \gdef\otherblocktemplate{#4}}
+  \def\firstblocktemplate{#1}%
+  \def\secondblocktemplate{#2}%
+  \def\thirdblocktemplate{#3}%
+  \def\otherblocktemplate{#4}}
 
 \beamertemplatearticlebibitems
 \usebibliographyblocktemplate
   \vskip\belowcaptionskip}
 
 \long\def\usecaptiontemplate#1{%
-  \gdef\beamer@captiontemplate{#1}}
+  \def\beamer@captiontemplate{#1}}
 \usecaptiontemplate{%
   {\small\structure{\insertcaptionname:} \insertcaption}}
 

File base/beamerbasenotes.sty

+\ProvidesPackage{beamerbasenotes}[2004/02/05 ver 1.30]
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+
+% Copyright 2003 by Till Tantau <tantau@users.sourceforge.net>.
+%
+% This program can be redistributed and/or modified under the terms
+% of the GNU Public License, version 2.
+
+
+
+\presentation
+
+%
+% Notes
+%
+
+\long\def\note#1{%
+  \ifbeamer@notes
+  \begingroup
+    \useitemizeitemtemplate{\textbullet}
+    \usesubitemizeitemtemplate{--}    
+    \useenumerateitemtemplate{\insertenumlabel.}
+    \usesubenumerateitemtemplate{\insertenumlabel.\insertsubenumlabel}
+    \def\@oddhead{}
+    \def\@oddfoot{}
+    \let\@evenhead\@oddhead
+    \let\@evenfoot\@oddfoot
+    \def\beamer@backgroundtemplate{}
+    \vbox to\textheight{%
+      \vskip-\headheight%
+      \def\insertnote{\vbox{}#1}%
+      \beamer@notetemplate%
+      \vskip-4pt% foot separator
+      \vskip-\footheight}%
+    \clearpage
+  \endgroup
+  \fi}
+
+\long\def\noteitems#1{\note{\begin{enumerate}#1\end{enumerate}}}
+
+
+%
+% Notes in frames
+%
+
+\newoverlaycommand{\noteitem}{\beamer@noteitem}{\@gobble}
+\def\beamer@noteitem#1{%
+  \expandafter\gdef\expandafter\beamer@noteitems\expandafter{\beamer@noteitems%
+    \item#1}}
+
+\def\beamer@framenotesbegin{% at beginning of slide
+  \gdef\beamer@noteitems{}%
+}
+\def\beamer@framenotesend
+{% at end of slide
+  \ifx\beamer@noteitems\@empty%
+    % possibly suppress this slide
+    \ifbeamer@frameswithnotesonly
+      % suppress frame
+      \setbox\beamer@framebox=\box\voidb@x%
+    \fi%
+  \else
+    \gdef\beamer@notesactions{\noteitems{\beamer@noteitems}\gdef\beamer@notesactions{}}
+  \fi
+  \ifbeamer@notesnormals%
+  \else%
+    \setbox\beamer@framebox=\box\voidb@x%
+  \fi%
+}
+
+\def\beamer@notesactions{}  
+
+%
+% Note templates
+%
+
+\newcommand{\usetemplatenote}[1]{\def\beamer@notetemplate{#1}}
+
+% Default:
+\usetemplatenote{\small
+  \let\\=\relax%
+  \insertvrule{6.75em}{white!90!black}
+  \vskip-6.75em
+  \nointerlineskip
+  \vbox{
+  \begin{pgfpicture}{0cm}{0cm}{0cm}{0cm}
+    \begin{pgfrotateby}{\pgfdegree{90}}
+      \pgfputat{\pgfpoint{-2cm}{0.2cm}}%
+      {\pgfbox[base,left]{\footnotesize\the\year-\ifnum\month<10\relax0\fi\the\month-\ifnum\day<10\relax0\fi\the\day}}
+    \end{pgfrotateby}
+  \end{pgfpicture}}
+  \nointerlineskip
+  \vbox to 6.75em{\vskip0.5em
+  \hbox{\begin{minipage}[t]{10cm}\insertshorttitle\end{minipage}}%
+  \setbox\beamer@tempbox=\hbox{\insertsection}%
+  \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip4pt\raise3pt\hbox{\vrule
+        width0.4pt height7pt\vrule width 9pt
+        height0.4pt}}\hskip1pt\hbox{\begin{minipage}[t]{10cm}\let\\=\space\insertsection\end{minipage}}\fi%
+  }%
+  \setbox\beamer@tempbox=\hbox{\insertsubsection}%
+  \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip17.4pt\raise3pt\hbox{\vrule
+        width0.4pt height7pt\vrule width 9pt
+        height0.4pt}}\hskip1pt\hbox{\begin{minipage}[t]{10cm}\let\\=\space\insertsubsection\end{minipage}}\fi%
+  }%
+  \setbox\beamer@tempbox=\hbox{\insertframetitle}%
+  \hbox{\ifdim\wd\beamer@tempbox>1pt{\hskip30.8pt\raise3pt\hbox{\vrule
+        width0.4pt height7pt\vrule width 9pt
+        height0.4pt}}\hskip1pt\hbox{\begin{minipage}[t]{10cm}\let\\=\space\insertframetitle\end{minipage}}\fi%
+  }%
+  \vfil}
+  \vskip.25em
+  \nointerlineskip
+  \insertnote
+  \vfill
+}
+
+
+\article
+{
+  \long\def\note#1{}
+  \long\def\noteitems#1{}
+  \long\def\noteitem#1{}
+}
+
+
+
+\common
+% End in common mode
+
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex"
+%%% End: 

File base/beamerbaseoptions.sty

+\ProvidesPackage{beamerbaseoptions}[2004/02/06 ver 1.30]
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+
+% Copyright 2003 by Till Tantau <tantau@users.sourceforge.net>.
+%
+% This program can be redistributed and/or modified under the terms
+% of the GNU Public License, version 2.
+
+\RequirePackage{keyval}[1997/11/10]
+
+\def\ProcessOptionsBeamer{%
+  \let\@tempa\@empty
+  \ifx\@currext\@clsextension%
+  \else
+  \@for\CurrentOption:=\@classoptionslist\do{%
+    \@ifundefined{KV@\@currname @\CurrentOption}%
+    {}{\edef\@tempa{\@tempa,\CurrentOption,}}}%
+  \fi
+  \edef\@tempa{%
+    \noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}%
+  \@tempa%
+  \AtEndOfPackage{\let\@unprocessedoptions\relax}}
+
+\def\ExecuteOptionsBeamer#1{%
+  \setkeys{\@currname}{#1}}
+
+\def\DeclareOptionBeamer#1{\@ifnextchar[{\beamer@dokv{#1}}{\beamer@dokv{#1}[]}}
+\long\def\beamer@dokv#1[#2]#3{\define@key{\@currname}{#1}[#2]{#3}}
+
+
+\common
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex"
+%%% End: 

File base/beamerbasetemplates.sty

 }
 
 
+%
+% Note templates
+%
+
+\newcommand{\beamertemplatenoteempty}{
+  \usetemplatenote{\small\insertnote}}
+
+\newcommand{\beamertemplatenotecompress}{
+\usetemplatenote{
+  \let\\=\relax%
+  \insertvrule{2.5em}{white!90!black}%
+  \vskip-2.25em
+  \nointerlineskip
+  \tiny
+  \setbox\beamer@tempbox=\hbox{\hbox{\insertsection}}%
+  \ht\beamer@tempbox=1em
+  \box\beamer@tempbox
+  \nointerlineskip
+  \setbox\beamer@tempbox=\hbox{\hbox{\quad\insertsubsection}}%
+  \ht\beamer@tempbox=1em
+  \box\beamer@tempbox
+  \nointerlineskip
+  \setbox\beamer@tempbox=\hbox{\hbox{\quad\quad\insertframetitle}}%
+  \ht\beamer@tempbox=1em
+  \box\beamer@tempbox
+  \vskip1em
+  \small
+  \nointerlineskip
+  \insertnote
+}
+}
 \common

File doc/beameruserguide.tex

   deactivated. 
 \end{package}
 
+\begin{package}{{color}}
+  The |color| package is automatically loaded by |beamer.cls|. This
+  makes it impossible to pass options to |color| in the preamble of
+  your document. To pass a \meta{list of options} to |color|, you must
+  use the following class option:
+
+  \begin{classoption}{{color={\normalfont\meta{list of options}}}}
+    Causes the \meta{list of options} to be passed on to the |color|
+    package. If the \meta{list of options} contains more than one
+    option you must enclose it in curly brackets.
+  \end{classoption}
+\end{package}
+
 \begin{package}{{CJK}}
   When using the |CJK| package, you must use the class option
   \declare{|CJK|}. See |beamerexample4.tex| for an example.
   package. 
 \end{package}
 
+\begin{package}{{hyperref}}
+  The |hyperref| package is automatically loaded by |beamer.cls| and
+  certain options are setup. In order pass additional options to
+  |hyperref| or to override options, you can use the following class
+  option: 
+
+  \begin{classoption}{{hyperref={\normalfont\meta{list of options}}}}
+    Causes the \meta{list of options} to be passed on to the |hyperref|
+    package.
+
+    \example |\documentclass[hyperref={bookmarks=false}]{beamer}|
+  \end{classoption}
+\end{package}
+
 \begin{package}{{inputenc}|[|\declare{|utf8|}|]|}
   Currently, you cannot use utf8 encoded text in |\section| and
   |\subsection| commands, if that text uses characters outside the
   |colored| option of |\defverbatim|.
 \end{package}
 
+
 \begin{package}{{\normalfont\meta{professional font package}}}
   If you use a professional font package, \beamer's internal
   redefinition of how variables are typeset may interfere with the
 \end{package}
 
 
+\begin{package}{{xcolor}}
+  The |xcolor| package is automatically loaded by |beamer.cls|. The
+  same applies as to |color|.
+
+  \begin{classoption}{{xcolor={\normalfont\meta{list of options}}}}
+    Causes the \meta{list of options} to be passed on to the |xcolor|
+    package.
+  \end{classoption}
+\end{package}
+
 
 
 

File themes/beamerthemesidebar.sty

 % archives in directory macros/latex/base/lppl.txt.
 
 \RequirePackage{pgfshade}
-\RequirePackage{keyval}[1997/11/10]
-
-\def\ProcessOptionsWithKV#1{%
-  \let\@tempa\@empty
-  \@for\CurrentOption:=\@classoptionslist\do{%
-    \@ifundefined{KV@#1@\CurrentOption}%
-    {}{\edef\@tempa{\@tempa,\CurrentOption,}}}%
-  \edef\@tempa{%
-    \noexpand\setkeys{#1}{\@tempa\@ptionlist{\@currname.\@currext}}}%
-  \@tempa
-  \AtEndOfPackage{\let\@unprocessedoptions\relax}}
 
 \newif\ifbeamer@sidebartab
 \newif\ifbeamer@sidebardark
 
 \newdimen\beamer@sidebarwidth
 \beamer@sidebarwidth=2.5cm
-\define@key{beamersidebar}{width}{\beamer@sidebarwidth=#1}
-\define@key{beamersidebar}{tab}[true]{\csname beamer@sidebartab#1\endcsname}
-\define@key{beamersidebar}{dark}[true]{\csname beamer@sidebardark#1\endcsname}
-\ProcessOptionsWithKV{beamersidebar}
+
+\DeclareOptionBeamer{width}[2.5cm]{\beamer@sidebarwidth=#1}
+\DeclareOptionBeamer{tab}[true]{\csname beamer@sidebartab#1\endcsname}
+\DeclareOptionBeamer{dark}[true]{\csname beamer@sidebardark#1\endcsname}
+
+\ProcessOptionsBeamer
 
 \ifbeamer@sidebardark
   \beamertemplateboldtitlepage
           \hskip-\beamer@sidebarwidth%
           \color{structure}\bfseries%
         \else%
-          \color[gray]{0.1}\lower0.375ex\hbox{\vrule width\beamer@sidebarwidth height 2.4375ex}%
+          \color[gray]{0.9}\lower0.375ex\hbox{\vrule width\beamer@sidebarwidth height 2.4375ex}%
           \hskip-\beamer@sidebarwidth%
           \color{structure}%
         \fi%
       \else%
         \color{structure}\insertshorttitle%
         \vskip.5em
-        \color{black!75}\insertshortauthor5
+        \color{black!75}\insertshortauthor
       \fi%
     \end{minipage}}%
   \vskip1em