diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty index 5a744faa158..311ef669812 100644 --- a/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty +++ b/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty @@ -23,7 +23,7 @@ %% --------------------------------------------------------------------------- %% Copyright 2024 Johan Larsson and contributors \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthememoloch}[2024-01-15 v0.1.0 Moloch outer theme] % x-release-please-version +\ProvidesPackage{beamerouterthememoloch}[2024-03-06 v0.3.0 Moloch outer theme] % x-release-please-version \RequirePackage{calc} \RequirePackage{pgfopts} \pgfkeys{ @@ -55,6 +55,26 @@ progressbar=none, } } +\pgfkeys{ + /moloch/outer/numbering/.cd, + .is choice, + none/.code={% + \PackageWarning{moloch}{The ``numbering'' option is deprecated. + Use beamer's ``page number in head/foot'' template instead}% + \setbeamertemplate{page number in head/foot}[default] + }, + counter/.code={% + \PackageWarning{moloch}{The ``numbering'' option is deprecated. + Use beamer's ``page number in head/foot'' template instead}% + \setbeamertemplate{page number in head/foot}[framenumber] + }, + fraction/.code={% + \PackageWarning{moloch}{The ``numbering'' option is deprecated. + Use beamer's ``page number in head/foot'' template instead}% + \setbeamertemplate{page number in head/foot}[totalframenumber] + }, +} +\setbeamertemplate{page number in head/foot}[framenumber] \setbeamertemplate{navigation symbols}{} \defbeamertemplate{headline}{plain}{} \defbeamertemplate{footline}{plain}{% @@ -70,32 +90,26 @@ \usebeamertemplate*{page number in head/foot}\vskip4pt% \end{beamercolorbox}% } -\newlength{\moloch@frametitle@padding} -\setlength{\moloch@frametitle@padding}{2.2ex} -\newcommand{\moloch@frametitlestrut@start}{% - \rule{0pt}{\moloch@frametitle@padding + \totalheightof{X}}% -} -\newcommand{\moloch@frametitlestrut@end}{% - \rule[-\moloch@frametitle@padding]{0pt}{\moloch@frametitle@padding} -} \defbeamertemplate{frametitle}{plain}{% \nointerlineskip% \begin{beamercolorbox}[% wd=\paperwidth,% - sep=0pt,% - leftskip=\moloch@frametitle@padding,% - rightskip=\the\glueexpr \moloch@frametitle@padding plus 1fill\relax,% + sep=1.1ex,% + leftskip=0.5ex,% + rightskip=\the\glueexpr 0.5ex plus 1fill\relax,% ]{frametitle}% - \moloch@frametitlestrut@start% - \insertframetitle% - \nolinebreak% - \moloch@frametitlestrut@end% + \usebeamerfont{frametitle}% + \vbox{}\vskip-0.4ex% + \strut\insertframetitle\nolinebreak\strut\par% + {% + \ifx\insertframesubtitle\@empty% + \else% + {\usebeamerfont{framesubtitle}\vspace{-0.8ex}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}% + \fi + }% \end{beamercolorbox}% } -\setbeamertemplate{frametitle continuation}{% - \usebeamerfont{frametitle} - \romannumeral \insertcontinuationcount -} +\setbeamertemplate{frametitle continuation}{\romannumeral\insertcontinuationcount} \newlength{\moloch@progressinheadfoot} \newlength{\moloch@progressinheadfoot@linewidth} \setlength{\moloch@progressinheadfoot@linewidth}{0.4pt} |