From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 1 Jul 2023 02:27:33 +0000 (-0400)
Subject: Eliminate "partsecframe" in favor of a "headline" that does that.
X-Git-Url: http://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=6c6d5b0b8d44b554b39e7c4c1f679193c4068847;p=beamer-mjo.git

Eliminate "partsecframe" in favor of a "headline" that does that.
---

diff --git a/beamercolorthememjo.sty b/beamercolorthememjo.sty
index 6b08d0c..2364c56 100644
--- a/beamercolorthememjo.sty
+++ b/beamercolorthememjo.sty
@@ -16,7 +16,7 @@
 
 \setbeamercolor{frametitle}{fg=mjotitle}
 
-\setbeamercolor*{section in head/foot}{fg=mjotitle}
-\setbeamercolor*{subsection in head/foot}{fg=mjotitle}
-\setbeamercolor*{author/framecount in foot}{fg=mjotitle}
-\setbeamercolor*{title in head/foot}{fg=mjotitle}
+\setbeamercolor{section in head/foot}{fg=mjotitle}
+\setbeamercolor{subsection in head/foot}{fg=mjotitle}
+\setbeamercolor{author/framecount in foot}{fg=mjotitle}
+\setbeamercolor{title in head/foot}{fg=mjotitle}
diff --git a/beamerouterthememjo.sty b/beamerouterthememjo.sty
index 3d45945..64009dd 100644
--- a/beamerouterthememjo.sty
+++ b/beamerouterthememjo.sty
@@ -4,19 +4,27 @@
 % Display the current/total frame count.
 \setbeamertemplate{page number in head/foot}[totalframenumber]%
 
-% No headline.
-\setbeamertemplate{headline}{}
+% Insert the Section (and optionally, Part:) into the header.
+\setbeamertemplate{headline}{
+  \begin{beamercolorbox}[ht=3ex,dp=1.125ex,%
+    leftskip=.3cm,rightskip=.3cm plus1fil]{title in head}%
+    \usebeamerfont*{frametitle}
+    \usebeamercolor[fg]{frametitle}
+    \ifx\insertpart\@empty%
+    \else%
+    \insertpart: %
+    \fi%
+    \insertsectionhead%
+  \end{beamercolorbox}%
+  \vskip1em\par%
+}
 
 % Stolen from the miniframes theme and modified.
 \setbeamertemplate{footline}{
-  \begin{beamercolorbox}[colsep=1.5pt]{upper separation line foot}
-  \end{beamercolorbox}
   \begin{beamercolorbox}[ht=2.5ex,dp=1.125ex,%
     leftskip=.3cm,rightskip=.3cm plus1fil]{author/framecount in foot}%
     \insertauthor%
     \hfill%
     \usebeamertemplate{page number in head/foot}%
   \end{beamercolorbox}%
-  \begin{beamercolorbox}[colsep=1.5pt]{lower separation line foot}
-  \end{beamercolorbox}
 }
diff --git a/beamerthememjo.sty b/beamerthememjo.sty
index c2c658f..3684bd2 100644
--- a/beamerthememjo.sty
+++ b/beamerthememjo.sty
@@ -10,13 +10,6 @@
 % Create a slide introducing new sections.
 \AtBeginSection[]{
   \begin{frame}
-    \frametitle{
-      \ifx\insertpart\@empty%
-      \else%
-      Part \thepart, %
-      \fi%
-      Section \thesection
-    }
     \vfill
     \begin{center}
       \usebeamerfont{title}
@@ -30,18 +23,6 @@
   \end{frame}
 }
 
-% Define a new ``partsecframe'' environment that uses a default frame
-% title of ``<part>: <section>'' when no other frame title is given.
-\newenvironment{partsecframe}[1][%
-  \ifx\insertpart\@empty%
-  \else%
-  \insertpart: %
-  \fi%
-  \insertsectionhead%
-]
-  {\begin{frame}{#1}\vskip1em\par}
-  {\end{frame}}
-
 % Define a new ``refsframe'' environment for the bibliography.
 % It automatically handles the frame breaks, and fixes the busted
 % vertical spacing on slides >= 2. The extra curly braces ensure that
diff --git a/example.tex b/example.tex
index 4d66544..d138eb4 100644
--- a/example.tex
+++ b/example.tex
@@ -15,7 +15,7 @@
 
   \begin{part}{Part one}
     \begin{section}{Section one}
-      \begin{partsecframe}
+      \begin{frame}
         Hello, these are bullet points:
         \begin{itemize}
           \begin{item}
@@ -28,11 +28,11 @@
             Et cetera
           \end{item}
         \end{itemize}
-      \end{partsecframe}
+      \end{frame}
     \end{section}
 
     \begin{section}{Section two}
-      \begin{partsecframe}
+      \begin{frame}
         Much slide
 
         \begin{theorem*}
@@ -41,26 +41,26 @@
             And its proof.
           \end{proof}
         \end{theorem*}
-      \end{partsecframe}
-      \begin{partsecframe}
+      \end{frame}
+      \begin{frame}
         So presentation
-      \end{partsecframe}
+      \end{frame}
     \end{section}
   \end{part}
 
 
   \begin{part}{The other part}
     \begin{section}{Section three}
-      \begin{partsecframe}
+      \begin{frame}
         You get the idea
-      \end{partsecframe}
+      \end{frame}
     \end{section}
   \end{part}
 
 
   \begin{section}{Section four (no part)}
-    \begin{partsecframe}
+    \begin{frame}
       Everybody gets a free slide!
-    \end{partsecframe}
+    \end{frame}
   \end{section}
 \end{document}