Merge pull request #58 from rchurchley/unlowercase

Remove MakeLowercase

README.md

@@ -61,13 +61,26 @@ With option `nosectionslide`, no dedicated slide is produced when a new section
 starts. By default when using the `\section` command, a slide is created with
 just the title on it.
 
-The `nosmallcapitals` option supresses the usage of small capitals on
-title page, frame titles and dedicated section slides.
-
 Option `usetotalslideindicator` creates slide numbering in lower right corner
 in following format: #current/#total. By default, just current page number is
 printed.
 
+#### Title formatting
+
+The main title, section titles, and frame titles are all formatted according
+to the custom command `\mthemetitleformat`. By default, this is equivalent to
+`scshape` and sets the titles in small capitals, but you can change it in your
+preamble. For example:
+
+```latex
+\renewcommand{\mthemetitleformat}{}                       % no small capitals
+\renewcommand{\mthemetitleformat}{\scshape\MakeLowercase} % all small capitals
+\renewcommand{\mthemetitleformat}{\MakeUppercase}         % all capitals
+```
+
+Note that `\MakeLowercase` and `\MakeUppercase` can have unexpected behaviour
+in math mode, are disabled when `protectframetitle` is used, and cause crashes
+when an unprotected frametitle appears on a slide with `allowframebreaks`.
 
 #### Commands
 

beamerthemem.sty

@@ -13,13 +13,11 @@
 
 \newif\if@useTitleProgressBar
 \newif\if@protectFrameTitle
-\newif\if@noSmallCapitals
 \newif\if@noSectionSlide
 \newif\if@useTotalSlideIndicator
 
 \@useTitleProgressBarfalse
 \@protectFrameTitlefalse
-\@noSmallCapitalsfalse
 \@noSectionSlidefalse
 \@useTotalSlideIndicatorfalse
 
@@ -37,7 +35,6 @@
   \PackageWarning{beamerthemem}{Unknown option `\CurrentOption'}%
 }
 
-\DeclareOptionBeamer{nosmallcapitals}{\@noSmallCapitalstrue}
 \DeclareOptionBeamer{nosectionslide}{\@noSectionSlidetrue}
 \DeclareOptionBeamer{usetotalslideindicator}{\@useTotalSlideIndicatortrue}
 
@@ -96,11 +93,7 @@
       \linespread{1.0}%
       \usebeamerfont{title}%
       \usebeamercolor[fg]{title}%
-      \if@noSmallCapitals%
+      \mthemetitleformat{\inserttitle}%
-        \inserttitle%
-      \else%
-        \scshape\MakeLowercase{\inserttitle}%
-      \fi%
       \vspace*{0.5em}
     }}
     \fi
@@ -178,18 +171,16 @@
 \newcommand{\insertsectionHEAD}{%
   \expandafter\insertsectionHEADaux\insertsectionhead}
 
-\if@noSmallCapitals%
+\newcommand{\insertsectionHEADaux}[3]{\mthemetitleformat{#3}}%
-\newcommand{\insertsectionHEADaux}[3]{#3}%
+
-\else%
+\def\mthemetitleformat#1{\scshape #1}
-\newcommand{\insertsectionHEADaux}[3]{\textsc{\MakeLowercase{#3}}}%
-\fi%
 
 \newcommand{\plain}[2][]{%
   \begingroup
   \setbeamercolor{background canvas}{use=palette primary,bg=palette primary.fg}
   \begin{frame}{#1}
     \centering
-    \vfill\vspace{1em}\usebeamerfont{section title}\textcolor{white}{\scshape #2}\vfill
+    \vfill\vspace{1em}\usebeamerfont{section title}\textcolor{white}{\mthemetitleformat{#2}}\vfill
   \end{frame}
   \endgroup
 }
@@ -279,18 +270,9 @@
 \begin{beamercolorbox}[wd=\paperwidth,leftskip=0.3cm,rightskip=0.3cm,ht=2.5ex,dp=1.5ex]{frametitle}
 \usebeamerfont{frametitle}%
 \if@protectFrameTitle%
-  \protect%
+    \mthemetitleformat{\protect\insertframetitle}%
-  \if@noSmallCapitals%
-    \insertframetitle%
-  \else%
-    \textsc{\MakeLowercase{\insertframetitle}}%
-  \fi%
 \else%
-  \if@noSmallCapitals%
+    \mthemetitleformat{\insertframetitle}%
-    \insertframetitle%
-  \else%
-    \textsc{\MakeLowercase{\insertframetitle}}%
-  \fi%
 \fi%
 \end{beamercolorbox}%
 \if@useTitleProgressBar