Commits

Anonymous committed 9e56e49

*** empty log message ***

Comments (0)

Files changed (7)

base/beamerbaseauxtemplates.sty

 % Headline stuff
 %
 
-\newcommand{\beamertemplatedefaultsectionheads}
-{
-  \usesectionheadtemplate{\insertsectionhead}{\color{fg!50!bg}\insertsectionhead}
-  \usesubsectionheadtemplate{\insertsubsectionhead}{\color{fg!50!bg}\insertsubsectionhead}
-}
 
 
 \newcommand{\beamertemplatecircleminiframe}{

base/beamerbasecompatibility.sty

 \def\beamer@usefoots{\setbeamertemplate{footline}}
 \def\usecaptiontemplate{\setbeamertemplate{caption}}
 \def\insertblockname{\insertblocktitle}
+\long\def\usesectionheadtemplate#1#2{%
+  \setbeamertemplate{section in head/foot}{#1}%
+  \setbeamertemplate{section in head/foot shaded}{#2}}
+\long\def\usesubsectionheadtemplate#1#2{%
+  \setbeamertemplate{subsection in head/foot}{#1}%
+  \setbeamertemplate{subsection in head/foot shaded}{#2}}
 \newcommand\usetheoremtemplate[2]{%
   \setbeamertemplate{theorem begin}{#1}
   \setbeamertemplate{theorem end}{#2}}
 \def\beamertemplatenavigationsymbolsframe{\setbeamertemplate{navigation symbols}[only frame symbol]}
 \def\beamertemplatenavigationsymbolsvertical{\setbeamertemplate{navigation symbols}[vertical]}
 \def\beamertemplatenavigationsymbolshorizontal{\setbeamertemplate{navigation symbols}[horizontal]}
+\def\beamertemplatedefaultsectionheads{%
+  \setbeamertemplate{section in head/foot}[default]
+  \setbeamertemplate{subsection in head/foot}[default]
+  \setbeamertemplate{section in head/foot shaded}[default]
+  \setbeamertemplate{subsection in head/foot shaded}[default]
+}
 
 
 

base/beamerbasenavigation.sty

 %
 
 \def\insertnavigation#1{%
-  \vbox{%
+  \vbox{{%
     \usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
     \beamer@xpos=0\relax%
     \beamer@ypos=1\relax%
       \dp\beamer@sectionbox=0.75ex%
         \hskip-1.875ex plus-1fill\dohead%
       \box\beamer@sectionbox\hfil\hskip.3cm}%
-  }}
+  }}}
 
 \def\sectionentry#1#2#3#4#5{% section number, section title, page
   \ifnum#5=\c@part%
   \hbox{\def\insertsectionhead{#2}%
     \def\insertsectionheadnumber{#1}%
     \def\insertpartheadnumber{#5}%
-    \ifnum\c@section=#1%
-    \usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
-    \hyperlink{Navigation#3}{\beamer@sectionheadhilight}\else%
-    \hyperlink{Navigation#3}{\beamer@sectionheadnohilight}\fi}%
+    {%
+      \usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
+      \ifnum\c@section=#1%
+        \hyperlink{Navigation#3}{{\usebeamertemplate{section in head/foot}}}%
+      \else%
+        \hyperlink{Navigation#3}{{\usebeamertemplate{section in head/foot shaded}}}%
+      \fi}%
+  }%
   \ht\beamer@sectionbox=1.875ex%
   \dp\beamer@sectionbox=0.75ex%
   \fi\ignorespaces}
 
-\def\usesectionheadtemplate#1#2{\gdef\beamer@sectionheadhilight{#1}\gdef\beamer@sectionheadnohilight{#2}}
 \def\usesectionsidetemplate#1#2{\gdef\beamer@sectionsidehilight{#1}\gdef\beamer@sectionsidenohilight{#2}}
 
 \def\beamer@nav@subsectionstyle#1{\beamer@toc@sprocess\beamer@nav@css\beamer@nav@oss\beamer@nav@ooss#1///}
       \def\insertsectionhead{##2}%
       \def\insertsectionheadnumber{##1}%
       \def\insertpartheadnumber{##5}%
-      \hbox{%
+      \hbox{{%
         \usebeamerfont{section in sidebar}\usebeamercolor[fg]{section in sidebar}%
           \hyperlink{Navigation##3}{%
           \ifnum\c@section=##1%
             \fi%
           \else
             {\beamer@sectionsidenohilight}%
-          \fi}}%
+          \fi}}}%
       \beamer@currentsubsection=0\relax\fi}%
     \def\slideentry##1##2##3##4##5##6{%
       \ifnum##6=\c@part%
       \def\insertsubsectionheadnumber{##2}%
       \def\insertpartheadnumber{##6}%
       \beamer@tocifnothide{\ifnum\c@section=##1\ifnum\c@subsection=##2\beamer@nav@css\else\beamer@nav@oss\fi\else\beamer@nav@ooss\fi}%
-      {\hbox{%
+      {\hbox{{%
         \usebeamerfont{subsection in sidebar}\usebeamercolor[fg]{subsection in sidebar}%
           \beamer@link(##4){%
           \ifnum\c@section=##1%
             \fi%
           \else%
             {\beamer@subsectionsidenohilight}%
-          \fi}}%
+          \fi}}}%
       }%
       \fi\fi}%
     \beamer@currentsubsection=0\relax%
 
 \def\insertsectionnavigation#1{%
   \hbox to #1{%
-    \vbox{\usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
+    \vbox{{\usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
      \vskip0.5625ex%
      \def\slideentry##1##2##3##4##5##6{}%
      \def\sectionentry##1##2##3##4##5{%
        \def\insertpartheadnumber{##5}%
        \setbox\beamer@tempbox=\hbox{%
          \hyperlink{Navigation##3}{\hbox to #1{%
-           \hskip0.3cm\ifnum\c@section=##1%
-           \beamer@sectionheadhilight\else\beamer@sectionheadnohilight\fi\hskip0.3cm}}}%
+             \hskip0.3cm%
+             \ifnum\c@section=##1%
+               {\usebeamertemplate{section in head/foot}}%
+             \else%
+               {\usebeamertemplate{section in head/foot shaded}}%
+             \fi\hskip0.3cm}}}%
        \ht\beamer@tempbox=1.6875ex\dp\beamer@tempbox=0.75ex%        
        \box\beamer@tempbox\fi}%
-     \dohead\vskip0.5625ex}\hfil}}
+     \dohead\vskip0.5625ex}}\hfil}}
 
 \def\insertsectionnavigationhorizontal#1#2#3{%
-  \hbox to #1{%
+  \hbox to #1{{%
      \def\slideentry##1##2##3##4##5##6{}%
      #2\hskip.3cm%
      \usebeamerfont{section in head/foot}\usebeamercolor[fg]{section in head/foot}%
      \dp\beamer@sectionbox=0.75ex%
      \hskip-1.875ex plus-1fill\dohead%
      \box\beamer@sectionbox\hfil\hskip.3cm%
-     #3}}
+     #3}}}
 
 \def\insertsubsectionnavigation#1{%
   \hbox to #1{%
-    \vbox{%
+    \vbox{{%
       \usebeamerfont{subsection in head/foot}\usebeamercolor[fg]{subsection in head/foot}%
       \vskip0.5625ex%
       \beamer@currentsubsection=0%
         \def\insertsubsectionheadnumber{##2}%
         \def\insertpartheadnumber{##6}%
         \setbox\beamer@tempbox=\hbox{\beamer@link(##4){%
-          \hbox to #1{\hskip0.3cm\ifnum\c@subsection=##2%
-          \beamer@subsectionheadhilight\else\beamer@subsectionheadnohilight\fi\hfil\hskip0.3cm}}}%
+            \hbox to #1{\hskip0.3cm%
+              \ifnum\c@subsection=##2%
+                {\usebeamertemplate{subsection in head/foot}}%
+              \else%
+                {\usebeamertemplate{subsection in head/foot shaded}}%
+              \fi\hfil\hskip0.3cm}}}%
         \ht\beamer@tempbox=1.6875ex\dp\beamer@tempbox=0.75ex%
         \box\beamer@tempbox\fi\fi\fi}%
-      \dohead\vskip0.5625ex}\hfil}}
+      \dohead\vskip0.5625ex}\hfil}}}
 
 \def\insertsubsectionnavigationhorizontal#1#2#3{%
-  \hbox to #1{%
+  \hbox to #1{{%
     \usebeamerfont{subsection in head/foot}\usebeamercolor[fg]{subsection in head/foot}%
     \beamer@currentsubsection=0%
     \def\sectionentry##1##2##3##4##5{}%
          \def\insertsubsectionheadnumber{##2}%
          \def\insertpartheadnumber{##6}%
          \ifnum\c@subsection=##2%
-        \beamer@link(##4){\beamer@subsectionheadhilight}\else%
-        \beamer@link(##4){\beamer@subsectionheadnohilight}\fi}%
+        \beamer@link(##4){{\usebeamertemplate{subsection in head/foot}}}\else%
+        \beamer@link(##4){{\usebeamertemplate{subsection in head/foot shaded}}}\fi}%
       \ht\beamer@sectionbox=1.875ex%
       \dp\beamer@sectionbox=0.75ex%
       \fi\fi\fi\ignorespaces}%
     #2\hskip.3cm\setbox\beamer@sectionbox=\hbox{}%
     \hskip-1.875ex plus-1fill\dohead%
     \box\beamer@sectionbox\hfil\hskip.3cm%
-    #3}}
+    #3}}}
 
-\def\usesubsectionheadtemplate#1#2{\gdef\beamer@subsectionheadhilight{#1}\gdef\beamer@subsectionheadnohilight{#2}}
+
 \def\usesubsectionsidetemplate#1#2{\gdef\beamer@subsectionsidehilight{#1}\gdef\beamer@subsectionsidenohilight{#2}}
 
 

doc/beamerug-customization.tex

 \end{command}
 
 
-\paragraph{Template Installation Commands}\ 
-
-\begin{command}{\usesectionheadtemplate\marg{current section
-      template}\marg{other section template}}
-  The templates are used to render the section names in a navigation
-  bar. 
-  \example
-\begin{verbatim}
-\usesectionheadtemplate
-  {\hfill\color{white}\tiny\textbf{\insertsectionheadnumber.\ \
-    \insertsectionhead}}
-  {\hfill\color{white!50!black}\tiny\textbf{\insertsectionheadnumber.\ \ 
-    \insertsectionhead}}
-\end{verbatim}
-\end{command}
-  
-
-\begin{command}{\usesubsectionheadtemplate\marg{current subsection
-      template}\marg{other subsection template}}
-  See |\usesectionheadtemplate|.
-  \example
-\begin{verbatim}
-\usesubsectionheadtemplate{\color{white}%
-  \tiny\textbf{\insertsectionheadnumber.\insertsubsectionheadnumber\ \
-  \insertsubsectionhead}}%
-  {\color{white!50!beamerstructure}%
-  \tiny\textbf{\insertsectionheadnumber.\insertsubsectionheadnumber\ \ 
-  \insertsubsectionhead}}
-\end{verbatim}
-\end{command}
-
 \begin{command}{\useminislidetemplate%
     \marg{template current frame icon}%
     \marg{template current subsection frame icon}\\%
 \end{command}
 
 
-\paragraph{Inserts}\
-
-
-\begin{command}{\insertsectionhead}
-  Inserts the text of the section that is to be typeset in a
-  navigation bar.
-\end{command}
-
-\begin{command}{\insertsubsectionhead}
-  Inserts the text of the subsection that is to be typeset in a
-  navigation bar. 
-\end{command}
-
-\begin{command}{\insertsectionheadnumber}
-  Inserts the number of the section that is to be typeset in a
-  navigation bar. 
-\end{command}
-
-\begin{command}{\insertsubsectionheadnumber}
-  Inserts the number of the subsection that is to be typeset in a
-  navigation bar. 
-\end{command}
-
-\begin{command}{\insertpartheadnumber}
-  Inserts the number of the part of the current section of subsection
-  that is to be typeset in a navigation bar. 
-\end{command}
-
-
 
 
 

doc/beamerug-frames.tex

 \end{element}
 
 
+\begin{element}{section in head/foot}\yes\yes\yes
+  This template is used to render a section entry if it occurs in the
+  headline or the footline. The background of the \beamer-color is
+  typically used as the background of the whole ``area'' where section
+  entries are shown in the headline. You cannot usually use this
+  template yourself since the insert |\insertsectionhead| is setup
+  correctly only when a list of sections is being typeset in the
+  headline. 
+
+  The default template just inserts the section name. The following
+  inserts are useful for this template:
+  \begin{itemize}
+    \iteminsert{\insertsectionhead}
+    inserts the name of the section that is to be typeset in a
+    navigation bar. 
+
+    \iteminsert{\insertsectionheadnumber}
+    inserts the number of the section that is to be typeset in a
+    navigation bar. 
+
+    \iteminsert{\insertpartheadnumber}
+    inserts the number of the part of the current section or subsection
+    that is to be typeset in a navigation bar. 
+  \end{itemize}
+\end{element}
+
+\begin{element}{section in head/foot shaded}\yes\no\no
+  This template is used instead of |section in head/foot| for
+  typesetting sections that are currently shaded. Such shading is
+  usually applied to all sections but the current one.
+
+  Note that this template does \emph{not} have its own color and
+  font. When this template is called, the \beamer-font and color
+  |section in head/foot| will have been setup. Then, at the start of
+  the template, you will typically change the current color or start a
+  |colormixin| environment.
+
+  \begin{templateoptions}
+    \itemoption{default}{\oarg{percentage}}
+    The default template changes the current color to
+    |fg!|\meta{percentage}|!bg|. This causes the current color to
+    become ``washed out'' or ``shaded.'' The default percentage is
+    |50|.
+
+    \example You can use the following command to make the shaded
+    entries very ``light'':
+\begin{verbatim}
+\setbeamertemplate{section in head/foot shaded}[default][20]
+\end{verbatim}
+  \end{templateoptions}
+\end{element}
+
+\begin{element}{subsection in head/foot}\yes\yes\yes
+  This template behaves exactly like |section in head/foot|, only for
+  subsections. 
+  \begin{itemize}
+    \iteminsert{\insertsubsectionhead}
+    works like |\insertsectionhead|.
+
+    \iteminsert{\insertsubsectionheadnumber}
+    works like |\insertsectionheadnumber|.
+  \end{itemize}
+\end{element}
+
+\begin{element}{section in head/foot shaded}\yes\no\no
+  This template behaves exactly like |section in head/foot shaded|,
+  only for subsections. 
+  \begin{templateoptions}
+    \itemoption{default}{\oarg{percentage}}
+    works like the corresponding option for sections.
+
+    \example
+\begin{verbatim}
+\setbeamertemplate{section in head/foot shaded}[default][20]
+\setbeamertemplate{subsection in head/foot shaded}[default][20]
+\end{verbatim}
+  \end{templateoptions}
+\end{element}
+
+
 
 \subsubsection{The Sidebars}
 

themes/color/beamercolorthemedefault.sty

 
 \setbeamercolor{page number in head/foot}{fg=fg!50!bg}
 
+\setbeamercolor{qed symbol}{parent=structure}
+
 \mode
 <all>

themes/inner/beamerinnerthemedefault.sty

 }
 
 
+                                % Section and subsections in head/foot
+
+\defbeamertemplate*{section in head/foot}{default}
+{\insertsectionhead}
+
+\defbeamertemplate*{section in head/foot shaded}{default}[1][50]
+{\color{fg!#1!bg}\usebeamertemplate{section in head/foot}}
+
+\defbeamertemplate*{subsection in head/foot}{default}
+{\insertsubsectionhead}
+
+\defbeamertemplate*{subsection in head/foot shaded}{default}[1][50]
+{\color{fg!#1!bg}\usebeamertemplate{subsection in head/foot}}
+
+
+
+                                % Sidebars
 
 \beamertemplaterightsidebarlogonavigation
 
 
-
 \mode
 <all>