Commits

Till Tantau  committed 24eaa78

*** empty log message ***

  • Participants
  • Parent commits 0ccd43a

Comments (0)

Files changed (19)

File base/beamerbasethemes.sty

   \newcommand\usetheme[2][]{\beamer@calltheme{#1}{#2}{beamertheme}}
   \newcommand\usecolortheme[2][]{\beamer@calltheme{#1}{#2}{beamercolortheme}}
   \newcommand\usefonttheme[2][]{\beamer@calltheme{#1}{#2}{beamerfonttheme}}
-  \newcommand\uselayouttheme[2][]{\beamer@calltheme{#1}{#2}{beamerlayouttheme}}
-  \newcommand\useelementtheme[2][]{\beamer@calltheme{#1}{#2}{beamerelementtheme}}
+  \newcommand\useoutertheme[2][]{\beamer@calltheme{#1}{#2}{beameroutertheme}}
+  \newcommand\useinnertheme[2][]{\beamer@calltheme{#1}{#2}{beamerinnertheme}}
 }
 
 \mode<article>
   \newcommand\usetheme[2][]{}
   \newcommand\usecolortheme[2][]{}
   \newcommand\usefonttheme[2][]{}
-  \newcommand\uselayouttheme[2][]{}
-  \newcommand\useelementtheme[2][]{}
+  \newcommand\useoutertheme[2][]{}
+  \newcommand\useinnertheme[2][]{}
 }
 
 %%% Local Variables: 

File doc/Makefile

 
 colorthemes = default crane albatross seahorse whale rose orchid sidebartab lily structure dove seagull beetle fly
 
-layoutthemes = default infolines miniframes shadow sidebar smoothbars smoothtree split tree
+outerthemes = default infolines miniframes shadow sidebar smoothbars smoothtree split tree
 
-elementthemes = default circles rectangles rounded
+innerthemes = default circles rectangles rounded
 
 all: $(doc).pdf
 
  $(themes:%=beamerugtheme%.pdf) \
  $(fontthemes:%=beamerugfonttheme%.pdf) \
  $(colorthemes:%=beamerugcolortheme%.pdf) \
- $(elementthemes:%=beamerugelementtheme%.pdf) \
- $(layoutthemes:%=beameruglayouttheme%.pdf) 
+ $(innerthemes:%=beameruginnertheme%.pdf) \
+ $(outerthemes:%=beamerugoutertheme%.pdf) 
 	pdflatex $(doc).tex
 	(egrep -q $(rerun) $(doc).log && pdflatex $(doc).tex) || true
 
 	pdflatex \\def\\themename{$(@:beamerugcolortheme%.pdf=%)}\\input beamercolorthemeexample.tex;
 	mv beamercolorthemeexample.pdf $@
 
-beamerugelementtheme%.pdf: beamerelementthemeexample.tex beamerthemeexamplebase.tex ../themes/elements/beamerelementtheme%.sty
-	pdflatex \\def\\themename{$(@:beamerugelementtheme%.pdf=%)}\\input beamerelementthemeexample.tex;
-	mv beamerelementthemeexample.pdf $@
+beameruginnertheme%.pdf: beamerinnerthemeexample.tex beamerthemeexamplebase.tex ../themes/inner/beamerinnertheme%.sty
+	pdflatex \\def\\themename{$(@:beameruginnertheme%.pdf=%)}\\input beamerinnerthemeexample.tex;
+	mv beamerinnerthemeexample.pdf $@
 
-beameruglayouttheme%.pdf: beamerlayoutthemeexample.tex beamerthemeexamplebase.tex ../themes/layout/beamerlayouttheme%.sty
-	pdflatex \\def\\themename{$(@:beameruglayouttheme%.pdf=%)}\\input beamerlayoutthemeexample.tex;
-	mv beamerlayoutthemeexample.pdf $@
+beamerugoutertheme%.pdf: beamerouterthemeexample.tex beamerthemeexamplebase.tex ../themes/outer/beameroutertheme%.sty
+	pdflatex \\def\\themename{$(@:beamerugoutertheme%.pdf=%)}\\input beamerouterthemeexample.tex;
+	mv beamerouterthemeexample.pdf $@
 
 clean:
 	rm -f *.aux *.log *.bbl *.blg *.ps *.dvi *.pdf *.toc *.out *.snm

File doc/beamercolorthemeexample.tex

   \def\themename{default}
 \fi
 
-\uselayouttheme[height=0pt]{sidebar}
+\useoutertheme[height=0pt]{sidebar}
 
 \def\albatrossname{albatross}
 \def\albatrossname{fly}

File doc/beamerelementthemeexample.tex

-\documentclass[hyperref={draft}]{beamer}
-
-% Copyright 2004 by Till Tantau <tantau@users.sourceforge.net>.
-%
-% This file can be redistributed and/or modified under
-% the terms of the GNU Public License, version 2.
-
-\ifx\themename\undefined
-  \def\themename{default}
-\fi
-
-\useelementtheme{\themename}
-
-\usecolortheme{seahorse}
-\usecolortheme{rose}
-
-\setbeamercolor*{frametitle}{parent=titlelike}
-\setbeamercolor*{author}{parent=titlelike}
-\setbeamercolor*{date}{parent=titlelike}
-\setbeamercolor*{institute}{parent=titlelike}
-
-
-\input{beamerthemeexamplebase}

File doc/beamerinnerthemeexample.tex

+\documentclass[hyperref={draft}]{beamer}
+
+% Copyright 2004 by Till Tantau <tantau@users.sourceforge.net>.
+%
+% This file can be redistributed and/or modified under
+% the terms of the GNU Public License, version 2.
+
+\ifx\themename\undefined
+  \def\themename{default}
+\fi
+
+\useinnertheme{\themename}
+
+\usecolortheme{seahorse}
+\usecolortheme{rose}
+
+\setbeamercolor*{frametitle}{parent=titlelike}
+\setbeamercolor*{author}{parent=titlelike}
+\setbeamercolor*{date}{parent=titlelike}
+\setbeamercolor*{institute}{parent=titlelike}
+
+
+\input{beamerthemeexamplebase}

File doc/beamerlayoutthemeexample.tex

-\documentclass[hyperref={draft}]{beamer}
-
-% Copyright 2004 by Till Tantau <tantau@users.sourceforge.net>.
-%
-% This file can be redistributed and/or modified under
-% the terms of the GNU Public License, version 2.
-
-\ifx\themename\undefined
-  \def\themename{default}
-\fi
-
-\uselayouttheme{\themename}
-\usecolortheme{seahorse}
-
-\input{beamerthemeexamplebase}

File doc/beamerouterthemeexample.tex

+\documentclass[hyperref={draft}]{beamer}
+
+% Copyright 2004 by Till Tantau <tantau@users.sourceforge.net>.
+%
+% This file can be redistributed and/or modified under
+% the terms of the GNU Public License, version 2.
+
+\ifx\themename\undefined
+  \def\themename{default}
+\fi
+
+\useoutertheme{\themename}
+\usecolortheme{seahorse}
+
+\input{beamerthemeexamplebase}

File doc/beamerug-color.tex

 
 In order to also show the effect of the different color themes on the
 sidebar, in the following examples the color themes are used together
-with the layout theme |sidebar|.
+with the outer theme |sidebar|.
 
 \subsubsection{Default and Special-Purpose Color Themes}
 

File doc/beamerug-customization.tex

   See |palette primary|.
 
   \templatefontcolor{palette sidebar primary}\no\yes\no
-  Similar to |palette primary|, only layout themes (should) base the
+  Similar to |palette primary|, only outer themes (should) base the
   colors of elements in the sidebar of the four sidebar palette
   colors.
 

File doc/beamerug-elements.tex

 % of the GNU Public License, version 2.
 
 
-\section{Element Themes, Layout Themes, and Templates}
+\section{Inner Themes, Outer Themes, and Templates}
 
-This section discusses the element and layout themes that are
+This section discusses the inner and outer themes that are
 available in \beamer. These themes install certain \emph{templates}
-for different aspects of a presentation. The template mechanism is
+for the different elements of a presentation. The template mechanism is 
 explained at the end of the section.
 
 Before we plunge into the details, let us agree on some terminology
-for this section. An \emph{element} is 
+for this section. In \beamer, an \emph{element} is part of a
+presentation that is potentially typeset in some special way. Examples
+of elements are frame titles, the author's name, or the footnote
+sign. The appearance of every element is governed by a \emph{template}
+for this element. Appropriate templates are installed by inner and
+outer themes, where the \emph{inner} themes only install templates for
+elements that are typically ``inside the main text,'' while \emph{outer}
+themes install templates for elements ``around the main text.'' Thus,
+from the templates's point of view, there is no real difference
+between inner and outer themes. 
 
-In \beamer, the appearance of every element of a presentation (like
-frame titles, the author's name, the footnote sign, or whatever else
-you can think of) governed by a \emph{template} for this
-element. Appropriate templates are installed by element and layout
-themes. Element and layout themes both install element
-templates---element themes install templates for elements
-``inside the main text'' while layout themes install template for
-elements ``around the main text.'' Thus, from the templates's point of
-view, there is no real difference between element and layout themes.
 
 
+\subsection{Inner Themes}
 
-\subsection{Element Themes}
-
-An element theme installs templates that dictate how the following
-``elements'' are typeset:
+An inner theme installs templates that dictate how the following
+elements are typeset:
 \begin{itemize}
 \item Title and part pages.
 \item Itemize environments.
 elements the honour them in the default theme. In the default color
 theme, all of the large rectangular areas are transparent.
 
-\begin{elementthemeexample}{default}
+\begin{innerthemeexample}{default}
   The default element theme is quite sober. The only extravagance is
   the fact that a little trianlge is used in |itemize| environments
   instead of the usual dot.
   \item Block environments, both for the title and for the body.
   \end{itemize}
   This list may increase in the future.
-\end{elementthemeexample}
+\end{innerthemeexample}
 
-\begin{elementthemeexample}{circles}
+\begin{innerthemeexample}{circles}
   In this theme, |itemize| and |enumerate| items start with a small
   circle. Likewise, entries in the table of contents start with
   circles. 
-\end{elementthemeexample}
+\end{innerthemeexample}
 
-\begin{elementthemeexample}{rectangles}
+\begin{innerthemeexample}{rectangles}
   In this theme, |itemize| and |enumerate| items and table of contents
   entries  start with small rectangles. 
-\end{elementthemeexample}
+\end{innerthemeexample}
 
-\begin{elementthemeexample}[\oarg{options}]{rounded}
+\begin{innerthemeexample}[\oarg{options}]{rounded}
   In this theme, |itemize| and |enumerate| items and table of contents
   entries start with small balls. If a background is specified for
   blocks, then the corners of the background rectangles will be
   \begin{itemize}
   \item \declare{|shadow|} adds a shadow to all blocks.
   \end{itemize}
-\end{elementthemeexample}
+\end{innerthemeexample}
 
 
 
 
-\subsection{Layout Themes}
+\subsection{Outer Themes}
 
-A layout theme dictates (roughly) the overall layout of frames. It
+An outer theme dictates (roughly) the overall layout of frames. It
 specifies where any navigational elements should go (like a mini table
 of contents or navigational mini frames) and what they should look
-like. Typically, a layout theme specifies how the following parts of a
-frame are rendered:
+like. Typically, an outer theme specifies how the following elements
+are rendered: 
 \begin{itemize}
 \item The head- and footline.
 \item The sidebars.
 \item The frame title.  
 \end{itemize}
 
-A layout theme will not specify how things like |itemize| environments
-should be rendered---that is the job an element theme.
+An outer theme will not specify how things like |itemize| environments
+should be rendered---that is the job an inner theme.
 
 In the following examples the color theme |seahorse| is
 used. Since the default color theme leaves most backgrounds empty,
-most of the layout themes will look too unstructured with the default
+most of the outer themes look too unstructured with the default
 color theme. 
 
 
-\begin{layoutthemeexample}{default}
+\begin{outerthemeexample}{default}
   The default layout theme is the most sober and minimalistic theme
   around. It will flush left the frame title and it will not install
   any head- or footlines. However, even this theme honours the
   background color specified for the frame title. If a color is
   specified, a bar occupying the whole page width is put behind the
   frame title. A background color the frame subtitle is ignored.
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}{infolines}
+\begin{outerthemeexample}{infolines}
   This theme installs a headline showing the current section and the
   current subsection. It installs a footline showing the author's
   name, the institution, the presentation's title, the current date,
   The colors used in the headline and footline are drawn from
   |palette primary|, |palette secondary|, and |primary ternary| (see
   Section~\ref{section-colors} for details on how to change these).
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}[\oarg{options}]{miniframes}
+\begin{outerthemeexample}[\oarg{options}]{miniframes}
   This theme installs a headline in which a horizontal navigational
   bar is shown. This bar contains one entry for each section of the
   presentation. Below each section entry, small circles are shown that
     line showing the subsection in the headline. It is shown by
     default.
   \end{itemize}  
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}[\oarg{options}]{smoothbars}
+\begin{outerthemeexample}[\oarg{options}]{smoothbars}
   This theme behaves very much like the |miniframes| theme, at least
   with respect to the headline. There, the only difference is the
   smooth transitions are installed between the background colors of
     line showing the subsection in the headline. It is shown by
     default.
   \end{itemize}  
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}[\oarg{options}]{sidebar}
+\begin{outerthemeexample}[\oarg{options}]{sidebar}
   In this layout, a sidebar is shown that contains a small table of
   contents with the current section or subsection is hilighted. The
   frame title is vertically centered in a rectangular area at the top
     sidebar. If it is set to 0pt, it is completely supressed. The
     default is 2.5 base line heights of the frame title font.
   \end{itemize}
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}{split}
+\begin{outerthemeexample}{split}
   This theme installs a headline in which, on the left, the sections
   of the talk are shown and, on the right, the subsections of the
   current section. If the class option |compress| has been given,
   the right.
 
   The colors are taken from |palette primary| and |palette fourth|.
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}{shadow}
+\begin{outerthemeexample}{shadow}
   This layout theme extends the |split| theme by putting a horizontal
   shading behind the frame title and adding a little ``shadow'' at the
   bottom of the headline.
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}[\oarg{options}]{tree}
+\begin{outerthemeexample}[\oarg{options}]{tree}
   In this layout, the headline contains three lines that show the
   title of the current talk, the current section in this talk, and the
   current subsection in the section. The colors are drawn from
     the section and subsection entries. These are supposed to increase
     the tree-like appearance. 
   \end{itemize}
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
-\begin{layoutthemeexample}{smoothtree}
+\begin{outerthemeexample}{smoothtree}
   This layout is similar to the |tree| layout. The main difference is
   that the background colors change smoothly.
-\end{layoutthemeexample}
+\end{outerthemeexample}
 
 
 
 
 \subsubsection{Overview of Beamer's Template Management}
 
-If you only wish to modify a single or few elements, you do not need
-to create a whole new theme. Instead, you can modify an appropriate
-template. 
+If you only wish to modify the appearance of a single or few elements,
+you do not need to create a whole new inner or outer theme. Instead,
+you can modify the appropriate template. 
 
 A template specifies how an element of a presentation is typeset. For 
 example, the |frametitle| template dictates where the frame title is
 
 
 
+
+
+
 In the following subsections all commands for changing templates are
 listed, like the above-mentioned command
 |\useframetitletemplate|. Inside these commands, you should use

File doc/beamerug-frames.tex

       the frame title is more in the middle of the frame.
       
       \itemoption{shadow theme}{}
-      This option is available if the layout theme |shadow| is
+      This option is available if the outer theme |shadow| is
       loaded. It draws the frame title on top of a horizontal shading
       between the background colors of |frametitle| and
       |frametitle right|. A subtitle is, if present, also put on this
       bar. Below the bar, a ``shadow'' is drawn.
       
       \itemoption{sidebar theme}{}
-      This option is available if the layout theme |sidebar| is loaded
+      This option is available if the outer theme |sidebar| is loaded
       and if the headline height is not set to 0pt (which can be done
       using and option of the |sidebar| theme). With this option, the
       frame title is put inside a rectangular area that is part of the
       used, this is the job of the headline template in this case.
 
       \itemoption{smoothbars theme}{}
-      This option is available if the layout theme |smoothbars| is
+      This option is available if the outer theme |smoothbars| is
       loaded. It typesets the frametitle on a colored bar with the
       background color of |frametitle|. The top and bottom of the bar
       smoothly blend over to backgrounds above and below.

File doc/beamerug-macros.tex

     \example\genericthemeexample{theme#2}
   }
 {\end{theme}}
-\newenvironment{elementthemeexample}[2][]
-{\begin{theme}{useelementtheme}{{#2}#1}
-    \example\genericthemeexample{elementtheme#2}
+\newenvironment{innerthemeexample}[2][]
+{\begin{theme}{useinnertheme}{{#2}#1}
+    \example\genericthemeexample{innertheme#2}
   }
 {\end{theme}}
-\newenvironment{layoutthemeexample}[2][]
-{\begin{theme}{uselayouttheme}{{#2}#1}
-    \example\genericthemeexample{layouttheme#2}
+\newenvironment{outerthemeexample}[2][]
+{\begin{theme}{useoutertheme}{{#2}#1}
+    \example\genericthemeexample{outertheme#2}
   }
 {\end{theme}}
 \newenvironment{colorthemeexample}[2][]

File doc/beamerug-themes.tex

   a presentation theme, your presentation will look they way someone
   (the creator of the theme) thought that a presentation should look
   like. Presentation themes typically only choose a particular color
-  theme, font theme, element theme, and layout theme that go well
+  theme, font theme, inner theme, and outer theme that go well
   together. 
 \item[Color Themes]
   A color theme only dictates which colors are used in a
   A font theme dictates which fonts or font attributes are used in a
   presentation. As for colors, the font of all text elements used in a
   presentation can be specified independently.
-\item[Element Themes]
-  An element theme specifies how certain ``elements'' of a
-  presentation are typeset. ``Elements'' refers to everything that needs to
-  be typeset and that is not part of the headlines, footlines, and
-  sidebars. This includes all enumerations, itemize environments,
-  block environments, theorem environments, or the table of
-  contents. For example, an element theme might
+\item[Inner Themes]
+  An inner theme specifies how certain elements of a
+  presentation are typeset. This includes all elements that are at the
+  ``inside'' the frame, that is, that are not part of the headline,
+  footline, or sidebars. This includes all enumerations, itemize
+  environments, block environments, theorem environments, or the table of
+  contents. For example, an inner theme might
   specify that in an enumeration the number should be typeset without
-  a dot and that a small circle should be shown behind it. The element
+  a dot and that a small circle should be shown behind it. The inner
   theme would \emph{not} specify what color should be used for the
   number or the circle (this is the job of the color theme) nor which font
   should be used (this is the job of the font theme).
-\item[Layout Themes]
-  A layout theme specifies what the layout of the presentation slides
-  should look like. It specifies whether there are head- and
-  footlines, what is shown in them, whether there is a sidebar, where
-  the logo goes, where the navigation symbols and bars go, and so
-  on. It also specifies where the frametitle is put and how it is
-  typeset. 
+\item[Outer Themes]
+  An outer theme specifies what the ``outside'' or ``border'' of the
+  presentation slides should look like. It specifies whether there are
+  head- and footlines, what is shown in them, whether there is a
+  sidebar, where the logo goes, where the navigation symbols and bars
+  go, and so on. It also specifies where the frametitle is put and how
+  it is typeset. 
 \end{description}
 
 The different themes reside in the four subdirectories |theme|, |color|,
-|font|, |elements|, and |layout| of the directory
+|font|, |inner|, and |outer| of the directory
 |beamer/themes|. Internally, a theme is stored as a normal style
 file. However, to use a theme, the following special commands should
 be used:
   are named |beamerfonttheme|\meta{name}|.sty|.
 \end{command}
 
-\begin{command}{\useelementtheme\oarg{options}\marg{name}}
-  Same as |\usetheme|, only for element themes. Element style files
-  are named |beamerelementtheme|\meta{name}|.sty|.
+\begin{command}{\useinnertheme\oarg{options}\marg{name}}
+  Same as |\usetheme|, only for inner themes. Inner style files
+  are named |beamerinnertheme|\meta{name}|.sty|.
 \end{command}
 
-\begin{command}{\uselayouttheme\oarg{options}\marg{name}}
-  Same as |\usetheme|, only for layout themes. Layout style files
-  are named |beamerlayouttheme|\meta{name}|.sty|.
+\begin{command}{\useoutertheme\oarg{options}\marg{name}}
+  Same as |\usetheme|, only for outer themes. Outer style files
+  are named |beameroutertheme|\meta{name}|.sty|.
 \end{command}
 
 If you do not use any of these commands, a sober \emph{default} theme
 Earlier versions of \beamer\ included some further themes. These
 themes are still available for compatibility, though they are now
 implemented differently (they also mainly install appropriate color,
-font, element, and layout themes). However, they may or may not honour
+font, inner, and outer themes). However, they may or may not honour
 color themes and they will not be supported in the future. The
 following list shows which of the new themes should be used instead of
 the old themes. (When switching, you may want to use the font theme

File themes/theme/compatibility/beamerthemebars.sty

 \mode<presentation>
 
 \usefonttheme[onlysmall]{structurebold}
-\uselayouttheme[footline=authorinstitutetitle]{miniframes}
+\useoutertheme[footline=authorinstitutetitle]{miniframes}
 \usecolortheme{whale}
 
 

File themes/theme/compatibility/beamerthemecompatibility.sty

 \usefonttheme[onlysmall]{structurebold}
 \setbeamerfont{frametitle}{series=\bfseries}
 
-\uselayouttheme[subsection=false]{miniframes}
+\useoutertheme[subsection=false]{miniframes}
 \addtoheadtemplate{}{%
   \begin{beamercolorbox}[wd=\paperwidth,colsep=0.2pt]{fine separation line}
   \end{beamercolorbox}%

File themes/theme/compatibility/beamerthemeshadow.sty

 \useinnertheme[shadow=true]{rounded}
 \usecolortheme{orchid}
 \usecolortheme{whale}
-\uselayouttheme{shadow}
+\useoutertheme{shadow}
 \usefonttheme[onlysmall]{structurebold}
 
 \setbeamercolor{title}{use=structure,fg=white,bg=structure.fg}

File themes/theme/compatibility/beamerthemesidebar.sty

 \beamer@sidebartabfalse
 \beamer@sidebardarkfalse
 
-\PassOptionsToPackage{width=2.5cm}{beamerlayoutthemesidebar}
+\PassOptionsToPackage{width=2.5cm}{beamerouterthemesidebar}
 
-\DeclareOptionBeamer{width}{\PassOptionsToPackage{width=#1}{beamerlayoutthemesidebar}}
+\DeclareOptionBeamer{width}{\PassOptionsToPackage{width=#1}{beamerouterthemesidebar}}
 \DeclareOptionBeamer{tab}[true]{\csname beamer@sidebartab#1\endcsname}
 \DeclareOptionBeamer{dark}[true]{\csname beamer@sidebardark#1\endcsname}
 
   \usecolortheme{sidebartab}
 \fi
 
-\uselayouttheme[right,height=0pt]{sidebar}
+\useoutertheme[right,height=0pt]{sidebar}
 
 \mode
 <all>

File themes/theme/compatibility/beamerthemesplit.sty

 \mode<presentation>
 
 \usecolortheme{whale}
-\uselayouttheme{split}
+\useoutertheme{split}
 \usefonttheme[onlysmall]{structurebold}
 
 \mode

File themes/theme/compatibility/beamerthemetree.sty

 
 \usefonttheme[onlysmall]{structurebold}
 \beamer@theme@col
-\uselayouttheme{tree}
+\useoutertheme{tree}
 
 \mode
 <all>