diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-07 21:21:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-07 21:21:54 +0000 |
commit | ffed17e936a227bf045013b27a2dbd0611e2549b (patch) | |
tree | 6c1caa0546642607bda2892854056b9d0e68a474 /Master/texmf-dist/source/latex | |
parent | ce57eecafb65f83c537834dc4f3ad46405dc8f95 (diff) |
moloch (7mar24)
git-svn-id: svn://tug.org/texlive/trunk@70466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
5 files changed, 121 insertions, 58 deletions
diff --git a/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx index c6a41c2f18f..d6a14105cad 100644 --- a/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx +++ b/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx @@ -14,7 +14,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthememoloch}[2024-01-15 v0.1.0 Moloch color theme] % x-release-please-version +\ProvidesPackage{beamercolorthememoloch}[2024-03-06 v0.3.0 Moloch color theme] % x-release-please-version %</package> % \fi % \CheckSum{0} @@ -36,6 +36,18 @@ % % \subsubsection{Options} % +% \begin{macro}{block} +% Optionally adds a light grey background to block environments like +% |theorem| and |example|. +% \begin{macrocode} +\pgfkeys{ + /moloch/color/block/.cd, + .is choice, + transparent/.code=\moloch@block@transparent, + fill/.code=\moloch@block@fill, +} +% \end{macrocode} +% \end{macro} % % \begin{macro}{colors} % Provides the option to have a dark background and light foreground instead @@ -161,9 +173,37 @@ } % \end{macrocode} % -% Block environments use alerted tex and example text for the title +% Block environments such as |theorem| and |example| have no background color +% by default. The option |block=fill| sets a background color based on the +% background and foreground of |normal text|. The option |block=transparent| +% reverts the block environments to an empty background, which can be useful +% if changing colors mid-presentation. % % \begin{macrocode} +\newcommand{\moloch@block@transparent}{ + \setbeamercolor{block title}{bg=} + \setbeamercolor{block body}{bg=} + \setbeamercolor{block title alerted}{bg=} + \setbeamercolor{block title example}{bg=} +} +\newcommand{\moloch@block@fill}{ + \setbeamercolor{block title}{% + bg=normal text.bg!80!fg + } + \setbeamercolor{block body}{% + bg=block title.bg!50!normal text.bg + } + \setbeamercolor{block title alerted}{% + bg=block title.bg, + } + \setbeamercolor{block title example}{% + bg=block title.bg, + } +} +\setbeamercolor{block title}{% + use=normal text, + fg=normal text.fg +} \setbeamercolor{block title alerted}{% use={block title, alerted text}, fg=alerted text.fg @@ -172,6 +212,8 @@ 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} % \end{macrocode} % % Footnotes @@ -181,6 +223,14 @@ \setbeamercolor{footnote mark}{fg=.} % \end{macrocode} % +% +% Footnotes +% +% \begin{macrocode} +\setbeamercolor{footnote}{fg=normal text.fg!90} +\setbeamercolor{footnote mark}{fg=.} +% \end{macrocode} +% % We also reset the bibliography colors in order to pick up the surrounding % colors at the time of use. This prevents us having to set the correct color in % normal and standout mode. diff --git a/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx index 7b02600a14f..4748387c3cc 100644 --- a/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx +++ b/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx @@ -14,7 +14,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthememoloch}[2024-01-15 v0.1.0 Moloch font theme] % x-release-please-version +\ProvidesPackage{beamerfontthememoloch}[2024-03-06 v0.3.0 Moloch font theme] % x-release-please-version %</package> % \fi % \CheckSum{0} @@ -44,13 +44,10 @@ \setbeamerfont{block title alerted}{size=\normalsize, series=\bfseries} \setbeamerfont*{subtitle}{size=\large} \setbeamerfont{frametitle}{size=\large, series=\bfseries} +\setbeamerfont{framesubtitle}{size=\small} \setbeamerfont{caption}{size=\small} \setbeamerfont{caption name}{series=\bfseries} \setbeamerfont{description item}{series=\bfseries} -\setbeamerfont{bibliography entry author}{size=\normalsize, series=\normalfont} -\setbeamerfont{bibliography entry title}{size=\normalsize, series=\bfseries} -\setbeamerfont{bibliography entry location}{size=\normalsize, series=\normalfont} -\setbeamerfont{bibliography entry note}{size=\small, series=\normalfont} \setbeamerfont{standout}{size=\Large, series=\bfseries} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx index 8ab2b31185f..2b626d526d4 100644 --- a/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx +++ b/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx @@ -14,7 +14,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthememoloch}[2024-01-15 v0.1.0 Moloch inner theme] % x-release-please-version +\ProvidesPackage{beamerinnerthememoloch}[2024-03-06 v0.3.0 Moloch inner theme] % x-release-please-version %</package> % \fi % \CheckSum{0} @@ -112,26 +112,20 @@ % \begin{macrocode} \setbeamertemplate{title page}{ \begin{minipage}[b][\paperheight]{\textwidth} - \ifx\inserttitlegraphic\@empty\else\usebeamertemplate*{title graphic}\fi + \null% \vfill% + \ifx\inserttitlegraphic\@empty\else\usebeamertemplate*{title graphic}\fi \ifx\inserttitle\@empty\else\usebeamertemplate*{title}\fi \ifx\insertsubtitle\@empty\else\usebeamertemplate*{subtitle}\fi \usebeamertemplate*{title separator} - % \end{macrocode} - % - % Beamer's definition of |\insertauthor| is always nonempty, so we have - % to test another macro initialized by |\author{...}| to see if the user has - % defined an author. This solution was suggested by Enrico Gregorio in an - % answer to \href{https://tex.stackexchange.com/questions/241306/}{this - % Stack Exchange question}. - % - % \begin{macrocode} - \ifx\beamer@shortauthor\@empty\else\usebeamertemplate*{author}\fi + \expandafter\ifblank\expandafter{\beamer@andstripped}{}{% + \usebeamertemplate*{author}% + } \ifx\insertinstitute\@empty\else\usebeamertemplate*{institute}\fi \ifx\insertdate\@empty\else\usebeamertemplate*{date}\fi \vfill \null - \end{minipage} + \end{minipage}% } % \end{macrocode} % \end{macro}% @@ -167,11 +161,9 @@ % position of other elements. % \begin{macrocode} \setbeamertemplate{title graphic}{ - \vbox to 0pt { - \vspace*{2em} - \inserttitlegraphic% - }% - \nointerlineskip% + \inserttitlegraphic% + \par% + \vspace*{1em} } % \end{macrocode} % \end{macro} @@ -181,10 +173,9 @@ % \begin{macrocode} \setbeamertemplate{title}{ \raggedright% - \linespread{1.0}% \inserttitle% \par% - \vspace*{0.5em} + \vspace*{0.2em} } % \end{macrocode} % \end{macro} @@ -196,7 +187,7 @@ \raggedright% \insertsubtitle% \par% - \vspace*{0.5em} + \vspace*{0.2em} } % \end{macrocode} % \end{macro} @@ -214,6 +205,7 @@ \end{tikzpicture}% \tikzexternalenable% \par% + \vspace*{0.8em} } % \end{macrocode} % \end{macro} @@ -222,9 +214,10 @@ % Set the author on the title page. % \begin{macrocode} \setbeamertemplate{author}{ - \vspace*{2em} + \raggedright% \insertauthor% \par% + \vspace*{0.5em} } % \end{macrocode} % \end{macro} @@ -233,9 +226,9 @@ % Set the institute on the title page. % \begin{macrocode} \setbeamertemplate{institute}{ - \vspace*{0.5em} \insertinstitute% \par% + \vspace*{1em} } % \end{macrocode} % \end{macro} @@ -245,7 +238,6 @@ % Set the date on the title page. % \begin{macrocode} \setbeamertemplate{date}{ - \vspace*{1.5em} \insertdate% \par% } @@ -404,12 +396,6 @@ % % \subsubsection{Text and spacing settings} % -% \begin{macrocode} -\newlength{\moloch@parskip} -\setlength{\moloch@parskip}{0.5em} -\setlength{\parskip}{\moloch@parskip} -\linespread{1.15} -% \end{macrocode} % % By default, Beamer frames offer the |c| option to \textit{almost} vertically % center the text, but the placement is a little too high. To fix this, we diff --git a/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx index a684e477436..a5d59108319 100644 --- a/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx +++ b/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx @@ -14,7 +14,7 @@ % \iffalse %<*package> \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 %</package> % \fi % \CheckSum{0} @@ -82,7 +82,43 @@ % \end{macrocode}% % \end{macro} % +% \subsubsection{Deprecated Options} % +% These options are deprecated and will be removed in a future version. +% +% \begin{macro}{numbering} +% Adds slide numbers to the bottom right of each slide. +% \begin{macrocode} +\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] + }, +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Slide Numbering} +% +% Moloch defaults to numbering frames. To modify this, simply copy this line to your +% preamble and replace |framenumber|. +% +% \begin{macrocode} +\setbeamertemplate{page number in head/foot}[framenumber] +% \end{macrocode} % % \subsubsection{Head and footline} % @@ -124,32 +160,26 @@ % Templates for the frame title, which is optionally underlined with a % progress bar. % \begin{macrocode} -\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} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx index 345ed8d1332..fcebef5a811 100644 --- a/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx +++ b/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx @@ -12,7 +12,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthememoloch}[2024-01-15 v0.1.0 Moloch Beamer theme] % x-release-please-version +\ProvidesPackage{beamerthememoloch}[2024-03-06 v0.3.0 Moloch Beamer theme] % x-release-please-version %</package> % \fi % \CheckSum{0} |