Commits

Till Tantau  committed 76e949f

*** empty log message ***

  • Participants
  • Parent commits a3a89bd

Comments (0)

Files changed (15)

  8) Make beamer compatible with bibentry.
  9) Make beamer compatible with caption package.
 10) Make beamer compatible with acrotex.
+11) Perhaps add the option of creating "slide labels" for overlay
+    specs.
+12) Add options for absolute and relative positioning the logo.

File base/beamerbaseframecomponents.sty

 %
 %
 
+\def\@makefnmark{\hbox{\@textsuperscript{{\usebeamercolor[fg]{footnote mark}\usebeamerfont*{footnote mark}\@thefnmark}}}}
+
 \def\@makefntext#1{%
   \def\insertfootnotetext{#1}%
   \def\insertfootnotemark{\@makefnmark}%
-  \footnotetemplate}
-\def\usefootnotetemplate#1{%
-  \def\footnotetemplate{#1}}
+  \usebeamertemplate***{footnote}}
+\def\usefootnotetemplate{\setbeamertemplate{footnote}}
 
-\usefootnotetemplate{
-  \parindent 1em\noindent%
-  \hbox to 1.8em{\hfil\insertfootnotemark}\insertfootnotetext}
 
 \newbox\beamer@footins
 

File base/beamerbaseframesize.sty

       \ifvoid\beamer@splitbox%
         \ifvoid\beamer@footins%
         \else%
-          \normalcolor%
+          \usebeamercolor*[fg]{footnote}%
           \footnoterule%
           \unvbox \beamer@footins%
           \global\setbox\beamer@footins=\box\voidb@x%
       \vskip\beamer@framebottomskip%
       \ifvoid\beamer@footins%
       \else%
-        \normalcolor%
+        \usebeamercolor*[fg]{footnote}%
         \footnoterule%
         \unvbox \beamer@footins%
         \global\setbox\beamer@footins=\box\voidb@x%

File base/beamerbasetemplates.sty

 \def\beamer@usebeamertemplatedoss#1{{{\usebeamerfont*{#1}\usebeamercolor[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
 \def\beamer@usebeamertemplatedosss#1{{{\usebeamerfont*{#1}\usebeamercolor*[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
 
+\long\def\beamer@@empty{}
+\def\expandbeamertemplate#1{\csname beamer@@tmpl@#1\endcsname}
+\def\ifbeamertemplateempty#1#2#3{%
+  \def\beamer@ifdo{#3}%
+  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\relax\def\beamer@ifdo{#2}\fi%
+  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\beamer@@empty\def\beamer@ifdo{#2}\fi%
+  \beamer@ifdo}
+
 
 \mode<article>
 {

File base/beamerbasetitle.sty

 % The \logo command
 %
 %
-\long\def\logo#1{\def\insertlogo{#1}}
-\logo{}
+\def\logo{\setbeamertemplate{logo}}
+\def\insertlogo{\usebeamertemplate*{logo}}
+
 
 \mode
 <article>

File doc/beamerug-color.tex

 
 
 
-
+  
 \subsection{The Color of Mathematical Text}
 
 By default, mathematical text does not have any special color---it
 
 
 
+\subsection{Miscellaneous  Colors}
+
+In this section some ``basic'' colors are listed that do not
+``belong'' to any special commands. 
+
+\begin{element}{normal text}\no\yes\yes
+  The color is used for normal text. At the beginning of
+  the document the foreground color is installed as
+  |\normalcolor|. The background of this color is used by the
+  default background canvas for the background of the
+  presentation, see Section~\ref{section-canvas}. The background is
+  also the default value of the normal color |bg|. 
+
+  Since the color is the ``root'' of all other \beamer-colors, both a
+  foreground and a background must be installed. In particular, to get
+  a transparent background canvas, make the background of the
+  \beamer-color |background canvas| empty, not the background of this
+  color.
+
+  The \beamer-font currently is not used. In particular, redefining this
+  font will not have any effect. This is likely to change in the future.
+\end{element}
+
+\begin{element}{example text}\no\yes\yes
+  The color/font is used when text is typeset inside an |example|
+  block. 
+\end{element}
+
+\begin{element}{titlelike}\no\yes\yes
+  This color/font is a more specialized form of the |structure|
+  color/font. It is the base for all elements that are ``like
+  titles.'' This includes the frame title and subtitle as well as the
+  document title and subtitle.
+\end{element}
+
+\begin{element}{separation line}\no\yes\no
+  The foreground of this color is used for separating lines. If the
+  foreground is empty, no separation line is drawn.
+\end{element}
+
+\begin{element}{upper separation line head}\no\yes\no
+  \colorparents{separation line}
+  Special case for the uppermost separation line in a headline.
+\end{element}
+
+\begin{element}{middle separation line head}\no\yes\no
+  \colorparents{separation line}
+  Special case for the middle separation line in a headline.
+\end{element}
+
+\begin{element}{lower separation line head}\no\yes\no
+  \colorparents{separation line}
+  Special case for the lower separation line in a headline.
+\end{element}
+
+\begin{element}{upper separation line foot}\no\yes\no
+  \colorparents{separation line}
+  Special case for the uppermost separation line in a footline.
+\end{element}
+
+\begin{element}{middle separation line foot}\no\yes\no
+  \colorparents{separation line}
+  Special case for the middle separation line in a footline.
+\end{element}
+
+\begin{element}{lower separation line foot}\no\yes\no
+  \colorparents{separation line}
+  Special case for the lower separation line in a footline.
+\end{element}
+
+
 
 
 \subsection{Transparency Effects}

File doc/beamerug-customization.tex

 \label{section-customization}
 
 
-\subsection{Introduction to Templates}
-
-
-
-\subsection{Default Templates, Fonts, and Colors}
-
-\label{section-color-listing}
-
-In this section all templates, colors, and fonts that are used by the
-default \beamer\ themes are listed in alphabetical order. 
-
-\begin{itemize}
-
-  \templatefontcolor{example text}\no\yes\yes
-  The color/font is used when text is typeset inside an |example|
-  block. 
- 
-  \templatefontcolor{normal text}\no\yes\yes
-  \colornote
-  The color is used for normal text. At the beginning of
-  the document the foreground color is installed as
-  |\normalcolor|. The background of this color is used by the
-  default background canvas for the background of the
-  presentation, see Section~\ref{section-canvas}. The background is
-  also the default value of the normal color |bg|. 
-
-  Since the color is the ``root'' of all other \beamer-colors, both a
-  foreground and a background must be installed. In particular, to get
-  a transparent background canvas, make the background of the
-  \beamer-color |background canvas| empty, not the background of this
-  color.
-
-  \fontnote
-  This font is not used, currently. In particular, redefining this
-  font will not have any effect. This may change in the future.
-
-  \templatefontcolor{titlelike}\no\yes\yes
-  This color/font is a more specialized form of the |structure|
-  color/font. It is the base for all elements that are ``like
-  titles.'' This includes the frame title and subtitle as well as the
-  document title and subtitle.
-\end{itemize}
-
 
 
 %% \subsection{Title Page}
 
 
 
-\subsection{Footnotes}
+%% \subsection{Footnotes}
 
-\label{section-templates-footnotes}
+%% \label{section-templates-footnotes}
 
-\paragraph{Template Installation Commands}\
+%% \paragraph{Template Installation Commands}\
 
-\begin{command}{\usefootnotetemplate\marg{footnote template}}
-  \example
-\begin{verbatim}
-\usefootnotetemplate{
-  \parindent 1em
-  \noindent
-  \hbox to 1.8em{\hfil\insertfootnotemark}\insertfootnotetext}
-\end{verbatim}
-\end{command}
+%% \begin{command}{\usefootnotetemplate\marg{footnote template}}
+%%   \example
+%% \begin{verbatim}
+%% \usefootnotetemplate{
+%%   \parindent 1em
+%%   \noindent
+%%   \hbox to 1.8em{\hfil\insertfootnotemark}\insertfootnotetext}
+%% \end{verbatim}
+%% \end{command}
 
 
-\paragraph{Inserts for these Templates}\
+%% \paragraph{Inserts for these Templates}\
 
-\begin{command}{\insertfootnotemark}
-  Inserts the current footnote mark (like a raised number) into a
-  template. 
-\end{command}
+%% \begin{command}{\insertfootnotemark}
+%%   Inserts the current footnote mark (like a raised number) into a
+%%   template. 
+%% \end{command}
 
-\begin{command}{\insertfootnotetext}
-  Inserts the current footnote text into a template. 
-\end{command}
+%% \begin{command}{\insertfootnotetext}
+%%   Inserts the current footnote text into a template. 
+%% \end{command}
 
 
 

File doc/beamerug-elements.tex

   version is the ``most protected'' version avialable.
 \end{command}
 
+\begin{command}{\ifbeamertemplateempty\marg{beamer template
+      name}\marg{executed if empty}\marg{executed otherwise}}
+  This command checks whether a template is defined and set to a    
+  non-empty text. If the text is empty or the template is not
+  defined at all, \meta{executed if empty} is executed. Otherwise,
+  \meta{executed otherwise} is executed. 
+\end{command}
 
+\begin{command}{\expandbeamertemplate\marg{beamer template name}}
+  This command does the same as |\usebeamertemplate|\marg{beamer
+    template name}. The difference is that this command performs a
+  direct expansion and does not scan for a star. This is important
+  inside, for example, an |\edef|. If you don't know the difference
+  between |\def| and |\edef|, you won't need this command.
+\end{command}
 
 \subsubsection{Setting Beamer's Templates}
 

File doc/beamerug-frames.tex

 
   Inside the template numerous inserts can be used:
   \begin{itemize}
-    \iteminsert{\insertlogo}
-    Inserts the logo(s) into a template.
-
     \iteminsert{\insertnavigation\marg{width}}
     Inserts a horizontal navigation bar of the given \meta{width} into a
     template. The bar lists the sections and below them mini frames for
 
 \subsubsection{The Logo}
 
-To install
-a logo, use the following command:
+To install a logo, use the following command:
 
 \begin{command}{\logo\marg{logo text}}
-  The \meta{logo text} is usually a command for including a
-  graphic.
+  The \meta{logo text} is usually a command for including a graphic,
+  but it can be any text. The position where the logo is inserted is
+  determined by the current theme, you cannot (currently) specify this
+  position directly.
+  
   \example
 \begin{verbatim}
 \pgfdeclareimage[height=0.5cm]{logo}{tu-logo}
 \logo{\pgfuseimage{logo}}
 \end{verbatim}
 
+  \example
+\begin{verbatim}
+\logo{\includegraphics[height=0.5cm]{logo.pdf}}
+\end{verbatim}
+
+  Currently, the effect of this command is just to setup the |logo|
+  template. However, a more sophisticated effect might be implemented
+  in the future.
+  
   \articlenote This command has no effect.
+
+  \begin{element}{logo}\yes\yes\yes
+    This template is used to render the logo.
+  \end{element}
+
+  The following insert can be used to insert a logo somewhere:
+  \begin{itemize}
+    \iteminsert{\insertlogo}
+    inserts the logo at the current position. This command has the
+    same effect as |\usebeamertemplate*{logo}|.
+  \end{itemize}
 \end{command}
 
 

File doc/beamerug-localstructure.tex

   \example |\footnote{On a fast machine.}|
   \example |\footnote[frame,2]{Not proved.}|
   \example |\footnote<.->{Der Spiegel, 4/04, S.\ 90.}|
+
+  \begin{element}{footnote}\yes\yes\yes
+    This template will be used to render the footnote. Inside this
+    template, the following two inserts can be used:
+    \begin{itemize}
+    \item{\insertfootnotetext}
+      Inserts the current footnote text.
+    \item{\insertfootnotemark}
+      Inserts the current footnote mark (like a raised number). This mark
+      is computed automatically.
+    \end{itemize}
+  \end{element}
+
+  \begin{element}{footnote mark}\no\yes\yes
+    This \beamer-color/-font is used when rendering the footnote mark,
+    both in the text and at the beginning of the footnote itself.
+  \end{element}
 \end{command}
 
-You can change the way footnotes are typeset by changing the footnote
-templates, see Section~\ref{section-templates-footnotes}
-
 
 %%% Local Variables: 
 %%% mode: latex

File doc/beamerug-tutorial.tex

 
 
 
-\subsection{Changing the Way Things Look}
+\subsection{Changing the Way Things Look I: Theming}
 
 With the contents of this talk fixed, Euclid decides to have a second
 look at the way things look. He goes back to the beginning and finds
 \end{verbatim}
 
 
+\subsection{Changing the Way Things Look II: Colors and Fonts}
+
+Since Euclid wants to give a \emph{perfect} talk, he decides that the
+font used for the title simply has to be a serif italics. To change
+only the font used for the title, Euclid uses the following command:
+\begin{verbatim}
+\setbeamerfont{title}{shape=\itshape,family=\rmfamily}
+\end{verbatim}
+He notices that the font is still quite large (which he likes), but
+wonders why this is the case since he did not specify this. The reason
+is that calls of |\setbeamerfont| accumulate and the size was already
+set to |\large| by some font theme. Using the starred version of
+|\setbeamerfont| ``resets'' the font.
+
+Euclid decides that he would also like to change the color of the
+title to a dashing red, though, perhaps, with a bit of black added. He
+uses the following command:
+\begin{verbatim}
+\setbeamercolor{title}{fg=red!80!black}
+\end{verbatim}
+Trying the following command, Euclid is delighted to find that
+specifying a background color also has an effect:
+\begin{verbatim}
+\setbeamercolor{title}{fg=red!80!black,bg=red!20!white}
+\end{verbatim}
+
+
 Finally, Euclid is satisfied with the presentation and goes ahead and
 gives a great talk at the conference, making many new friends. He also
 writes that email to \beamer's author containing that long list of

File themes/color/beamercolorthemedefault.sty

 \setbeamercolor{lower separation line head}{parent=separation line}
 
 \setbeamercolor{upper separation line foot}{parent=separation line}
+\setbeamercolor{middle separation line foot}{parent=separation line}
 \setbeamercolor{lower separation line foot}{parent=separation line}
 
 \setbeamercolor{abstract}{}

File themes/inner/beamerinnerthemedefault.sty

 {\endbeamercolorbox}
 
 
+% Footnotes
+
+\defbeamertemplate*{footnote}{default}
+{
+  \parindent 1em\noindent%
+  \raggedright
+  \hbox to 1.8em{\hfil\insertfootnotemark}\insertfootnotetext\par%
+}
+
+
 \beamertemplatedefaultblocks
 
                                 % Theorems

File themes/outer/beamerouterthememiniframes.sty

 {%
   \begin{beamercolorbox}[colsep=1.5pt]{upper separation line head}
   \end{beamercolorbox}
-  \begin{beamercolorbox}[wd=\paperwidth]{section in head/foot}
+  \begin{beamercolorbox}{section in head/foot}
     \vskip2pt\insertnavigation{\paperwidth}\vskip2pt
   \end{beamercolorbox}%
   \ifbeamer@theme@subsection%

File themes/theme/compatibility/beamerthemelined.sty

 
 \mode<presentation>
 
-\useheadtemplate{%
+\setbeamertemplate{headline}[text line]
+{%
   \vbox{%
     \vskip3pt%
     \beamerline{\insertnavigation{\paperwidth}}%
     \vskip1.5pt%
     \tinyline{\color{beamerstructure}\insertsubsection\hfill}
     \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
-    }%
-  }
+  }%
+}
 
                                 % Footline
-\usefoottemplate{%
-  \vbox{%
-    \setbox\beamer@tempbox=\hbox{\tiny\insertshortauthor: \insertshorttitle\hskip1.5cm\insertshortinstitute}%
-    \ifdim\wd\beamer@tempbox>\paperwidth%
-    \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
-    \vskip1.5pt
-    \tinyline{\color{beamerstructure}\insertshortauthor:\hfill\insertshortinstitute}%
-    \tinyline{\color{beamerstructure}\insertshorttitle\hfill\lower1pt\hbox{\insertnavigationsymbols}}%
-    \else%
-    \setbox\beamer@tempbox=\hbox{\beamerline{\hbox to\paperwidth{\hfill\lower1pt\hbox{\insertnavigationsymbols}}}}%
-    \ht\beamer@tempbox=0pt%
-    \box\beamer@tempbox%
-    \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
-    \vskip1.5pt
-    \tinyline{\color{beamerstructure}\insertshortauthor: \insertshorttitle\hfill\insertshortinstitute}%
-    \fi}%
+\setbeamertemplate{footline}[text line]
+{%
+  \ifbeamertemplateempty{logo}
+  {%
+    \vbox{%
+      \setbox\beamer@tempbox=\hbox{\tiny\insertshortauthor: \insertshorttitle\hskip1.5cm\insertshortinstitute}%
+      \ifdim\wd\beamer@tempbox>\paperwidth%
+        \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
+        \vskip1.5pt
+        \tinyline{\color{beamerstructure}\insertshortauthor:\hfill\insertshortinstitute}%
+        \tinyline{\color{beamerstructure}\insertshorttitle\hfill\lower1pt\hbox{\insertnavigationsymbols}}%
+      \else%
+        \setbox\beamer@tempbox=\hbox{\beamerline{\hbox to\paperwidth{\hfill\lower1pt\hbox{\insertnavigationsymbols}}}}%
+        \ht\beamer@tempbox=0pt%
+        \box\beamer@tempbox%
+        \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
+        \vskip1.5pt
+        \tinyline{\color{beamerstructure}\insertshortauthor: \insertshorttitle\hfill\insertshortinstitute}%
+      \fi}%
   }
-
-\def\logo#1{%
-  \def\insertlogo{#1}%
-  \usefoottemplate{%
+  {%
     \vbox{%
       \insertvrule{4pt}{beamerstructure!50!averagebackgroundcolor}%
       \vskip1.5pt%
-      \setbox\beamer@logobox=\hbox{\lower1pt\hbox{\insertlogo}}%
+      \setbox\beamer@logobox=\hbox{\lower1pt\hbox{\usebeamertemplate*{logo}}}%
       \tinyline{\color{beamerstructure}\insertshortauthor:\hfill}%
       \tinyline{\color{beamerstructure}\insertshorttitle\hfill\lower1pt\hbox{\insertnavigationsymbols}\hskip0.1cm\hbox{\dp\beamer@logobox=0pt\ht\beamer@logobox=0pt\box\beamer@logobox}
-        }%
       }%
     }%
-  }
+  }%
+}