haskal
/
moloch-dragon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize internal command namespacing 

Use \metropolis@foo instead of \@metropolis@foo, following the example of`beamer`'s source code
This commit is contained in:
Ross Churchley 2016-02-06 19:24:47 -08:00
parent 4a82c4b3af
commit eee7860518
4 changed files with 85 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/beamercolorthememetropolis.dtx
View File

@ -44,8 +44,8 @@
\pgfkeys{ \pgfkeys{
/metropolis/color/block/.cd, /metropolis/color/block/.cd,
.is choice, .is choice,
transparent/.code=\@metropolis@block@transparent, transparent/.code=\metropolis@block@transparent,
fill/.code=\@metropolis@block@fill, fill/.code=\metropolis@block@fill,
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
@ -57,16 +57,16 @@
\pgfkeys{ \pgfkeys{
/metropolis/color/background/.cd, /metropolis/color/background/.cd,
.is choice, .is choice,
dark/.code=\@metropolis@colors@dark, dark/.code=\metropolis@colors@dark,
light/.code=\@metropolis@colors@light, light/.code=\metropolis@colors@light,
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{\@metropolis@color@setdefaults} % \begin{macro}{\metropolis@color@setdefaults}
% Set default values for color theme options. % Set default values for color theme options.
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@color@setdefaults}{ \newcommand{\metropolis@color@setdefaults}{
\pgfkeys{/metropolis/color/.cd, \pgfkeys{/metropolis/color/.cd,
background=light, background=light,
block=transparent, block=transparent,
@ -94,13 +94,13 @@
% |alerted text|, and |example text|. % |alerted text|, and |example text|.
% %
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@colors@dark}{ \newcommand{\metropolis@colors@dark}{
\setbeamercolor{normal text}{% \setbeamercolor{normal text}{%
fg=black!2, fg=black!2,
bg=mDarkTeal bg=mDarkTeal
} }
} }
\newcommand{\@metropolis@colors@light}{ \newcommand{\metropolis@colors@light}{
\setbeamercolor{normal text}{% \setbeamercolor{normal text}{%
fg=mDarkTeal, fg=mDarkTeal,
bg=black!2 bg=black!2
@ -177,10 +177,10 @@
% Blocks % Blocks
% %
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@block@transparent}{ \newcommand{\metropolis@block@transparent}{
\setbeamercolor{block title}{use=normal text, parent=normal text} \setbeamercolor{block title}{use=normal text, parent=normal text}
} }
\newcommand{\@metropolis@block@fill}{ \newcommand{\metropolis@block@fill}{
\setbeamercolor{block title}{% \setbeamercolor{block title}{%
use=normal text, use=normal text,
fg=normal text.fg, fg=normal text.fg,
@ -215,7 +215,7 @@
% Process package options % Process package options
% %
% \begin{macrocode} % \begin{macrocode}
\@metropolis@color@setdefaults \metropolis@color@setdefaults
\ProcessPgfPackageOptions{/metropolis/color} \ProcessPgfPackageOptions{/metropolis/color}
% \end{macrocode} % \end{macrocode}
% %

100
source/beamerinnerthememetropolis.dtx
View File

@ -58,8 +58,8 @@
\pgfkeys{ \pgfkeys{
/metropolis/inner/block/.cd, /metropolis/inner/block/.cd,
.is choice, .is choice,
transparent/.code=\setlength{\@metropolis@blockskip}{0ex}, transparent/.code=\setlength{\metropolis@blockskip}{0ex},
fill/.code=\setlength{\@metropolis@blockskip}{1ex}, fill/.code=\setlength{\metropolis@blockskip}{1ex},
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
@ -71,22 +71,22 @@
/metropolis/inner/titleformat title/.cd, /metropolis/inner/titleformat title/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\@metropolis@titleformat\@empty% \let\metropolis@titleformat\@empty%
\setbeamerfont{title}{shape=\normalfont}% \setbeamerfont{title}{shape=\normalfont}%
}, },
smallcaps/.code={% smallcaps/.code={%
\let\@metropolis@titleformat\@empty% \let\metropolis@titleformat\@empty%
\setbeamerfont{title}{shape=\scshape}% \setbeamerfont{title}{shape=\scshape}%
}, },
allsmallcaps/.code={% allsmallcaps/.code={%
\let\@metropolis@titleformat\MakeLowercase% \let\metropolis@titleformat\MakeLowercase%
\setbeamerfont{title}{shape=\scshape}% \setbeamerfont{title}{shape=\scshape}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat title=allsmallcaps can lead to problems% Be aware that titleformat title=allsmallcaps can lead to problems%
} }
}, },
allcaps/.code={% allcaps/.code={%
\let\@metropolis@titleformat\MakeUppercase% \let\metropolis@titleformat\MakeUppercase%
\setbeamerfont{title}{shape=\normalfont} \setbeamerfont{title}{shape=\normalfont}
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat title=allcaps can lead to problems% Be aware that titleformat title=allcaps can lead to problems%
@ -103,22 +103,22 @@
/metropolis/inner/titleformat subtitle/.cd, /metropolis/inner/titleformat subtitle/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\@metropolis@subtitleformat\@empty% \let\metropolis@subtitleformat\@empty%
\setbeamerfont{subtitle}{shape=\normalfont}% \setbeamerfont{subtitle}{shape=\normalfont}%
}, },
smallcaps/.code={% smallcaps/.code={%
\let\@metropolis@subtitleformat\@empty% \let\metropolis@subtitleformat\@empty%
\setbeamerfont{subtitle}{shape=\scshape}% \setbeamerfont{subtitle}{shape=\scshape}%
}, },
allsmallcaps/.code={% allsmallcaps/.code={%
\let\@metropolis@subtitleformat\MakeLowercase% \let\metropolis@subtitleformat\MakeLowercase%
\setbeamerfont{subtitle}{shape=\scshape}% \setbeamerfont{subtitle}{shape=\scshape}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat subtitle=allsmallcaps can lead to problems% Be aware that titleformat subtitle=allsmallcaps can lead to problems%
} }
}, },
allcaps/.code={% allcaps/.code={%
\let\@metropolis@subtitleformat\MakeUppercase% \let\metropolis@subtitleformat\MakeUppercase%
\setbeamerfont{subtitle}{shape=\normalfont}% \setbeamerfont{subtitle}{shape=\normalfont}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat subtitle=allcaps can lead to problems% Be aware that titleformat subtitle=allcaps can lead to problems%
@ -135,22 +135,22 @@
/metropolis/inner/titleformat section/.cd, /metropolis/inner/titleformat section/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\@metropolis@sectiontitleformat\@empty% \let\metropolis@sectiontitleformat\@empty%
\setbeamerfont{section title}{shape=\normalfont}% \setbeamerfont{section title}{shape=\normalfont}%
}, },
smallcaps/.code={% smallcaps/.code={%
\let\@metropolis@sectiontitleformat\@empty% \let\metropolis@sectiontitleformat\@empty%
\setbeamerfont{section title}{shape=\scshape}% \setbeamerfont{section title}{shape=\scshape}%
}, },
allsmallcaps/.code={% allsmallcaps/.code={%
\let\@metropolis@sectiontitleformat\MakeLowercase% \let\metropolis@sectiontitleformat\MakeLowercase%
\setbeamerfont{section title}{shape=\scshape}% \setbeamerfont{section title}{shape=\scshape}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat section=allsmallcaps can lead to problems% Be aware that titleformat section=allsmallcaps can lead to problems%
} }
}, },
allcaps/.code={% allcaps/.code={%
\let\@metropolis@sectiontitleformat\MakeUppercase% \let\metropolis@sectiontitleformat\MakeUppercase%
\setbeamerfont{section title}{shape=\normalfont}% \setbeamerfont{section title}{shape=\normalfont}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat section=allcaps can lead to problems% Be aware that titleformat section=allcaps can lead to problems%
@ -166,17 +166,17 @@
\pgfkeys{ \pgfkeys{
/metropolis/inner/sectionpage/.cd, /metropolis/inner/sectionpage/.cd,
.is choice, .is choice,
none/.code=\@metropolis@sectionpage@none, none/.code=\metropolis@sectionpage@none,
simple/.code=\@metropolis@sectionpage@simple, simple/.code=\metropolis@sectionpage@simple,
progressbar/.code=\@metropolis@sectionpage@progressbar, progressbar/.code=\metropolis@sectionpage@progressbar,
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{\@metropolis@inner@setdefaults} % \begin{macro}{\metropolis@inner@setdefaults}
% Set default values for inner theme options. % Set default values for inner theme options.
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@inner@setdefaults}{ \newcommand{\metropolis@inner@setdefaults}{
\pgfkeys{/metropolis/inner/.cd, \pgfkeys{/metropolis/inner/.cd,
sectionpage=progressbar, sectionpage=progressbar,
block=transparent, block=transparent,
@ -192,12 +192,12 @@
% %
% \subsubsection{Title page} % \subsubsection{Title page}
% %
% \begin{macro}{\@metropolis@titleformat} % \begin{macro}{\metropolis@titleformat}
% Define hooks to change the case format of the titles. % Define hooks to change the case format of the titles.
% \begin{macrocode} % \begin{macrocode}
\def\@metropolis@titleformat#1{#1} \def\metropolis@titleformat#1{#1}
\def\@metropolis@subtitleformat#1{#1} \def\metropolis@subtitleformat#1{#1}
\def\@metropolis@sectiontitleformat#1{#1} \def\metropolis@sectiontitleformat#1{#1}
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
@ -210,13 +210,13 @@
% \begin{macrocode} % \begin{macrocode}
\patchcmd{\sectionentry} \patchcmd{\sectionentry}
{\def\insertsectionhead{#2}} {\def\insertsectionhead{#2}}
{\def\insertsectionhead{\@metropolis@sectiontitleformat{#2}}} {\def\insertsectionhead{\metropolis@sectiontitleformat{#2}}}
{} {}
{\PackageError{beamerinnerthememetropolis}{Patching section title failed}} {\PackageError{beamerinnerthememetropolis}{Patching section title failed}}
\patchcmd{\beamer@section} \patchcmd{\beamer@section}
{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}} {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{% {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{%
\@metropolis@sectiontitleformat{#1}}}} \metropolis@sectiontitleformat{#1}}}}
{} {}
{\PackageError{beamerinnerthememetropolis}{Patching section title failed}} {\PackageError{beamerinnerthememetropolis}{Patching section title failed}}
% \end{macrocode} % \end{macrocode}
@ -298,7 +298,7 @@
\setbeamertemplate{title}{ \setbeamertemplate{title}{
\raggedright% \raggedright%
\linespread{1.0}% \linespread{1.0}%
\@metropolis@titleformat{\inserttitle}% \metropolis@titleformat{\inserttitle}%
\par% \par%
\vspace*{0.5em} \vspace*{0.5em}
} }
@ -309,7 +309,7 @@
% Set the subtitle on the title page. % Set the subtitle on the title page.
% \begin{macrocode} % \begin{macrocode}
\setbeamertemplate{subtitle}{ \setbeamertemplate{subtitle}{
\@metropolis@subtitleformat{\insertsubtitle}% \metropolis@subtitleformat{\insertsubtitle}%
\par% \par%
\vspace*{0.5em} \vspace*{0.5em}
} }
@ -371,7 +371,7 @@
% Template for the section title slide at the beginning of each section. % Template for the section title slide at the beginning of each section.
% %
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@sectionpage@none}{ \newcommand{\metropolis@sectionpage@none}{
\AtBeginSection{ \AtBeginSection{
% intenionally empty % intenionally empty
} }
@ -382,7 +382,7 @@
\usebeamerfont{section title} \usebeamerfont{section title}
\insertsectionhead\\ \insertsectionhead\\
} }
\newcommand{\@metropolis@sectionpage@simple}{ \newcommand{\metropolis@sectionpage@simple}{
\setbeamertemplate{section page}[simple] \setbeamertemplate{section page}[simple]
\AtBeginSection{ \AtBeginSection{
\ifbeamer@inframe \ifbeamer@inframe
@ -402,7 +402,7 @@
\end{minipage} \end{minipage}
\par \par
} }
\newcommand{\@metropolis@sectionpage@progressbar}{ \newcommand{\metropolis@sectionpage@progressbar}{
\setbeamertemplate{section page}[progressbar] \setbeamertemplate{section page}[progressbar]
\AtBeginSection{ \AtBeginSection{
\ifbeamer@inframe \ifbeamer@inframe
@ -456,23 +456,23 @@
% Regular block environment % Regular block environment
% %
% \begin{macrocode} % \begin{macrocode}
\newlength{\@metropolis@blockskip} \newlength{\metropolis@blockskip}
\setbeamertemplate{block begin}{% \setbeamertemplate{block begin}{%
\setlength{\parskip}{\@metropolis@parskip} \setlength{\parskip}{\metropolis@parskip}
\vspace*{1ex} \vspace*{1ex}
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
ht=2.4ex, ht=2.4ex,
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip]{block title} rightskip=\metropolis@blockskip]{block title}
\usebeamerfont*{block title}\insertblocktitle% \usebeamerfont*{block title}\insertblocktitle%
\end{beamercolorbox}% \end{beamercolorbox}%
\vspace*{-1pt} \vspace*{-1pt}
\usebeamerfont{block body}% \usebeamerfont{block body}%
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip, rightskip=\metropolis@blockskip,
vmode]{block body}% vmode]{block body}%
} }
\setbeamertemplate{block end}{% \setbeamertemplate{block end}{%
@ -485,21 +485,21 @@
% %
% \begin{macrocode} % \begin{macrocode}
\setbeamertemplate{block alerted begin}{% \setbeamertemplate{block alerted begin}{%
\setlength{\parskip}{\@metropolis@parskip} \setlength{\parskip}{\metropolis@parskip}
\vspace*{1ex} \vspace*{1ex}
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
ht=2.4ex, ht=2.4ex,
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip]{block title alerted} rightskip=\metropolis@blockskip]{block title alerted}
\usebeamerfont*{block title alerted}\insertblocktitle% \usebeamerfont*{block title alerted}\insertblocktitle%
\end{beamercolorbox}% \end{beamercolorbox}%
\vspace*{-1pt} \vspace*{-1pt}
\usebeamerfont{block body alerted}% \usebeamerfont{block body alerted}%
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip, rightskip=\metropolis@blockskip,
vmode]{block body alerted}% vmode]{block body alerted}%
} }
\setbeamertemplate{block alerted end}{% \setbeamertemplate{block alerted end}{%
@ -512,21 +512,21 @@
% %
% \begin{macrocode} % \begin{macrocode}
\setbeamertemplate{block example begin}{% \setbeamertemplate{block example begin}{%
\setlength{\parskip}{\@metropolis@parskip} \setlength{\parskip}{\metropolis@parskip}
\vspace*{1ex} \vspace*{1ex}
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
ht=2.4ex, ht=2.4ex,
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip]{block title example} rightskip=\metropolis@blockskip]{block title example}
\usebeamerfont*{block title example}\insertblocktitle% \usebeamerfont*{block title example}\insertblocktitle%
\end{beamercolorbox}% \end{beamercolorbox}%
\vspace*{-1pt} \vspace*{-1pt}
\usebeamerfont{block body example}% \usebeamerfont{block body example}%
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
dp=1ex, dp=1ex,
leftskip=\@metropolis@blockskip, leftskip=\metropolis@blockskip,
rightskip=\@metropolis@blockskip, rightskip=\metropolis@blockskip,
vmode]{block body example}% vmode]{block body example}%
} }
\setbeamertemplate{block example end}{% \setbeamertemplate{block example end}{%
@ -561,9 +561,9 @@
% \subsubsection{Text and spacing settings} % \subsubsection{Text and spacing settings}
% %
% \begin{macrocode} % \begin{macrocode}
\newlength{\@metropolis@parskip} \newlength{\metropolis@parskip}
\setlength{\@metropolis@parskip}{0.5em} \setlength{\metropolis@parskip}{0.5em}
\setlength{\parskip}{\@metropolis@parskip} \setlength{\parskip}{\metropolis@parskip}
\linespread{1.15} \linespread{1.15}
% \end{macrocode} % \end{macrocode}
% %
@ -587,7 +587,7 @@
% Process package options % Process package options
% %
% \begin{macrocode} % \begin{macrocode}
\@metropolis@inner@setdefaults \metropolis@inner@setdefaults
\ProcessPgfPackageOptions{/metropolis/inner} \ProcessPgfPackageOptions{/metropolis/inner}
% \end{macrocode} % \end{macrocode}
% %

32
source/beamerouterthememetropolis.dtx
View File

@ -93,23 +93,23 @@
/metropolis/outer/titleformat frame/.cd, /metropolis/outer/titleformat frame/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\@metropolis@frametitleformat\@empty% \let\metropolis@frametitleformat\@empty%
\setbeamerfont{frametitle}{shape=\normalfont}% \setbeamerfont{frametitle}{shape=\normalfont}%
\renewcommand{\@metropolis@frametitlestrut}{% \renewcommand{\metropolis@frametitlestrut}{%
\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}%
} }
}, },
smallcaps/.code={% smallcaps/.code={%
\let\@metropolis@frametitleformat\@empty% \let\metropolis@frametitleformat\@empty%
\setbeamerfont{frametitle}{shape=\scshape}% \setbeamerfont{frametitle}{shape=\scshape}%
\renewcommand{\@metropolis@frametitlestrut}{% \renewcommand{\metropolis@frametitlestrut}{%
\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}%
} }
}, },
allsmallcaps/.code={% allsmallcaps/.code={%
\let\@metropolis@frametitleformat\MakeLowercase% \let\metropolis@frametitleformat\MakeLowercase%
\setbeamerfont{frametitle}{shape=\scshape}% \setbeamerfont{frametitle}{shape=\scshape}%
\renewcommand{\@metropolis@frametitlestrut}{% \renewcommand{\metropolis@frametitlestrut}{%
\vphantom{abcdefghijklmnopqrstuvwxyz}% \vphantom{abcdefghijklmnopqrstuvwxyz}%
} }
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
@ -117,9 +117,9 @@
} }
}, },
allcaps/.code={% allcaps/.code={%
\let\@metropolis@frametitleformat\MakeUppercase% \let\metropolis@frametitleformat\MakeUppercase%
\setbeamerfont{frametitle}{shape=\normalfont} \setbeamerfont{frametitle}{shape=\normalfont}
\renewcommand{\@metropolis@frametitlestrut}{% \renewcommand{\metropolis@frametitlestrut}{%
\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZ}% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZ}%
} }
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
@ -130,10 +130,10 @@
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{\@metropolis@outer@setdefaults} % \begin{macro}{\metropolis@outer@setdefaults}
% Set default values for outer theme options. % Set default values for outer theme options.
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@outer@setdefaults}{ \newcommand{\metropolis@outer@setdefaults}{
\pgfkeys{/metropolis/outer/.cd, \pgfkeys{/metropolis/outer/.cd,
numbering=counter, numbering=counter,
progressbar=none, progressbar=none,
@ -180,10 +180,10 @@
% %
% \subsubsection{Frametitle} % \subsubsection{Frametitle}
% %
% \begin{macro}{\@metropolis@frametitleformat} % \begin{macro}{\metropolis@frametitleformat}
% Define a hook to change the case format of the frame title. % Define a hook to change the case format of the frame title.
% \begin{macrocode} % \begin{macrocode}
\def\@metropolis@frametitleformat#1{#1} \def\metropolis@frametitleformat#1{#1}
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
@ -202,7 +202,7 @@
\gdef\beamer@shortframetitle{#1}% \gdef\beamer@shortframetitle{#1}%
}} }}
{\beamer@ifempty{#2}{}{% {\beamer@ifempty{#2}{}{%
\gdef\insertframetitle{{\@metropolis@frametitleformat{#2}\ifnum% \gdef\insertframetitle{{\metropolis@frametitleformat{#2}\ifnum%
\beamer@autobreakcount>0\relax{}\space% \beamer@autobreakcount>0\relax{}\space%
\usebeamertemplate*{frametitle continuation}\fi}}% \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer@frametitle{#2}% \gdef\beamer@frametitle{#2}%
@ -218,14 +218,14 @@
% progress bar. % progress bar.
% %
% \begin{macrocode} % \begin{macrocode}
\newlength{\@metropolis@frametitlestrut} \newlength{\metropolis@frametitlestrut}
\defbeamertemplate{frametitle}{plain}{% \defbeamertemplate{frametitle}{plain}{%
\nointerlineskip% \nointerlineskip%
\begin{beamercolorbox}[% \begin{beamercolorbox}[%
wd=\paperwidth,% wd=\paperwidth,%
sep=1.5ex,% sep=1.5ex,%
]{frametitle}% ]{frametitle}%
\@metropolis@frametitlestrut\insertframetitle\@metropolis@frametitlestrut% \metropolis@frametitlestrut\insertframetitle\metropolis@frametitlestrut%
\end{beamercolorbox}% \end{beamercolorbox}%
} }
% \end{macrocode} % \end{macrocode}
@ -257,7 +257,7 @@
% Process package options % Process package options
% %
% \begin{macrocode} % \begin{macrocode}
\@metropolis@outer@setdefaults \metropolis@outer@setdefaults
\ProcessPgfPackageOptions{/metropolis/outer} \ProcessPgfPackageOptions{/metropolis/outer}
% \end{macrocode} % \end{macrocode}
% %

21
source/beamerthememetropolis.dtx
View File

@ -76,22 +76,22 @@
/metropolis/titleformat plain/.cd, /metropolis/titleformat plain/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\@metropolis@plaintitleformat\@empty% \let\metropolis@plaintitleformat\@empty%
\setbeamerfont{plain title}{shape=\normalfont}% \setbeamerfont{plain title}{shape=\normalfont}%
}, },
smallcaps/.code={% smallcaps/.code={%
\let\@metropolis@plaintitleformat\@empty% \let\metropolis@plaintitleformat\@empty%
\setbeamerfont{plain title}{shape=\scshape}% \setbeamerfont{plain title}{shape=\scshape}%
}, },
allsmallcaps/.code={% allsmallcaps/.code={%
\let\@metropolis@plaintitleformat\MakeLowercase% \let\metropolis@plaintitleformat\MakeLowercase%
\setbeamerfont{plain title}{shape=\scshape}% \setbeamerfont{plain title}{shape=\scshape}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat plain=allsmallcaps can lead to problems% Be aware that titleformat plain=allsmallcaps can lead to problems%
} }
}, },
allcaps/.code={% allcaps/.code={%
\let\@metropolis@plaintitleformat\MakeUppercase% \let\metropolis@plaintitleformat\MakeUppercase%
\setbeamerfont{plain title}{shape=\normalfont}% \setbeamerfont{plain title}{shape=\normalfont}%
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat plain=allcaps can lead to problems% Be aware that titleformat plain=allcaps can lead to problems%
@ -133,7 +133,7 @@
% Set default values for options. % Set default values for options.
% %
% \begin{macrocode} % \begin{macrocode}
\newcommand{\@metropolis@setdefaults}{ \newcommand{\metropolis@setdefaults}{
\pgfkeys{/metropolis/.cd, \pgfkeys{/metropolis/.cd,
titleformat plain=regular, titleformat plain=regular,
} }
@ -170,17 +170,12 @@
% We define custom commands in this package as their proper usage may depend % We define custom commands in this package as their proper usage may depend
% on multiple sub-packages. % on multiple sub-packages.
% %
% \begin{macro}{\@metropolis@plaintitleformat}
% Define a hook to change the case format of the plain title.
% \begin{macrocode}
\def\@metropolis@plaintitleformat#1{#1}
% \end{macrocode}
% \end{macro}
% %
% \begin{macro}{\plain} % \begin{macro}{\plain}
% Creates a plain frame with dark background, suitable for displaying images % Creates a plain frame with dark background, suitable for displaying images
% or a few words. % or a few words.
% \begin{macrocode} % \begin{macrocode}
\def\metropolis@plaintitleformat#1{#1}
\newcommand{\plain}[2][]{% \newcommand{\plain}[2][]{%
\begingroup \begingroup
\setbeamercolor{background canvas}{ \setbeamercolor{background canvas}{
@ -191,7 +186,7 @@
\begin{center} \begin{center}
\usebeamercolor[fg]{palette primary} \usebeamercolor[fg]{palette primary}
\usebeamerfont{plain title} \usebeamerfont{plain title}
\@metropolis@plaintitleformat{#2} \metropolis@plaintitleformat{#2}
\end{center} \end{center}
\end{frame} \end{frame}
\endgroup \endgroup
@ -208,7 +203,7 @@
% Process package options % Process package options
% %
% \begin{macrocode} % \begin{macrocode}
\@metropolis@setdefaults \metropolis@setdefaults
\ProcessPgfOptions{/metropolis} \ProcessPgfOptions{/metropolis}
% \end{macrocode} % \end{macrocode}
% %