Merge pull request #113 from rchurchley/fixes

Various issue fixes

beamerinnerthememetropolis.dtx

@@ -301,7 +301,6 @@
   }
 }
 \defbeamertemplate{section page}{progressbar}{
-  \vspace{2em}
   \centering
   \begin{minipage}{22em}
     \usebeamercolor[fg]{section title}
@@ -443,20 +442,10 @@
 %
 %
 %
-% \subsubsection{Itemize/enumerate environments}
+% \subsubsection{Lists and floats}
-%    \begin{macrocode}
+%
-\setlength{\leftmargini}{1em}
-\setlength{\leftmarginii}{1em}
-\setlength{\leftmarginiii}{1em}
-\setbeamertemplate{itemize item}{\textbullet}
-\setbeamertemplate{itemize subitem}{\textbullet}
-\setbeamertemplate{itemize subsubitem}{\textbullet}
-%    \end{macrocode}
-%
-%
-%
-% \subsubsection{Figures and tables}
 %    \begin{macrocode}
+\setbeamertemplate{itemize items}{\textbullet}
 \setbeamertemplate{caption label separator}{: }
 \setbeamertemplate{caption}[numbered]
 %    \end{macrocode}
@@ -474,13 +463,30 @@
 %
 %
 %
-% \subsubsection{General text settings}
+% \subsubsection{Text and spacing settings}
+%
 %    \begin{macrocode}
-\mode<all>
 \setlength{\parskip}{0.5em}
 \linespread{1.15}
 %    \end{macrocode}
 %
+% By default, Beamer frames offer the |c| option to \textit{almost} vertically
+% center the text, but the placement is a little too high. To fix this, we
+% redefine the |c| option to equalize |\beamer@frametopskip| and
+% |\beamer@framebottomskip|. This solution was suggested by Enrico Gregorio in
+% an answer to \href{http://tex.stackexchange.com/questions/247826/}{this
+% Stack Exchange question}.
+%
+%    \begin{macrocode}
+\define@key{beamerframe}{c}[true]{% centered
+  \beamer@frametopskip=0pt plus 1fill\relax%
+  \beamer@framebottomskip=0pt plus 1fill\relax%
+  \beamer@frametopskipautobreak=0pt plus .4\paperheight\relax%
+  \beamer@framebottomskipautobreak=0pt plus .6\paperheight\relax%
+  \def\beamer@initfirstlineunskip{}%
+}
+%    \end{macrocode}
+%
 % Process package options
 %
 %    \begin{macrocode}

beamerouterthememetropolis.dtx

@@ -63,8 +63,20 @@
 \pgfkeys{
   /metropolis/outer/progressbar/.cd,
     .is choice,
-    none/.code=\setbeamertemplate{frametitle}[plain],
+    none/.code={%
-    frametitle/.code=\setbeamertemplate{frametitle}[progressbar],
+      \setbeamertemplate{headline}[plain]
+      \setbeamertemplate{frametitle}[plain]
+      \setbeamertemplate{footline}[plain]
+    },
+    head/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{headline}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
+    frametitle/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{frametitle}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
+    foot/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{footline}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
 }
 %    \end{macrocode}
 % \end{macro}
@@ -86,17 +98,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{frametitleoffset}
-% This option controls the frame title offset.
-%    \begin{macrocode}
-\pgfkeys{
-  /metropolis/outer/.cd,
-    frametitleoffset/.code=\setlength{\@metropolis@voffset}{#1},
-    noframetitleoffset/.code=\setlength{\@metropolis@voffset}{0em},
-}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\@metropolis@outer@setdefaults}
 % Set default values for outer theme options.
 %    \begin{macrocode}
@@ -105,7 +106,6 @@
     numbering=counter,
     progressbar=none,
     frametitleformat=lowercase,
-    frametitleoffset=2em,
   }
 }
 %    \end{macrocode}%
@@ -122,39 +122,23 @@
 \setbeamertemplate{navigation symbols}{}
 %    \end{macrocode}
 %
-% Template for the frame number. Can be omitted, shown or displayed as a
+% Templates for the frame number. Can be omitted, shown or displayed as a
 % fraction of the total frames.
 %
 %    \begin{macrocode}
-\defbeamertemplate{frame numbering}{none}{
+\defbeamertemplate{frame numbering}{none}{}
-  % intentionally empty
+\defbeamertemplate{frame numbering}{counter}{\insertframenumber}
-}
-\defbeamertemplate{frame numbering}{counter}{
-  \insertframenumber
-}
 \defbeamertemplate{frame numbering}{fraction}{
   \insertframenumber/\inserttotalframenumber
 }
 %    \end{macrocode}
 %
-% Define additional space between frame title and content. By default 2em.
-%
 %    \begin{macrocode}
-\newlength{\@metropolis@voffset}
+\defbeamertemplate{headline}{plain}{}
-%    \end{macrocode}
+\defbeamertemplate{footline}{plain}{%
-%
+  \begin{beamercolorbox}[wd=\textwidth, sep=3ex]{footline}%
-% The only element in the footline by default is the frame number.
+    \hfill%
-%
+    \usebeamerfont{page number in head/foot}%
-%    \begin{macrocode}
-\setbeamertemplate{footline}{%
-  \begin{beamercolorbox}[%
-      wd=\textwidth,
-      ht=3ex,
-      dp=3ex,
-      leftskip=0.3cm,
-      rightskip=0.3cm
-    ]{footline}%
-  \hfill\usebeamerfont{page number in head/foot}%
     \usebeamertemplate*{frame numbering}
   \end{beamercolorbox}%
 }
@@ -210,21 +194,6 @@
     ]{frametitle}
   \insertframetitle%
   \end{beamercolorbox}%
-  \vspace{\@metropolis@voffset}
-}
-\defbeamertemplate{frametitle}{progressbar}{%
-  \nointerlineskip
-  \begin{beamercolorbox}[%
-      wd=\paperwidth,
-      leftskip=0.3cm,
-      rightskip=0.3cm,
-      ht=2.5ex,
-      dp=1.5ex
-    ]{frametitle}
-  \insertframetitle%
-  \end{beamercolorbox}%
-  \usebeamertemplate*{progress bar in head/foot}
-  \vspace{\@metropolis@voffset}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -242,10 +211,7 @@
   \setlength{\metropolis@progressinheadfoot}{%
     \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
   }%
-  \begin{beamercolorbox}[
+  \begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
-      wd=\paperwidth,
-      ht=0.4pt,
-      dp=0pt]{progress bar in head/foot}
     \begin{tikzpicture}
       \draw[bg, fill=bg] (0,0) rectangle (\paperwidth, 0.4pt);
       \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressinheadfoot, 0.4pt);

beamerthemem.dtx

@@ -186,14 +186,12 @@
       use=palette primary,
       parent=palette primary
     }
-    \begin{frame}{#1}
+    \begin{frame}[c]{#1}
-      \centering
+      \begin{center}
-      \vfill
-      \vspace{1em}
         \usebeamercolor[fg]{palette primary}
         \usebeamerfont{section title}
         \@metropolis@plaintitleformat{#2}
-      \vfill
+      \end{center}
     \end{frame}
   \endgroup
 }

mtheme.dtx

@@ -259,9 +259,9 @@ option on every sub-package accordingly.
   additionally.
 }
 
-\DescribeOption{progressbar}{none, frametitle}{none}{
+\DescribeOption{progressbar}{none, head, frametitle, foot}{none}{
-  Setting this option to frametitle adds a progress bar underneath each frame
+  Adds a progress bar to the top of each frame (|head|), the bottom of each
-  title similar to the section progress bar.
+  frame (|foot|), or directly below each frame title (|frametitle|).
 }
 
 \DescribeOption{frametitleformat}{regular, lowercase, uppercase}{lowercase}{
@@ -337,6 +337,8 @@ or horizontal |mbarplot| to plot bar charts.
 
 \section{Known Issues}
 
+The |\plain| command does not work if you override the \textsc{metropolis}
+color theme with the default beamer color theme |fly|.
 
 \section{License}