From ab8bc96b1a7a2237b2329e54650dc0e2429a6023 Mon Sep 17 00:00:00 2001
From: Ross Churchley <ross@rosschurchley.com>
Date: Wed, 17 Jun 2015 22:16:40 -0700
Subject: [PATCH] Move block environments to inner theme

---
 beamerinnerthememetropolis.dtx | 83 +++++++++++++++++++++++++++++++++
 beamerthemem.dtx               | 84 ----------------------------------
 2 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/beamerinnerthememetropolis.dtx b/beamerinnerthememetropolis.dtx
index ef4554c..163c2f9 100644
--- a/beamerinnerthememetropolis.dtx
+++ b/beamerinnerthememetropolis.dtx
@@ -245,6 +245,89 @@
 %
 %
 %
+% \subsection{Block environments}
+%
+%    \begin{macrocode}
+\newlength{\leftrightskip}
+\if@beamer@metropolis@blockbg
+  \setlength{\leftrightskip}{1ex}
+\else
+  \setlength{\leftrightskip}{0ex}
+\fi
+\setbeamertemplate{block begin}{%
+  \vspace*{1ex}
+  \begin{beamercolorbox}[%
+    ht=2.4ex,
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip]{block title}
+      \usebeamerfont*{block title}\insertblocktitle%
+  \end{beamercolorbox}%
+  \vspace*{-1pt}
+  \usebeamerfont{block body}%
+  \begin{beamercolorbox}[%
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip,
+    vmode]{block body}%
+}
+\setbeamertemplate{block end}{%
+  \end{beamercolorbox}
+  \vspace*{0.2ex}
+}
+%    \end{macrocode}
+%
+% Alerted block environment
+%
+%    \begin{macrocode}
+\setbeamertemplate{block alerted begin}{%
+  \vspace*{1ex}
+  \begin{beamercolorbox}[%
+    ht=2.4ex,
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip]{block title alerted}
+      \usebeamerfont*{block title alerted}\insertblocktitle%
+  \end{beamercolorbox}%
+  \vspace*{-1pt}
+  \usebeamerfont{block body alerted}%
+  \begin{beamercolorbox}[%
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip,
+    vmode]{block body}%
+}
+\setbeamertemplate{block alerted end}{%
+  \end{beamercolorbox}
+  \vspace*{0.2ex}
+}
+%    \end{macrocode}
+%
+% Example block environment
+%
+%    \begin{macrocode}
+\setbeamertemplate{block example begin}{%
+  \vspace*{1ex}
+  \begin{beamercolorbox}[%
+    ht=2.4ex,
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip]{block title example}
+      \usebeamerfont*{block title example}\insertblocktitle%
+  \end{beamercolorbox}%
+  \vspace*{-1pt}
+  \usebeamerfont{block body example}%
+  \begin{beamercolorbox}[%
+    dp=1ex,
+    leftskip=\leftrightskip,
+    rightskip=\leftrightskip,
+    vmode]{block body}%
+}
+\setbeamertemplate{block example end}{%
+  \end{beamercolorbox}
+  \vspace*{0.2ex}
+}
+%    \end{macrocode}
 % \iffalse
 %</package>
 % \fi
diff --git a/beamerthemem.dtx b/beamerthemem.dtx
index 3b4236f..78b3a11 100644
--- a/beamerthemem.dtx
+++ b/beamerthemem.dtx
@@ -205,90 +205,6 @@
 \setlength{\parskip}{0.5em}
 %    \end{macrocode}
 %
-% Block environment
-%
-%    \begin{macrocode}
-
-\newlength{\leftrightskip}
-\if@beamer@metropolis@blockbg
-  \setlength{\leftrightskip}{1ex}
-\else
-  \setlength{\leftrightskip}{0ex}
-\fi
-\setbeamertemplate{block begin}{%
-  \vspace*{1ex}
-  \begin{beamercolorbox}[%
-    ht=2.4ex,
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip]{block title}
-      \usebeamerfont*{block title}\insertblocktitle%
-  \end{beamercolorbox}%
-  \vspace*{-1pt}
-  \usebeamerfont{block body}%
-  \begin{beamercolorbox}[%
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip,
-    vmode]{block body}%
-}
-\setbeamertemplate{block end}{%
-  \end{beamercolorbox}
-  \vspace*{0.2ex}
-}
-%    \end{macrocode}
-%
-% Alerted block environment
-%
-%    \begin{macrocode}
-\setbeamertemplate{block alerted begin}{%
-  \vspace*{1ex}
-  \begin{beamercolorbox}[%
-    ht=2.4ex,
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip]{block title alerted}
-      \usebeamerfont*{block title alerted}\insertblocktitle%
-  \end{beamercolorbox}%
-  \vspace*{-1pt}
-  \usebeamerfont{block body alerted}%
-  \begin{beamercolorbox}[%
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip,
-    vmode]{block body}%
-}
-\setbeamertemplate{block alerted end}{%
-  \end{beamercolorbox}
-  \vspace*{0.2ex}
-}
-%    \end{macrocode}
-%
-% Example block environment
-%
-%    \begin{macrocode}
-\setbeamertemplate{block example begin}{%
-  \vspace*{1ex}
-  \begin{beamercolorbox}[%
-    ht=2.4ex,
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip]{block title example}
-      \usebeamerfont*{block title example}\insertblocktitle%
-  \end{beamercolorbox}%
-  \vspace*{-1pt}
-  \usebeamerfont{block body example}%
-  \begin{beamercolorbox}[%
-    dp=1ex,
-    leftskip=\leftrightskip,
-    rightskip=\leftrightskip,
-    vmode]{block body}%
-}
-\setbeamertemplate{block example end}{%
-  \end{beamercolorbox}
-  \vspace*{0.2ex}
-}
-%    \end{macrocode}
 %
 % Captions
 %