From e72eaa9af24cdb1646e1785247c6579321cf6ad5 Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Thu, 11 Jan 2024 09:32:39 +0100 Subject: [PATCH] fix: insert missing parenthesis --- src/beamercolorthememoloch.dtx | 26 ++++--- src/beamerinnerthememoloch.dtx | 126 ++++++++++++++++----------------- src/beamerouterthememoloch.dtx | 8 +-- 3 files changed, 79 insertions(+), 81 deletions(-) diff --git a/src/beamercolorthememoloch.dtx b/src/beamercolorthememoloch.dtx index a086352..fd8d207 100644 --- a/src/beamercolorthememoloch.dtx +++ b/src/beamercolorthememoloch.dtx @@ -40,9 +40,9 @@ % \begin{macrocode} \pgfkeys{ /moloch/color/block/.cd, - .is choice, - transparent/.code=\moloch@block@transparent, - fill/.code=\moloch@block@fill, + .is choice, + transparent/.code=\moloch@block@transparent, + fill/.code=\moloch@block@fill, } % \end{macrocode} % \end{macro} @@ -53,9 +53,9 @@ % \begin{macrocode} \pgfkeys{ /moloch/color/background/.cd, - .is choice, - dark/.code=\moloch@colors@dark, - light/.code=\moloch@colors@light, + .is choice, + dark/.code=\moloch@colors@dark, + light/.code=\moloch@colors@light, } % \end{macrocode} % \end{macro} @@ -201,17 +201,15 @@ } } \setbeamercolor{block title alerted}{% - use={block title, alerted text}, - bg=block title.bg, - fg=alerted text.fg + use={block title, alerted text}, + fg=alerted text.fg } \setbeamercolor{block title example}{% - use={block title, example text}, - bg=block title.bg, - fg=example text.fg + use={block title, example text}, + fg=example text.fg } -\setbeamercolor{block body alerted}{use=block body, parent=block body} -\setbeamercolor{block body example}{use=block body, parent=block body} +% \setbeamercolor{block body alerted}{use=block body, parent=block body} +% \setbeamercolor{block body example}{use=block body, parent=block body} % \end{macrocode} % % Footnotes diff --git a/src/beamerinnerthememoloch.dtx b/src/beamerinnerthememoloch.dtx index ab88563..f59fda5 100644 --- a/src/beamerinnerthememoloch.dtx +++ b/src/beamerinnerthememoloch.dtx @@ -335,15 +335,15 @@ \newlength{\moloch@progressonsectionpage@linewidth} \setlength{\moloch@progressonsectionpage@linewidth}{0.4pt} \setbeamertemplate{progress bar in section page}{ - \pgfmathsetlength{\metropolis@progressonsectionpage}{% - \textwidth * min(1,\insertframenumber/\inserttotalframenumber% + \pgfmathsetlength{\moloch@progressonsectionpage}{ + \textwidth * min(1,\insertframenumber/\inserttotalframenumber) } - \tikzexternaldisable% + \tikzexternaldisable \begin{tikzpicture} \fill[bg] (0,0) rectangle (\textwidth, \moloch@progressonsectionpage@linewidth); \fill[fg] (0,0) rectangle (\moloch@progressonsectionpage, \moloch@progressonsectionpage@linewidth); - \end{tikzpicture}% - \tikzexternalenable% + \end{tikzpicture} + \tikzexternalenable } % \end{macrocode} % @@ -376,16 +376,16 @@ % the auxiliary macro |\moloch@block| to define all three templates. % % \begin{macrocode} -\newlength{\moloch@blocksep} -\newlength{\moloch@blockadjust} -\setlength{\moloch@blocksep}{0.75ex} -\setlength{\moloch@blockadjust}{0.25ex} -\providecommand{\moloch@strut}{% - \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}% -} -\newcommand{\moloch@block}[1]{ -\par\vskip\medskipamount% -\setlength{\parskip}{0pt} +% \newlength{\moloch@blocksep} +% \newlength{\moloch@blockadjust} +% \setlength{\moloch@blocksep}{0.75ex} +% \setlength{\moloch@blockadjust}{0.25ex} +% \providecommand{\moloch@strut}{% +% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}% +% } +% \newcommand{\moloch@block}[1]{ +% \par\vskip\medskipamount% +% \setlength{\parskip}{0pt} % \end{macrocode} % % If a background color is defined for the block title or body, we need to @@ -406,11 +406,11 @@ % set a rightskip for a nice ragged-right block title. % % \begin{macrocode} -\ifbeamercolorempty[bg]{block title#1}{% -\begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{% -\ifbeamercolorempty[bg]{block title}{% -\begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}% -}% +% \ifbeamercolorempty[bg]{block title#1}{% +% \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{% +% \ifbeamercolorempty[bg]{block title}{% +% \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}% +% }% % \end{macrocode} % % Otherwise, if the |block title| has a background, we set the padding based @@ -420,55 +420,55 @@ % % \begin{macrocode} {% -\begin{beamercolorbox}[ - sep=\dimexpr\moloch@blocksep-\moloch@blockadjust\relax, - leftskip=\moloch@blockadjust, - rightskip=\dimexpr\moloch@blockadjust plus 4em\relax - ]{block title#1}% - }}% - % \end{macrocode} - % - % We can now set the contents of the |block title|. The zero-width but - % positive-height box |\moloch@strut| ensures that the block title box - % has a consistent height, even if it lacks punctuation, ascenders, or - % descenders. - % - % \begin{macrocode} - \usebeamerfont*{block title#1}% - \moloch@strut% - \insertblocktitle% - \moloch@strut% -\end{beamercolorbox}% +% \begin{beamercolorbox}[ +% sep=\dimexpr\moloch@blocksep-\moloch@blockadjust\relax, +% leftskip=\moloch@blockadjust, +% rightskip=\dimexpr\moloch@blockadjust plus 4em\relax +% ]{block title#1}% +% }}% +% \end{macrocode} +% +% We can now set the contents of the |block title|. The zero-width but +% positive-height box |\moloch@strut| ensures that the block title box +% has a consistent height, even if it lacks punctuation, ascenders, or +% descenders. +% +% \begin{macrocode} +% \usebeamerfont*{block title#1}% +% \moloch@strut% +% \insertblocktitle% +% \moloch@strut% +% \end{beamercolorbox}% % \end{macrocode} % % Next, we typeset the |block body|. This the code is similar to, but simpler % than, the |block title| code since we don't need to adjust for any struts. % % \begin{macrocode} -\nointerlineskip% -\ifbeamercolorempty[bg]{block body#1}{% - \begin{beamercolorbox}[vmode]{block body#1}}{ - \ifbeamercolorempty[bg]{block body}{% - \begin{beamercolorbox}[vmode]{block body#1}% - }{% - \begin{beamercolorbox}[sep=\moloch@blocksep, vmode]{block body#1}% - \vspace{-\moloch@parskip} - }}% - \usebeamerfont{block body#1}% - \setlength{\parskip}{\moloch@parskip}% - } - % \end{macrocode} - % - % This concludes the auxiliary macro |\moloch@block|. Finally, - % we define the block beamer templates using this macro. - % - % \begin{macrocode} - \setbeamertemplate{block begin}{\moloch@block{}} - \setbeamertemplate{block alerted begin}{\moloch@block{ alerted}} - \setbeamertemplate{block example begin}{\moloch@block{ example}} - \setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}} - \setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}} - \setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}} +% \nointerlineskip% +% \ifbeamercolorempty[bg]{block body#1}{% +% \begin{beamercolorbox}[vmode]{block body#1}}{ +% \ifbeamercolorempty[bg]{block body}{% +% \begin{beamercolorbox}[vmode]{block body#1}% +% }{% +% \begin{beamercolorbox}[sep=\moloch@blocksep, vmode]{block body#1}% +% \vspace{-\moloch@parskip} +% }}% +% \usebeamerfont{block body#1}% +% \setlength{\parskip}{\moloch@parskip}% +% } +% % \end{macrocode} +% % +% % This concludes the auxiliary macro |\moloch@block|. Finally, +% % we define the block beamer templates using this macro. +% % +% % \begin{macrocode} +% \setbeamertemplate{block begin}{\moloch@block{}} +% \setbeamertemplate{block alerted begin}{\moloch@block{ alerted}} +% \setbeamertemplate{block example begin}{\moloch@block{ example}} +% \setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}} +% \setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}} +% \setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/src/beamerouterthememoloch.dtx b/src/beamerouterthememoloch.dtx index 0c70635..183361f 100644 --- a/src/beamerouterthememoloch.dtx +++ b/src/beamerouterthememoloch.dtx @@ -191,14 +191,14 @@ \setlength{\moloch@progressinheadfoot@linewidth}{0.4pt} \setbeamertemplate{progress bar in head/foot}{ \nointerlineskip - \pgfmathsetlength{\metropolis@progressinheadfoot}{\paperwidth * min(1,\insertframenumber/\inserttotalframenumber} + \pgfmathsetlength{\moloch@progressinheadfoot}{\paperwidth * min(1,\insertframenumber/\inserttotalframenumber)} \begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot} - \tikzexternaldisable% + \tikzexternaldisable \begin{tikzpicture} \fill[bg] (0,0) rectangle (\paperwidth, \moloch@progressinheadfoot@linewidth); \fill[fg] (0,0) rectangle (\moloch@progressinheadfoot, \moloch@progressinheadfoot@linewidth); - \end{tikzpicture}% - \tikzexternalenable% + \end{tikzpicture} + \tikzexternalenable \end{beamercolorbox} } % \end{macrocode}