Skip to content

Commit

Permalink
fix: insert missing parenthesis
Browse files Browse the repository at this point in the history
  • Loading branch information
@jolars
jolars committed Jan 11, 2024
1 parent bea9cb3 commit e72eaa9
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 81 deletions.
26 changes: 12 additions & 14 deletions src/beamercolorthememoloch.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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
Expand Down
126 changes: 63 additions & 63 deletions src/beamerinnerthememoloch.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
%
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions src/beamerouterthememoloch.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit e72eaa9

Please sign in to comment.