Commits

Anonymous committed f86817e

*** empty log message ***

Comments (0)

Files changed (8)

 
                                 % Navigation symbols
 \beamertemplatenavigationsymbolshorizontal
+\beamertemplaterightsidebarlogonavigation
 
 %%% Local Variables: 
 %%% mode: latex

base/beamerbaseboxes.sty

   \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
     \vskip2pt%
     \colorlet{averagebackgroundcolor}{bmb@down\bmb@scheme}%
+    \colorlet{beamerstructure}{bmb@up\bmb@scheme}%
     \colorlet{structure}{bmb@up\bmb@scheme}%
     \color{.}%
   }

base/beamerbasecompatibility.sty

 \def\newoverlaycommand#1#2#3{\def#1{\alt{#2}{#3}}}
 \def\newoverlayenvironment#1#2#3#4#5{\newenvironment{#1}{\begin{altenv}{#2}{#3}{#4}{#5}}{\end{altenv}}}
 \newenvironment{columnsonlytextwidth}{\begin{columns}[onlytextwidth]}{\end{columns}}
-
+\def\untitledsubsection{\subsection*{}}
 
 %%% Local Variables: 
 %%% mode: latex

base/beamerbasesection.sty

 
 \def\subsection{\@ifnextchar[\@subsection\@@subsection}
 \def\@@subsection{\@ifnextchar*\@@ssubsection\@@@subsection}
-\long\def\@@ssubsection*#1{\@subsection[#1]{}}
+\long\def\@@ssubsection*#1{%
+  \beamer@ifempty{#1}{\beamer@untitledsubsection}{\@subsection[#1]{}}}
 \def\@@@subsection#1{\@subsection[#1]{#1}}
 \def\@subsection[#1]#2{%
   \beamer@savemode%
   \hyper@anchorstart{Outline\the\c@section.\the\c@subsection.\the\c@page}\hyper@anchorend%
   \beamer@ifempty{#2}{\beamer@atbeginsubsections}{\beamer@atbeginsubsection}%
   \beamer@resumemode}
+\def\insertsubsection{}
 
-\def\untitledsubsection{%
+\def\beamer@untitledsubsection{%
   \refstepcounter{subsection}%
   \def\insertsubsection{}%
   \def\lastsubsection{}}
-\def\insertsubsection{}
 
 
 \common

base/beamerbasetemplates.sty

 {
   \usesectionheadtemplate
   {\hfill\color{white}\tiny\textbf{\insertsectionhead}}
-  {\hfill\color{white!50!black}\tiny\textbf{\insertsectionhead}}
+  {\hfill\color{white!50!structure}\tiny\textbf{\insertsectionhead}}
 
   \usesubsectionheadtemplate
   {\color{white}\tiny\textbf{\insertsubsectionhead}}
 \newcommand{\beamertemplatedarksectionheads}
 {
   \usesectionheadtemplate
-  {\color{structure}\tiny\insertsectionhead}
-  {\color{structure!50!averagebackgroundcolor}\tiny\insertsectionhead}
+  {\color{beamerstructure}\tiny\insertsectionhead}
+  {\color{beamerstructure!50!averagebackgroundcolor}\tiny\insertsectionhead}
 
   \usesubsectionheadtemplate
-  {\color{structure}\tiny\insertsubsectionhead}
-  {\color{structure!50!averagebackgroundcolor}\tiny\insertsubsectionhead}
+  {\color{beamerstructure}\tiny\insertsubsectionhead}
+  {\color{beamerstructure!50!averagebackgroundcolor}\tiny\insertsubsectionhead}
 }
 
 
 
 \newcommand{\beamertemplateboldblocks}{
   \useblocktemplate{\medskip{\color{beamerstructure}\textbf{\insertblockname}}\par}{\medskip}
-  \usealertblocktemplate{\medskip{\alert{\textbf{\insertblockname}}}\par}{\medskip}
-  \useexampleblocktemplate{\medskip\begingroup{\color{structure!50!green}\textbf{\insertblockname}}\par%
-    \color{black!50!green}}{\endgroup\medskip}
+  \usealertblocktemplate{\medskip{\alert{\textbf{\insertblockname}}}\colorlet{beamerstructure}{beameralert}\par}{\medskip}
+  \useexampleblocktemplate{\medskip\begingroup{\color{beamerstructure!50!green}\textbf{\insertblockname}}\par%
+    \color{black!50!green}\colorlet{beamerstructure}{beamerstructure!50!green}}{\endgroup\medskip}
 }
 
 \newcommand{\beamertemplatelargeblocks}{
   \useblocktemplate{\medskip{\color{beamerstructure}\large{\insertblockname}}\par}{\medskip}
-  \usealertblocktemplate{\medskip{\alert{\large{\insertblockname}}}\par}{\medskip}
-  \useexampleblocktemplate{\medskip\begingroup{\color{structure!50!green}\large{\insertblockname}}\par%
-    \color{black!50!green}}{\endgroup\medskip}
+  \usealertblocktemplate{\medskip{\alert{\large{\insertblockname}}}\colorlet{beamerstructure}{beameralert}\par}{\medskip}
+  \useexampleblocktemplate{\medskip\begingroup{\color{beamerstructure!50!green}\large{\insertblockname}}\par%
+    \color{black!50!green}\colorlet{beamerstructure}{beamerstructure!50!green}}{\endgroup\medskip}
 }
 
 
 \newcommand{\beamertemplatesetupshadings}{
   \beamerboxessetupshadows
-  \beamerboxesdeclarecolorscheme{block}{structure!75!averagebackgroundcolor}{structure!10!averagebackgroundcolor}
-  \beamerboxesdeclarecolorscheme{alert}{alert!75!averagebackgroundcolor}{alert!10!averagebackgroundcolor}
+  \beamerboxesdeclarecolorscheme{block}{beamerstructure!75!averagebackgroundcolor}{beamerstructure!10!averagebackgroundcolor}
+  \beamerboxesdeclarecolorscheme{alert}{beameralert!75!averagebackgroundcolor}{beameralert!10!averagebackgroundcolor}
   \beamerboxesdeclarecolorscheme{example}{beamerexample!75!averagebackgroundcolor}{beamerexample!10!averagebackgroundcolor}
 }
 

doc/beameruserguide.tex

 \end{command}
 
 \begin{command}{\subsection\declare{|*|}\marg{subsection name}}
-  Like |\subsection*|, except for subsections.
-  \example|\subsection*{Further Reading}|
+  Starts a subsection without an entry in the table of contents. No
+  heading is created, but the \meta{subsection name} is shown in the
+  navigation bar, \emph{except} if \meta{subsection name} is empty. In
+  this case, neither a table of contents entry nor a navigation bar
+  entry is created, \emph{but} any frames in this ``empty'' subsection
+  are shown in the navigation bar.
+
+  \example
+\section{Summary}
+
+  \frame{This frame is not shown in the navigation bar}
+
+  \subsection*{}
+
+  \frame{This frame is shown in the navigation bar, but no subsection
+    entry is shown.}
+
+  \subsection*{A subsection}
+
+  \frame{Normal frame, shown in navigation bar. The subsection name is
+    also shown in the navigation bar, but not in the table of contents.} 
 \end{command}
 
 Often, you may want a certain type of frame to be shown directly after

lyx/examples/beamerlyxexample1.lyx

 In every joust one knight wins.
 \end_deeper 
 \end_deeper 
-\layout Standard
-
-\layout EndFrame
-
 \layout BeginFrame
 
 Tournaments are Complete Directed Graphs
 any two different vertices.
 \end_deeper 
 \end_deeper 
-\layout EndFrame
-
 \layout BeginFrame
 
 Tournaments Arise Naturally in Different Situations
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout Subsection
 
 What Does ``Finding Paths'' Mean?
 approximately their distance.
 \end_deeper 
 \end_deeper 
-\layout EndFrame
-
 \layout Section
 
 Review
 
 \layout Standard
 
-\layout EndFrame
-
 \layout BeginFrame
 
 Logspace Turing Machines Are Quite Powerful
 
 satisfiability with two literals per clause.
 \end_deeper 
-\layout EndFrame
-
 \layout BeginFrame
 
 
 \end_inset 
 
 
-\layout EndFrame
-
 \layout BeginFrame
 
 The Circuit Complexity Classes AC
 .
 \end_deeper 
 \end_deeper 
-\layout EndFrame
-
 \layout AgainFrame
 
 
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout AgainFrame
 
 
 \end_inset 
 
 -complete.
-\layout Fact
-
-\layout EndFrame
-
 \layout AgainFrame
 
 
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout BeginFrame
 
 The Tournament Reachability Problem is Very Easy
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout AgainFrame
 
 
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout BeginFrame
 
 The Tournament Distance Problem is Hard
 \end_inset 
 
 .
-\layout EndFrame
-
 \layout BeginFrame
 
 Proof That 
 
 
 \end_deeper 
-\layout Standard
-
-\layout EndFrame
-
-
 \layout AgainFrame
 
 
 
 .
 \end_deeper 
-\layout EndFrame
-
 \layout BeginFrame
 
 There Exists a Logspace Approximation Scheme for
 \end_inset 
 
 
-\layout EndFrame
-
 \layout AgainFrame
 
 
 \backslash 
 hyperlink{undirected}{
 \backslash 
-beamergotobutton{More Details}}%
+beamergotobutton{More Details}}
 \end_inset 
 
 
 \end_deeper 
-\layout EndFrame
-
 \layout Subsection*
 
 For Further Reading
 
 Tournaments have independence number 1.
  
-\layout EndFrame
-
 \layout BeginFrame
 
 The Results for Tournaments also Apply to
 -complete
 \color default
 .
-\layout EndFrame
-
 \layout Subsection
 
 Finding Paths in Undirected Graphs
 the approximation problem in logspace iff ?.
  
 \end_deeper 
-\layout EndFrame
-
 \layout Subsection
 
 The Approximation Scheme is Optimal

lyx/layouts/beamer.layout

 Style BeginFrame
   KeepEmpty	1
   LatexType	Command
-  LatexName	lyxframe
+  LatexName	lyxframeend{}\lyxframe
   Margin            First_Dynamic
   NextNoIndent      1
   ParSkip           0
 Style BeginPlainFrame
   KeepEmpty	1
   LatexType	Command
-  LatexName	lyxplainframe
+  LatexName	lyxframeend{}\lyxplainframe
   Margin            First_Dynamic
   NextNoIndent      1
   ParSkip           0
 End
 
 Counter
-  Name                 section
+  Name                 section 
 End
 
 Counter
 Style Section
   Margin		First_Dynamic
   LatexType		Command
-  LatexName		section
+  LatexName		lyxframeend{}\section
   NeedProtect		1
   NextNoIndent		1
   LabelSep		xxx
 Style Section*
   CopyStyle		Section
   Margin		Static
-  LatexName		section*
+  LatexName		lyxframeend{}\section*
   LabelType		No_Label
   OptionalArgs		0
 End
 Style Subsection
   Margin		First_Dynamic
   LatexType		Command
-  LatexName		subsection
+  LatexName		lyxframeend{}\subsection
   NeedProtect		1
   NextNoIndent		1
   LabelSep		xxx
 Style Subsection*
   CopyStyle		Subsection
   Margin		Static
-  LatexName		subsection*
+  LatexName		lyxframeend{}\subsection*
   LabelType		No_Label
   OptionalArgs		0
 End
 Style AgainFrame
   KeepEmpty	    0
   LatexType	    Command
-  LatexName	    lyxagainframe
+  LatexName	    lyxframeend{}\lyxagainframe
   Margin            First_Dynamic
   NextNoIndent      1
   ParSkip           0
   LeftMargin        M
   LabelString       "Again frame with label   "
 
+  Font
+    Color           latex
+  EndFont
 
   LabelFont 
     Family          Roman
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.