fix: insert missing parenthesis
This commit is contained in:
Johan Larsson
parent
bea9cb39ec
commit
e72eaa9af2
|
|
@ -40,9 +40,9 @@
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\pgfkeys{
|
\pgfkeys{
|
||||||
/moloch/color/block/.cd,
|
/moloch/color/block/.cd,
|
||||||
.is choice,
|
.is choice,
|
||||||
transparent/.code=\moloch@block@transparent,
|
transparent/.code=\moloch@block@transparent,
|
||||||
fill/.code=\moloch@block@fill,
|
fill/.code=\moloch@block@fill,
|
||||||
}
|
}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
% \end{macro}
|
% \end{macro}
|
||||||
|
|
@ -53,9 +53,9 @@
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\pgfkeys{
|
\pgfkeys{
|
||||||
/moloch/color/background/.cd,
|
/moloch/color/background/.cd,
|
||||||
.is choice,
|
.is choice,
|
||||||
dark/.code=\moloch@colors@dark,
|
dark/.code=\moloch@colors@dark,
|
||||||
light/.code=\moloch@colors@light,
|
light/.code=\moloch@colors@light,
|
||||||
}
|
}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
% \end{macro}
|
% \end{macro}
|
||||||
|
|
@ -201,17 +201,15 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
\setbeamercolor{block title alerted}{%
|
\setbeamercolor{block title alerted}{%
|
||||||
use={block title, alerted text},
|
use={block title, alerted text},
|
||||||
bg=block title.bg,
|
fg=alerted text.fg
|
||||||
fg=alerted text.fg
|
|
||||||
}
|
}
|
||||||
\setbeamercolor{block title example}{%
|
\setbeamercolor{block title example}{%
|
||||||
use={block title, example text},
|
use={block title, example text},
|
||||||
bg=block title.bg,
|
fg=example text.fg
|
||||||
fg=example text.fg
|
|
||||||
}
|
}
|
||||||
\setbeamercolor{block body alerted}{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}
|
% \setbeamercolor{block body example}{use=block body, parent=block body}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
% Footnotes
|
% Footnotes
|
||||||
|
|
|
||||||
|
|
@ -335,15 +335,15 @@
|
||||||
\newlength{\moloch@progressonsectionpage@linewidth}
|
\newlength{\moloch@progressonsectionpage@linewidth}
|
||||||
\setlength{\moloch@progressonsectionpage@linewidth}{0.4pt}
|
\setlength{\moloch@progressonsectionpage@linewidth}{0.4pt}
|
||||||
\setbeamertemplate{progress bar in section page}{
|
\setbeamertemplate{progress bar in section page}{
|
||||||
\pgfmathsetlength{\metropolis@progressonsectionpage}{%
|
\pgfmathsetlength{\moloch@progressonsectionpage}{
|
||||||
\textwidth * min(1,\insertframenumber/\inserttotalframenumber%
|
\textwidth * min(1,\insertframenumber/\inserttotalframenumber)
|
||||||
}
|
}
|
||||||
\tikzexternaldisable%
|
\tikzexternaldisable
|
||||||
\begin{tikzpicture}
|
\begin{tikzpicture}
|
||||||
\fill[bg] (0,0) rectangle (\textwidth, \moloch@progressonsectionpage@linewidth);
|
\fill[bg] (0,0) rectangle (\textwidth, \moloch@progressonsectionpage@linewidth);
|
||||||
\fill[fg] (0,0) rectangle (\moloch@progressonsectionpage, \moloch@progressonsectionpage@linewidth);
|
\fill[fg] (0,0) rectangle (\moloch@progressonsectionpage, \moloch@progressonsectionpage@linewidth);
|
||||||
\end{tikzpicture}%
|
\end{tikzpicture}
|
||||||
\tikzexternalenable%
|
\tikzexternalenable
|
||||||
}
|
}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
|
|
@ -376,16 +376,16 @@
|
||||||
% the auxiliary macro |\moloch@block| to define all three templates.
|
% the auxiliary macro |\moloch@block| to define all three templates.
|
||||||
%
|
%
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\newlength{\moloch@blocksep}
|
% \newlength{\moloch@blocksep}
|
||||||
\newlength{\moloch@blockadjust}
|
% \newlength{\moloch@blockadjust}
|
||||||
\setlength{\moloch@blocksep}{0.75ex}
|
% \setlength{\moloch@blocksep}{0.75ex}
|
||||||
\setlength{\moloch@blockadjust}{0.25ex}
|
% \setlength{\moloch@blockadjust}{0.25ex}
|
||||||
\providecommand{\moloch@strut}{%
|
% \providecommand{\moloch@strut}{%
|
||||||
\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
|
% \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
|
||||||
}
|
% }
|
||||||
\newcommand{\moloch@block}[1]{
|
% \newcommand{\moloch@block}[1]{
|
||||||
\par\vskip\medskipamount%
|
% \par\vskip\medskipamount%
|
||||||
\setlength{\parskip}{0pt}
|
% \setlength{\parskip}{0pt}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
% If a background color is defined for the block title or body, we need to
|
% 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.
|
% set a rightskip for a nice ragged-right block title.
|
||||||
%
|
%
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\ifbeamercolorempty[bg]{block title#1}{%
|
% \ifbeamercolorempty[bg]{block title#1}{%
|
||||||
\begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{%
|
% \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{%
|
||||||
\ifbeamercolorempty[bg]{block title}{%
|
% \ifbeamercolorempty[bg]{block title}{%
|
||||||
\begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}%
|
% \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}%
|
||||||
}%
|
% }%
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
% Otherwise, if the |block title| has a background, we set the padding based
|
% Otherwise, if the |block title| has a background, we set the padding based
|
||||||
|
|
@ -420,55 +420,55 @@
|
||||||
%
|
%
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
{%
|
{%
|
||||||
\begin{beamercolorbox}[
|
% \begin{beamercolorbox}[
|
||||||
sep=\dimexpr\moloch@blocksep-\moloch@blockadjust\relax,
|
% sep=\dimexpr\moloch@blocksep-\moloch@blockadjust\relax,
|
||||||
leftskip=\moloch@blockadjust,
|
% leftskip=\moloch@blockadjust,
|
||||||
rightskip=\dimexpr\moloch@blockadjust plus 4em\relax
|
% rightskip=\dimexpr\moloch@blockadjust plus 4em\relax
|
||||||
]{block title#1}%
|
% ]{block title#1}%
|
||||||
}}%
|
% }}%
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
% We can now set the contents of the |block title|. The zero-width but
|
% 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
|
% positive-height box |\moloch@strut| ensures that the block title box
|
||||||
% has a consistent height, even if it lacks punctuation, ascenders, or
|
% has a consistent height, even if it lacks punctuation, ascenders, or
|
||||||
% descenders.
|
% descenders.
|
||||||
%
|
%
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\usebeamerfont*{block title#1}%
|
% \usebeamerfont*{block title#1}%
|
||||||
\moloch@strut%
|
% \moloch@strut%
|
||||||
\insertblocktitle%
|
% \insertblocktitle%
|
||||||
\moloch@strut%
|
% \moloch@strut%
|
||||||
\end{beamercolorbox}%
|
% \end{beamercolorbox}%
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
%
|
%
|
||||||
% Next, we typeset the |block body|. This the code is similar to, but simpler
|
% 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.
|
% than, the |block title| code since we don't need to adjust for any struts.
|
||||||
%
|
%
|
||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\nointerlineskip%
|
% \nointerlineskip%
|
||||||
\ifbeamercolorempty[bg]{block body#1}{%
|
% \ifbeamercolorempty[bg]{block body#1}{%
|
||||||
\begin{beamercolorbox}[vmode]{block body#1}}{
|
% \begin{beamercolorbox}[vmode]{block body#1}}{
|
||||||
\ifbeamercolorempty[bg]{block body}{%
|
% \ifbeamercolorempty[bg]{block body}{%
|
||||||
\begin{beamercolorbox}[vmode]{block body#1}%
|
% \begin{beamercolorbox}[vmode]{block body#1}%
|
||||||
}{%
|
% }{%
|
||||||
\begin{beamercolorbox}[sep=\moloch@blocksep, vmode]{block body#1}%
|
% \begin{beamercolorbox}[sep=\moloch@blocksep, vmode]{block body#1}%
|
||||||
\vspace{-\moloch@parskip}
|
% \vspace{-\moloch@parskip}
|
||||||
}}%
|
% }}%
|
||||||
\usebeamerfont{block body#1}%
|
% \usebeamerfont{block body#1}%
|
||||||
\setlength{\parskip}{\moloch@parskip}%
|
% \setlength{\parskip}{\moloch@parskip}%
|
||||||
}
|
% }
|
||||||
% \end{macrocode}
|
% % \end{macrocode}
|
||||||
%
|
% %
|
||||||
% This concludes the auxiliary macro |\moloch@block|. Finally,
|
% % This concludes the auxiliary macro |\moloch@block|. Finally,
|
||||||
% we define the block beamer templates using this macro.
|
% % we define the block beamer templates using this macro.
|
||||||
%
|
% %
|
||||||
% \begin{macrocode}
|
% % \begin{macrocode}
|
||||||
\setbeamertemplate{block begin}{\moloch@block{}}
|
% \setbeamertemplate{block begin}{\moloch@block{}}
|
||||||
\setbeamertemplate{block alerted begin}{\moloch@block{ alerted}}
|
% \setbeamertemplate{block alerted begin}{\moloch@block{ alerted}}
|
||||||
\setbeamertemplate{block example begin}{\moloch@block{ example}}
|
% \setbeamertemplate{block example begin}{\moloch@block{ example}}
|
||||||
\setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
% \setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
||||||
\setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
% \setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
||||||
\setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
% \setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
% \end{macro}
|
% \end{macro}
|
||||||
% \end{macro}
|
% \end{macro}
|
||||||
|
|
|
||||||
|
|
@ -191,14 +191,14 @@
|
||||||
\setlength{\moloch@progressinheadfoot@linewidth}{0.4pt}
|
\setlength{\moloch@progressinheadfoot@linewidth}{0.4pt}
|
||||||
\setbeamertemplate{progress bar in head/foot}{
|
\setbeamertemplate{progress bar in head/foot}{
|
||||||
\nointerlineskip
|
\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}
|
\begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
|
||||||
\tikzexternaldisable%
|
\tikzexternaldisable
|
||||||
\begin{tikzpicture}
|
\begin{tikzpicture}
|
||||||
\fill[bg] (0,0) rectangle (\paperwidth, \moloch@progressinheadfoot@linewidth);
|
\fill[bg] (0,0) rectangle (\paperwidth, \moloch@progressinheadfoot@linewidth);
|
||||||
\fill[fg] (0,0) rectangle (\moloch@progressinheadfoot, \moloch@progressinheadfoot@linewidth);
|
\fill[fg] (0,0) rectangle (\moloch@progressinheadfoot, \moloch@progressinheadfoot@linewidth);
|
||||||
\end{tikzpicture}%
|
\end{tikzpicture}
|
||||||
\tikzexternalenable%
|
\tikzexternalenable
|
||||||
\end{beamercolorbox}
|
\end{beamercolorbox}
|
||||||
}
|
}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue