Commits

Anonymous committed 5cdc3bd

*** empty log message ***

Comments (0)

Files changed (10)

+2004-02-23 Till Tantau <tantau@users.sourceforge.net>
+
+	Bugfixes:
+	- Fixed bug with class options containing braces
+	- Fixed bug in beamerbasecolor.sty
+	- Fixed bug that caused footnotes not to be shown.
+	- Fixed bug that caused \normalcolor to ignore mixins. 
+	- Fixed bug with french and spanish babel in article mode.
+	- Fixed bugs in \cite and \bibitem commands. Will now correctly
+	  handle spaces in conjunction with babel.
+	- Fixed bugs in beamerpresentation.lyx.
+	- Fixed bug with \@centercr in article mode.
+
+	Changed:
+	- \beamertemplateballitems will now also project mini templates on
+	  balls. Write
+	  \useenumerateitemminitemplate{\color{beamercolor}\insertenumlabel}
+	  to get the old behaviour.
+	- \footnote now takes an extra optional argument.
+
 2004-02-18 Till Tantau <tantau@users.sourceforge.net>
 
 	Version 2.00
-beamer -- A LaTeX class to produce beamer presentations
+beamer -- A LaTeX class for producing beamer presentations
 
 See the documentation in doc/beameruserguide.pdf for a user
 manual. Read the INSTALL file for installing the class on your 

base/beamerbasearticle.sty

 \newif\ifbeamer@articlexcolor
 \beamer@articlexcolortrue
 
+\newif\ifbeamer@articleactive
+\beamer@articleactivefalse
+
 \DeclareOption{noxcolor}{\beamer@articlexcolorfalse}
 \DeclareOption{nodefaultblocks}{\beamer@blocksfalse}
+\DeclareOption{activeospeccharacters}{\beamer@articleactivetrue}
 
 \ProcessOptions
 

base/beamerbasecolor.sty

 \let\beamerorig@set@color=\set@color
 \let\beamerorig@reset@color=\reset@color
 
+\edef\beamer@zeropt{\the\z@}
+
 \def\beamer@current@colorhook{}
 
 \def\set@color{%

base/beamerbasecompatibility.sty

     \let\itemize\beamer@itemize
     \let\list\beamer@list
     \let\@trivlist\beamer@@trivlist%
-    \catcode`:=12\catcode`|=12}
+    \catcode`:=12\catcode`|=12\catcode`!=12}
   
   \AtBeginDocument{% fix spanish.ldf's meddling with < and > 
     %
   \def\document{%
     \beamer@origdocument%
     \beamer@lastminutepatches}
+
+  \g@addto@macro\beamer@lastminutepatches{%
+    \ifbeamer@articleactive
+    \else
+      \catcode`:=12\catcode`!=12\catcode`|=12\catcode`<=12\catcode`>=12   
+    \fi    
+    }
 }
 
 
 \AtBeginDocument{\def\es@itemize#1#2#3#4{}}% fix spanish.ldf's with \itemize 
 
 
+
+
 %
 % Fix for older versions of geometry
 %

base/beamerbaseframe.sty

     \beamer@inframetrue%
     \beamer@entrycode\begin{beamer@framepauses}%\vspace*{-\baselineskip}%
     \vfill}%
-  {\beamer@exitcode\vskip0pt plus 1.5fill\end{beamer@framepauses}%
+  {\beamer@exitcode\vskip0pt plus 1.5fill%
+  \ifvoid\footins\else%
+    \normalcolor%
+    \footnoterule%
+    \unvbox \footins%
+  \fi%
+  \end{beamer@framepauses}%
   \egroup%
   \beamer@framenotesend%  
   \box\beamer@framebox}
   \def\beamer@breaker<#1>{\only<#1>{\beamer@origbreak}}
   \def\beamer@@breaker{\ifbeamer@inframe\else\expandafter\beamer@origbreak\fi}
 
-  \let\beamer@origbreamcenter=\@centercr
+  \let\beamer@origbreakcenter=\@centercr
   \def\@centercr{\beamer@ifnextcharospec{\beamer@breakercenter}{\beamer@@breakercenter}}
   \def\beamer@breakercenter<#1>{\only<#1>{\beamer@origbreakcenter}}
   \def\beamer@@breakercenter{\ifbeamer@inframe\else\expandafter\beamer@origbreakcenter\fi}

base/beamerbaseframecomponents.sty

   \parindent 1em\noindent%
   \hbox to 1.8em{\hfil\insertfootnotemark}\insertfootnotetext}
 
+\long\def\beamer@framefootnotetext#1{%
+  \global\setbox\footins\vbox{%
+    \unvbox\footins
+    \reset@font\footnotesize
+    \hsize\columnwidth
+    \@parboxrestore
+    \protected@edef\@currentlabel
+         {\csname p@footnote\endcsname\@thefnmark}%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+    \color@endgroup}}
+
+\let\@footnotetext=\beamer@framefootnotetext
+
+\define@key{beamerfootnote}{frame}[true]{\let\beamer@footnotetext=\beamer@framefootnotetext\def\beamer@mpfn{footnote}\def\beamer@thempfn{\thefootnote}}
+
+\renewcommand\footnote[1][]{%
+  \let\beamer@footnotetext=\@footnotetext%
+  \let\beamer@mpfn=\@mpfn%
+  \let\beamer@thempfn=\thempfn%
+  \let\beamer@kvorig=\KV@errx%
+  \def\beamer@footarg{}%
+  \def\KV@errx##1{\edef\beamer@footarg{\@tempa}}%
+  \setkeys{beamerfootnote}{#1}%
+  \let\KV@errx=\beamer@kvorig%
+  \ifx\beamer@footarg\@empty%
+    \def\beamer@next{\stepcounter\beamer@mpfn
+      \protected@xdef\@thefnmark{\beamer@thempfn}%
+      \@footnotemark\beamer@footnotetext}%
+  \else%
+    \def\beamer@next{%
+      \begingroup
+        \csname c@\beamer@mpfn\endcsname\beamer@footarg\relax
+        \unrestored@protected@xdef\@thefnmark{\beamer@thempfn}%
+      \endgroup
+      \@footnotemark\beamer@footnotetext}%
+  \fi%
+  \beamer@next}
+
+\mode
+<article>
+{
+  \define@key{beamerfootnote}{frame}[true]{}
+
+\let\beamer@origfootnote=\footnote
+  \renewcommand\footnote[1][]{%
+    \let\beamer@kvorig=\KV@errx%
+    \def\beamer@footarg{}%
+    \def\KV@errx##1{\edef\beamer@footarg{\@tempa}}%
+    \setkeys{beamerfootnote}{#1}%
+    \let\KV@errx=\beamer@kvorig%
+    \ifx\beamer@footarg\@empty%
+      \edef\beamer@next{\noexpand\beamer@origfootnote}%
+    \else%
+      \edef\beamer@next{\noexpand\beamer@origfootnote[\beamer@footarg]}%
+    \fi%
+    \beamer@next}
+}
 
 
 \mode

base/beamerbaseoverlay.sty

 %
 % \temporal
 %
-\def\@temporal<#1>#2#3#4{% past, present, future
+\long\def\temporal<#1>#2#3#4{% past, present, future
   \def\beamer@doifnotinframe{\beamer@picked}\def\beamer@doifinframe{#3}%
   {\setbox0=\hbox{\beamer@localanotherslidefalse\beamer@decode#1| stop:0|
       \ifbeamer@localanotherslide\gdef\beamer@picked{#2}\else\gdef\beamer@picked{#4}\fi}}\beamer@donow}

base/beamerbasesection.sty

     \beamer@ifempty{#2}%
     {\long\def\secname{#1}}%
     {\advance\beamer@tocsectionnumber by 1\relax%
-      \long\def\secname{#2}\addtocontents{toc}{\protect\beamer@sectionintoc{\the\c@section}{#2}{\thepage}{\the\c@part}%
+      \long\def\secname{#2}\addtocontents{toc}{\protect\beamer@sectionintoc{\the\c@section}{#2}{\the\c@page}{\the\c@part}%
         {\the\beamer@tocsectionnumber}}}%
-    \addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c@section}{#1}{\thepage}{\secname}{\the\c@part}}}%
+    \addtocontents{nav}{\protect\headcommand{\protect\sectionentry{\the\c@section}{#1}{\the\c@page}{\secname}{\the\c@part}}}%
     {\let\\=\relax\xdef\sectionlink{{Navigation\the\c@page}{\noexpand\secname}}}%
     \beamer@tempcount=\c@page\advance\beamer@tempcount by -1%
     \addtocontents{nav}{\protect\headcommand{\protect\beamer@sectionpages{\the\beamer@sectionstartpage}{\the\beamer@tempcount}}}%
     {%
       \long\def\subsecname{#2}%
       \long\def\lastsubsection{#1}%
-      \addtocontents{toc}{\protect\beamer@subsectionintoc{\the\c@section}{\the\c@subsection}{#2}{\thepage}{\the\c@part}{\the\beamer@tocsectionnumber}}%
+      \addtocontents{toc}{\protect\beamer@subsectionintoc{\the\c@section}{\the\c@subsection}{#2}{\the\c@page}{\the\c@part}{\the\beamer@tocsectionnumber}}%
     }%
     \beamer@tempcount=\c@page\advance\beamer@tempcount by -1%
     \addtocontents{nav}{\protect\headcommand{\protect\beamer@subsectionpages{\the\beamer@subsectionstartpage}{\the\beamer@tempcount}}}%

base/beamerbasetemplates.sty

   \usetemplatetocsection[20!averagebackgroundcolor]
   {\leavevmode\leftskip=.5em\color{beamerstructure}%
     \llap{\begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-      \color{structure!50!averagebackgroundcolor}
+      \color{beamerstructure!50!averagebackgroundcolor}
       \pgfcircle[fill]{\pgfpoint{0ex}{.75ex}}{1.2ex}
       \pgfbox[center,base]{\color{white}\inserttocsectionnumber}
     \end{pgfpicture}\kern1ex}\inserttocsection\par}
 
 \newcommand{\beamertemplatenumberedballsectiontoc}{
   \pgfdeclareradialshading{tocsphere}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
 
   \begin{colormixin}{20!averagebackgroundcolor}
   \pgfdeclareradialshading{tocsphereshaded}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
   \end{colormixin}
   \pgfaliasshading{tocsphere.!20opaque}{tocsphereshaded}
 
   \begin{colormixin}{15!averagebackgroundcolor}
   \pgfdeclareradialshading{tocsphereshaded}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
   \end{colormixin}
   \pgfaliasshading{tocsphere.!15opaque}{tocsphereshaded}
 
   \begin{colormixin}{10!averagebackgroundcolor}
   \pgfdeclareradialshading{tocsphereshaded}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
   \end{colormixin}
   \pgfaliasshading{tocsphere.!10opaque}{tocsphereshaded}
 
   \begin{colormixin}{5!averagebackgroundcolor}
   \pgfdeclareradialshading{tocsphereshaded}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
   \end{colormixin}
   \pgfaliasshading{tocsphere.!5opaque}{tocsphereshaded}
 
   \begin{colormixin}{2!averagebackgroundcolor}
   \pgfdeclareradialshading{tocsphereshaded}{\pgfpoint{-0.5ex}{0.6ex}}%
-  {color(0cm)=(structure!35!white);
-    color(0.44ex)=(structure!75!white);
-    color(0.88ex)=(structure!70!black!90!averagebackgroundcolor);
-    color(1.2ex)=(structure!50!black!90!averagebackgroundcolor);
+  {color(0cm)=(beamerstructure!35!white);
+    color(0.44ex)=(beamerstructure!75!white);
+    color(0.88ex)=(beamerstructure!70!black!90!averagebackgroundcolor);
+    color(1.2ex)=(beamerstructure!50!black!90!averagebackgroundcolor);
     color(1.3ex)=(averagebackgroundcolor)}
   \end{colormixin}
   \pgfaliasshading{tocsphere.!2opaque}{tocsphereshaded}
     \llap{%
       \begin{pgfpicture}{-1ex}{-0.7ex}{1ex}{1ex}
         \pgfbox[center,center]{\pgfuseshading{tocsphere}}
-        \pgfbox[center,center]{\color{white!90!structure}\scriptsize\textbf{\inserttocsectionnumber}}
+        \pgfbox[center,center]{\color{white!90!beamerstructure}\scriptsize\textbf{\inserttocsectionnumber}}
       \end{pgfpicture}%
       \kern1ex}%
     \inserttocsection\par}
 {
   \usesectionheadtemplate
   {\hfill\color{white}\tiny\textbf{\insertsectionhead}}
-  {\hfill\color{white!50!structure}\tiny\textbf{\insertsectionhead}}
+  {\hfill\color{white!50!beamerstructure}\tiny\textbf{\insertsectionhead}}
 
   \usesubsectionheadtemplate
   {\color{white}\tiny\textbf{\insertsubsectionhead}}
-  {\color{white!50!structure}\tiny\textbf{\insertsubsectionhead}}
+  {\color{white!50!beamerstructure}\tiny\textbf{\insertsubsectionhead}}
 }
 
 \newcommand{\beamertemplatedarksectionheads}
   \pgfdeclareradialshading{minispherehilight}{\pgfpoint{-0.63pt}{0.77pt}}%
   {color(0cm)=(white);
     color(0.56pt)=(white);
-    color(1.12pt)=(structure!25);
-    color(1.54pt)=(structure!30!black);
+    color(1.12pt)=(beamerstructure!25);
+    color(1.54pt)=(beamerstructure!30!black);
     color(1.82pt)=(averagebackgroundcolor)}
   \pgfdeclareradialshading{minispheresemidull}{\pgfpoint{-0.63pt}{0.77pt}}%
-  {color(0cm)=(structure!15);
-    color(0.56pt)=(structure!50);
-    color(1.12pt)=(structure!70!black);
-    color(1.54pt)=(structure!50!black);
+  {color(0cm)=(beamerstructure!15);
+    color(0.56pt)=(beamerstructure!50);
+    color(1.12pt)=(beamerstructure!70!black);
+    color(1.54pt)=(beamerstructure!50!black);
     color(1.82pt)=(averagebackgroundcolor)}
   \begin{colormixin}{25!averagebackgroundcolor}
   \pgfdeclareradialshading{minispheredull}{\pgfpoint{-0.63pt}{0.77pt}}%
-  {color(0cm)=(structure!15);
-    color(0.56pt)=(structure!50);
-    color(1.12pt)=(structure!70!black);
-    color(1.54pt)=(structure!50!black);
+  {color(0cm)=(beamerstructure!15);
+    color(0.56pt)=(beamerstructure!50);
+    color(1.12pt)=(beamerstructure!70!black);
+    color(1.54pt)=(beamerstructure!50!black);
     color(1.82pt)=(averagebackgroundcolor)}
   \end{colormixin}
   \def\beamer@sphereradius{0.05cm}
 \newcommand{\beamertemplatesphereminiframeinverted}{
   \pgfdeclareradialshading{minispherehilight}{\pgfpoint{-0.63pt}{0.77pt}}%
   {color(0cm)=(white);
-    color(0.56pt)=(structure!25);
-    color(1.12pt)=(structure!30);
-    color(1.54pt)=(structure!30!black);
+    color(0.56pt)=(beamerstructure!25);
+    color(1.12pt)=(beamerstructure!30);
+    color(1.54pt)=(beamerstructure!30!black);
     color(1.82pt)=(black)}
   \pgfdeclareradialshading{minispheresemidull}{\pgfpoint{-0.63pt}{0.77pt}}%
-  {color(0cm)=(structure!15);
-    color(0.56pt)=(structure!50);
-    color(1.12pt)=(structure!70!black);
-    color(1.54pt)=(structure!50!black);
+  {color(0cm)=(beamerstructure!15);
+    color(0.56pt)=(beamerstructure!50);
+    color(1.12pt)=(beamerstructure!70!black);
+    color(1.54pt)=(beamerstructure!50!black);
     color(1.82pt)=(black)}
-  \begin{colormixin}{25!structure}
+  \begin{colormixin}{25!beamerstructure}
   \pgfdeclareradialshading{minispheredull}{\pgfpoint{-0.63pt}{0.77pt}}%
-  {color(0cm)=(structure!15);
-    color(0.56pt)=(structure!50);
-    color(1.12pt)=(structure!70!black);
-    color(1.54pt)=(structure!50!black);
+  {color(0cm)=(beamerstructure!15);
+    color(0.56pt)=(beamerstructure!50);
+    color(1.12pt)=(beamerstructure!70!black);
+    color(1.54pt)=(beamerstructure!50!black);
     color(1.82pt)=(black)}
   \end{colormixin}
   \def\beamer@sphereradius{0.05cm}
   }
   {%
     \begin{pgfpicture}{0pt}{0pt}{0.1cm}{0.1cm}
-      \color{structure!50!averagebackgroundcolor}
+      \color{beamerstructure!50!averagebackgroundcolor}
       \pgfcircle[stroke]{\pgfpoint{\beamer@sphereradius}{\beamer@sphereradius}}{\beamer@sphereradius}%
     \end{pgfpicture}%
   }
   }
   {%
     \begin{pgfpicture}{0pt}{0pt}{0.1cm}{0.1cm}
-      \color{structure!50!averagebackgroundcolor}
+      \color{beamerstructure!50!averagebackgroundcolor}
       \pgfcircle[stroke]{\pgfpoint{\beamer@sphereradius}{\beamer@sphereradius}}{\beamer@sphereradius}%
     \end{pgfpicture}%
   }
   }
   {%
     \begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
-      \color{structure!50!averagebackgroundcolor}
+      \color{beamerstructure!50!averagebackgroundcolor}
       \pgfrect[stroke]{\pgforigin}{\pgfpoint{\the\boxsize}{\the\boxsize}}
     \end{pgfpicture}%
   }
     \vrule height\boxsize width0.4pt%
   }
   {%
-    \color{structure!50!averagebackgroundcolor}%
+    \color{beamerstructure!50!averagebackgroundcolor}%
     \vrule height\boxsize width0.4pt%
   }
   {.1cm}{.05cm}}
   \beamer@dima=\beamer@tempdim\advance\beamer@dima by2.2pt
   \beamer@dimb=\beamer@tempdim\advance\beamer@dimb by4pt
   \begin{pgfpicture}{-4pt}{0pt}{\the\beamer@tempdim}{8pt}
-    \color{structure!50!averagebackgroundcolor}
+    \color{beamerstructure!50!averagebackgroundcolor}
     \pgfsetlinewidth{0.8pt}
     \pgfqmoveto{0}{0}
     \pgfqcurveto{-2.2}{0}{-4}{1.8}{-4}{4}
   \beamer@dima=\beamer@tempdim\advance\beamer@dima by2.2bp
   \beamer@dimb=\beamer@tempdim\advance\beamer@dimb by4bp
   \begin{pgfpicture}{-4bp}{0bp}{\the\beamer@tempdim}{8bp}
-    \color{structure!50!averagebackgroundcolor}
+    \color{beamerstructure!50!averagebackgroundcolor}
     \pgfsetlinewidth{0.8bp}
     \pgfqmoveto{0}{0}
     \pgfqcurveto{-2.2}{0}{-4}{1.8}{-4}{4}