From ffed17e936a227bf045013b27a2dbd0611e2549b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Mar 2024 21:21:54 +0000 Subject: moloch (7mar24) git-svn-id: svn://tug.org/texlive/trunk@70466 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/moloch/CHANGELOG.md | 35 +++++++++++ Master/texmf-dist/doc/latex/moloch/README.md | 25 ++++++-- Master/texmf-dist/doc/latex/moloch/moloch.pdf | Bin 263101 -> 276169 bytes Master/texmf-dist/doc/latex/moloch/moloch.tex | 15 ++++- .../source/latex/moloch/beamercolorthememoloch.dtx | 54 +++++++++++++++- .../source/latex/moloch/beamerfontthememoloch.dtx | 7 +-- .../source/latex/moloch/beamerinnerthememoloch.dtx | 46 +++++--------- .../source/latex/moloch/beamerouterthememoloch.dtx | 70 +++++++++++++++------ .../source/latex/moloch/beamerthememoloch.dtx | 2 +- .../tex/latex/moloch/beamercolorthememoloch.sty | 36 ++++++++++- .../tex/latex/moloch/beamerfontthememoloch.sty | 7 +-- .../tex/latex/moloch/beamerinnerthememoloch.sty | 44 +++++-------- .../tex/latex/moloch/beamerouterthememoloch.sty | 54 ++++++++++------ .../tex/latex/moloch/beamerthememoloch.sty | 2 +- 14 files changed, 279 insertions(+), 118 deletions(-) diff --git a/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md b/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md index 8064aee6b3b..1d90d7617cc 100644 --- a/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md @@ -1,5 +1,40 @@ # Changelog +## [0.3.0](https://github.com/jolars/moloch/compare/v0.2.0...v0.3.0) (2024-03-06) + + +### Features + +* bring back the `numbering` option and deprecate it ([9a013e4](https://github.com/jolars/moloch/commit/9a013e4d46e1c009f058862525c4d92983c4103c)) +* make `framenumber` slide numbering the default ([54e0fce](https://github.com/jolars/moloch/commit/54e0fce68b39a10aabf646c000ffa6656dede748)) +* redesign title page ([9e6506e](https://github.com/jolars/moloch/commit/9e6506eccdf1a55ac88540df3bf792b88f07fc7a)) +* reinstate support for `block` option ([bf63dcd](https://github.com/jolars/moloch/commit/bf63dcd17922277a198465485931f414a9426636)) +* remove custom linespread setting ([6a85ef4](https://github.com/jolars/moloch/commit/6a85ef4ecd170550411cd00e65fe1e1a8d88b80b)), closes [#8](https://github.com/jolars/moloch/issues/8) +* remove parskip setting ([5477051](https://github.com/jolars/moloch/commit/54770512988927ab3c8264c7fce592cd0a4e32f8)), closes [#9](https://github.com/jolars/moloch/issues/9) +* support subtitles ([1c49957](https://github.com/jolars/moloch/commit/1c499577ea8f8aadf2403bdbd4efa603cf5a64d6)) + + +### Bug Fixes + +* apply upstream beamer fix for empty shortauthor ([b8b2d10](https://github.com/jolars/moloch/commit/b8b2d1090da3082a8b0370ef3411f70cc6c6fc1f)) +* improve vertical centering of title slide ([6a14981](https://github.com/jolars/moloch/commit/6a149812409ce9072b785677fe562c5c80af22d4)) +* remove extraneous line space after minipage ([c0b9826](https://github.com/jolars/moloch/commit/c0b98267ac70d75d69c5114e93b15722849fe712)) +* remove extraneous space in frametitle continuation template ([66f7d83](https://github.com/jolars/moloch/commit/66f7d833a9e9e55626f38b2d3bc50303317a6b1c)) +* remove font configuration for bibliography; closes [#5](https://github.com/jolars/moloch/issues/5) ([ccd19fe](https://github.com/jolars/moloch/commit/ccd19fe2dd20f40813e07c96a88700d5844b6e5d)) + +## [0.2.0](https://github.com/jolars/moloch/compare/v0.1.0...v0.2.0) (2024-01-23) + + +### ⚠ BREAKING CHANGES + +* remove titleformat configuration +* use beamer's own frame numbering template + +### Features + +* remove titleformat configuration ([e19f93c](https://github.com/jolars/moloch/commit/e19f93c40a92ae28f5e7bf26cc48b68675501c89)) +* use beamer's own frame numbering template ([01b698c](https://github.com/jolars/moloch/commit/01b698c7838d2e09057a240054c3acb3c75be8dc)) + ## 0.1.0 (2024-01-15) diff --git a/Master/texmf-dist/doc/latex/moloch/README.md b/Master/texmf-dist/doc/latex/moloch/README.md index e5e0b235f20..f3b7971303c 100644 --- a/Master/texmf-dist/doc/latex/moloch/README.md +++ b/Master/texmf-dist/doc/latex/moloch/README.md @@ -1,5 +1,6 @@ -## Moloch +# Moloch +[![CTAN](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fctan.org%2Fjson%2F2.0%2Fpkg%2Fmoloch&query=%24.version.number&logo=latex&label=CTAN)](https://ctan.org/pkg/moloch) [![CI](https://github.com/jolars/moloch/actions/workflows/ci.yml/badge.svg)](https://github.com/jolars/moloch/actions/workflows/ci.yml) Moloch is a simple Beamer theme suitable for anyone to use. It is @@ -15,10 +16,19 @@ Do not expect this theme to be backwards compatible with the Metropolis theme. ## Installation -A CTAN release is planned, but for now you can install the theme manually from source. You need a working LaTeX installation with `l3build` installed. Then just follow these steps: +Moloch is on [CTAN](https://ctan.org/pkg/moloch), so you can install it using your favorite LaTeX package manager. For example, with `tlmgr`: -1. Clone the repository: `git clone https://github.com/jolars/moloch.git` -2. Install the package: `l3build install` +```sh +tlmgr install moloch +``` + +You can also install the theme from source, in which case you need a working LaTeX installation with `l3build` installed. Then just follow these steps: + +```sh +git clone https://github.com/jolars/moloch.git +cd moloch +l3build install +``` ## Usage @@ -58,3 +68,10 @@ Also, when writing commit messages, please use the [conventional commits format] ## Versioning The project uses [semantic versioning](https://semver.org). + +## Acknowledgments + +Almost all of **moloch** is a result of Mathias Vogelgesang's (@matze) hard work on the +**metropolis theme** (of which **moloch** is a fork). + +Thanks to @samcarter for the logo! diff --git a/Master/texmf-dist/doc/latex/moloch/moloch.pdf b/Master/texmf-dist/doc/latex/moloch/moloch.pdf index 0a6b90a3845..3607149cef9 100644 Binary files a/Master/texmf-dist/doc/latex/moloch/moloch.pdf and b/Master/texmf-dist/doc/latex/moloch/moloch.pdf differ diff --git a/Master/texmf-dist/doc/latex/moloch/moloch.tex b/Master/texmf-dist/doc/latex/moloch/moloch.tex index 94fd937a77b..a9eb3269333 100644 --- a/Master/texmf-dist/doc/latex/moloch/moloch.tex +++ b/Master/texmf-dist/doc/latex/moloch/moloch.tex @@ -82,7 +82,7 @@ \newcommand{\themename}{\textsf{moloch}\xspace} -\def\molochversion{0.1.0} % x-release-please-version +\def\molochversion{0.3.0} % x-release-please-version \usepackage{readprov} % \ReadPackageInfos{beamerthememoloch} @@ -244,6 +244,14 @@ The list of options is structured as shown in the following example. \subsubsection{Outer theme} +\DescribeOption{numbering}{none, counter, fraction}{}{ + \emph{This option is deprecated and will be removed in a future version. + Please use Beamer's |page number in head/foot| template instead.} + Controls whether the frame number at the bottom right of each slide is + omitted (|none|), shown (|counter|) or displayed as a fraction of the total + number of frames (|fraction|). +} + \DescribeOption{progressbar}{none, head, frametitle, foot}{none}{ Optionally adds a progress bar to the top of each frame (|head|), the bottom of each frame (|foot|), or directly below each frame title @@ -252,6 +260,11 @@ The list of options is structured as shown in the following example. \subsubsection{Color theme} +\DescribeOption{block}{transparent, fill}{transparent}{ + Optionally adds a light grey background to block environments like |theorem| + and |example|. +} + \DescribeOption{background}{dark, light}{light}{ Provides the option to have a dark background and light foreground instead of the reverse. 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 % % \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 % % \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 % % \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 % % \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 % % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty index 42190b3df5c..cf95d62b96b 100644 --- a/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty +++ b/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty @@ -23,8 +23,14 @@ %% --------------------------------------------------------------------------- %% Copyright 2024 Johan Larsson and contributors \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 \RequirePackage{pgfopts} +\pgfkeys{ + /moloch/color/block/.cd, + .is choice, + transparent/.code=\moloch@block@transparent, + fill/.code=\moloch@block@fill, +} \pgfkeys{ /moloch/color/background/.cd, .is choice, @@ -90,6 +96,30 @@ use=progress bar, parent=progress bar } +\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 @@ -98,6 +128,10 @@ 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{footnote}{fg=normal text.fg!90} +\setbeamercolor{footnote mark}{fg=.} \setbeamercolor{footnote}{fg=normal text.fg!90} \setbeamercolor{footnote mark}{fg=.} \setbeamercolor{bibliography entry author}{fg=, bg=} diff --git a/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty index 3da6faf5645..71b52aae8d7 100644 --- a/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty +++ b/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty @@ -23,7 +23,7 @@ %% --------------------------------------------------------------------------- %% Copyright 2024 Johan Larsson and contributors \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 \RequirePackage{pgfopts} \setbeamerfont{title}{size=\Large, series=\bfseries} \setbeamerfont{author}{size=\small} @@ -33,13 +33,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} \endinput %% diff --git a/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty index b0196387ebb..c64522e8a5b 100644 --- a/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty +++ b/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty @@ -23,7 +23,7 @@ %% --------------------------------------------------------------------------- %% Copyright 2024 Johan Larsson and contributors \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 \RequirePackage{keyval} \RequirePackage{calc} \RequirePackage{pgfopts} @@ -62,26 +62,20 @@ } \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}% } \def\maketitle{% \ifbeamer@inframe @@ -94,24 +88,21 @@ \usebeamertemplate{title page} } \setbeamertemplate{title graphic}{ - \vbox to 0pt { - \vspace*{2em} - \inserttitlegraphic% - }% - \nointerlineskip% + \inserttitlegraphic% + \par% + \vspace*{1em} } \setbeamertemplate{title}{ \raggedright% - \linespread{1.0}% \inserttitle% \par% - \vspace*{0.5em} + \vspace*{0.2em} } \setbeamertemplate{subtitle}{ \raggedright% \insertsubtitle% \par% - \vspace*{0.5em} + \vspace*{0.2em} } \newlength{\moloch@titleseparator@linewidth} \setlength{\moloch@titleseparator@linewidth}{0.4pt} @@ -122,19 +113,20 @@ \end{tikzpicture}% \tikzexternalenable% \par% + \vspace*{0.8em} } \setbeamertemplate{author}{ - \vspace*{2em} + \raggedright% \insertauthor% \par% + \vspace*{0.5em} } \setbeamertemplate{institute}{ - \vspace*{0.5em} \insertinstitute% \par% + \vspace*{1em} } \setbeamertemplate{date}{ - \vspace*{1.5em} \insertdate% \par% } @@ -232,10 +224,6 @@ \hbox to 0.8em{\hfil\insertfootnotemark}% \insertfootnotetext\par% } -\newlength{\moloch@parskip} -\setlength{\moloch@parskip}{0.5em} -\setlength{\parskip}{\moloch@parskip} -\linespread{1.15} \define@key{beamerframe}{c}[true]{% centered \beamer@frametopskip=0pt plus 1fill\relax% \beamer@framebottomskip=0pt plus 1fill\relax% 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} diff --git a/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty index f85ed23b5b8..ff2a2df3b70 100644 --- a/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty +++ b/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \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 \RequirePackage{pgfopts} \pgfkeys{/moloch/.cd, .search also={ -- cgit v1.2.3