Hyphenate titleformat options

Although (e.g.) `titleformat title` is a valid PGF key and works in the `\metroset`, it does not work as an optional argument to `\usetheme`, where spaces are ignored.
This commit is contained in:
Ross Churchley 2016-02-06 20:19:36 -08:00
parent eee7860518
commit 4a7c1306f0
4 changed files with 32 additions and 32 deletions

View File

@ -65,7 +65,7 @@
\end{frame} \end{frame}
{ {
\metroset{titleformat frame=smallcaps} \metroset{titleformat-frame=smallcaps}
\begin{frame}{Small caps} \begin{frame}{Small caps}
This frame uses the \texttt{smallcaps} titleformat. This frame uses the \texttt{smallcaps} titleformat.
@ -76,7 +76,7 @@
} }
{ {
\metroset{titleformat frame=allsmallcaps} \metroset{titleformat-frame=allsmallcaps}
\begin{frame}{All small caps} \begin{frame}{All small caps}
This frame uses the \texttt{allsmallcaps} titleformat. This frame uses the \texttt{allsmallcaps} titleformat.
@ -89,7 +89,7 @@
} }
{ {
\metroset{titleformat frame=allcaps} \metroset{titleformat-frame=allcaps}
\begin{frame}{All caps} \begin{frame}{All caps}
This frame uses the \texttt{allcaps} titleformat. This frame uses the \texttt{allcaps} titleformat.

View File

@ -64,11 +64,11 @@
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{titleformat title} % \begin{macro}{titleformat-title}
% Control the titleformat of the title % Control the titleformat of the title
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/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%
@ -82,25 +82,25 @@
\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%
} }
}, },
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{titleformat subtitle} % \begin{macro}{titleformat-subtitle}
% Control the titleformat of the subtitle % Control the titleformat of the subtitle
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/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%
@ -114,25 +114,25 @@
\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%
} }
}, },
} }
% \end{macrocode} % \end{macrocode}
% \end{macro} % \end{macro}
% %
% \begin{macro}{titleformat section} % \begin{macro}{titleformat-section}
% Control the titleformat of the section title % Control the titleformat of the section title
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/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%
@ -146,14 +146,14 @@
\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%
} }
}, },
} }
@ -180,9 +180,9 @@
\pgfkeys{/metropolis/inner/.cd, \pgfkeys{/metropolis/inner/.cd,
sectionpage=progressbar, sectionpage=progressbar,
block=transparent, block=transparent,
titleformat title=regular, titleformat-title=regular,
titleformat subtitle=regular, titleformat-subtitle=regular,
titleformat section=regular, titleformat-section=regular,
} }
} }
% \end{macrocode} % \end{macrocode}

View File

@ -90,7 +90,7 @@
% Control the titleformat of the frame title % Control the titleformat of the frame title
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/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%
@ -113,7 +113,7 @@
\vphantom{abcdefghijklmnopqrstuvwxyz}% \vphantom{abcdefghijklmnopqrstuvwxyz}%
} }
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat frame=allsmallcaps can lead to problems% Be aware that titleformat-frame=allsmallcaps can lead to problems%
} }
}, },
allcaps/.code={% allcaps/.code={%
@ -123,7 +123,7 @@
\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZ}% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZ}%
} }
\PackageWarning{beamerthememetropolis}{% \PackageWarning{beamerthememetropolis}{%
Be aware that titleformat frame=allcaps can lead to problems% Be aware that titleformat-frame=allcaps can lead to problems%
} }
}, },
} }
@ -137,7 +137,7 @@
\pgfkeys{/metropolis/outer/.cd, \pgfkeys{/metropolis/outer/.cd,
numbering=counter, numbering=counter,
progressbar=none, progressbar=none,
titleformat frame=regular, titleformat-frame=regular,
} }
} }
% \end{macrocode}% % \end{macrocode}%

View File

@ -69,11 +69,11 @@
} }
% \end{macrocode} % \end{macrocode}
% %
% \begin{macro}{titleformat plain}
% Control the titleformat of the plain title % Control the titleformat of the plain title
% \begin{macro}{titleformat-plain}
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/metropolis/titleformat plain/.cd, /metropolis/titleformat-plain/.cd,
.is choice, .is choice,
regular/.code={% regular/.code={%
\let\metropolis@plaintitleformat\@empty% \let\metropolis@plaintitleformat\@empty%
@ -87,14 +87,14 @@
\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%
} }
}, },
} }
@ -106,11 +106,11 @@
% \begin{macrocode} % \begin{macrocode}
\pgfkeys{ \pgfkeys{
/metropolis/titleformat/.code=\pgfkeysalso{ /metropolis/titleformat/.code=\pgfkeysalso{
inner/titleformat title=#1, inner/titleformat-title=#1,
inner/titleformat subtitle=#1, inner/titleformat-subtitle=#1,
inner/titleformat section=#1, inner/titleformat-section=#1,
outer/titleformat frame=#1, outer/titleformat-frame=#1,
titleformat plain=#1, titleformat-plain=#1,
} }
} }
% \end{macrocode} % \end{macrocode}
@ -135,7 +135,7 @@
% \begin{macrocode} % \begin{macrocode}
\newcommand{\metropolis@setdefaults}{ \newcommand{\metropolis@setdefaults}{
\pgfkeys{/metropolis/.cd, \pgfkeys{/metropolis/.cd,
titleformat plain=regular, titleformat-plain=regular,
} }
} }
% \end{macrocode} % \end{macrocode}