Merge remote-tracking branch 'origin/frametitlefixes' into frametitlefixes

Conflicts:
	beamerouterthememetropolis.dtx

beamerouterthememetropolis.dtx

@@ -87,13 +87,24 @@
 \pgfkeys{
   /metropolis/outer/frametitleformat/.cd,
     .is choice,
-    regular/.code=\renewcommand{\@metropolis@frametitleformat}{},
+    regular/.code={%
+       \renewcommand{\@metropolis@frametitleformat}{}%
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{ABCDEFGHIJKLMNOPQRSTUVWXYZ}}
+       }
+       },
     lowercase/.code={%
-      \renewcommand{\@metropolis@frametitleformat}{\MakeLowercase}
+       \renewcommand{\@metropolis@frametitleformat}{\MakeLowercase}%
-    },
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{abcdefghijklmnopqrstuvwxyz}}
+       }
+       },
     uppercase/.code={%
-      \renewcommand{\@metropolis@frametitleformat}{\MakeUppercase}
+       \renewcommand{\@metropolis@frametitleformat}{\MakeUppercase}%
-    },
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{ABCDEFGHIJKLMNOPQRSTUVWXYZ}}
+       }
+       },
 }
 %    \end{macrocode}
 % \end{macro}
@@ -183,16 +194,14 @@
 % progress bar.
 %
 %    \begin{macrocode}
+\newlength{\@metropolis@frametitlestrut}
 \defbeamertemplate{frametitle}{plain}{%
   \nointerlineskip
   \begin{beamercolorbox}[%
       wd=\paperwidth,
-      leftskip=0.3cm,
+      sep=1.5ex,
-      rightskip=0.3cm,
-      ht=2.5ex,
-      dp=1.5ex
     ]{frametitle}
-  \insertframetitle%
+  \insertframetitle\@metropolis@frametitlestrut%
   \end{beamercolorbox}%
 }
 %    \end{macrocode}