diff options
author | Karl Berry <karl@freefriends.org> | 2025-02-12 21:08:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2025-02-12 21:08:46 +0000 |
commit | 0c3bdfb7cb9e2945a890bdba0dc7b26620bff33c (patch) | |
tree | 199c233a96d2f5a8c70ef93512cb7fdd5a815464 /Master | |
parent | 6a75575f7b4ea953d6903f16a0215620ca871b45 (diff) |
beamertheme-gotham (12feb25)
git-svn-id: svn://tug.org/texlive/trunk@73931 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
19 files changed, 906 insertions, 384 deletions
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md b/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md index a1e3695e158..d659207e8df 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md @@ -10,13 +10,13 @@ <!-- BADGES --> <p align="center"> <a href="https://ctan.org/pkg/beamertheme-gotham"><img src="https://img.shields.io/ctan/v/beamertheme-gotham?logo=LaTeX&logoColor=%23008080&color=%23008080"/></a> - <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/release/"><img src="https://img.shields.io/badge/Latest_Release-v1.2.0-FC6D26?logo=Gitlab&logoColor=%#FC6D26"/></a> + <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/release/"><img src="https://img.shields.io/badge/Latest_Release-v1.2.1-FC6D26?logo=Gitlab&logoColor=%#FC6D26"/></a> <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/pipelines?page=1&scope=all&ref=main"><img src="https://img.shields.io/gitlab/pipeline-status/RomainNOEL%2Fbeamertheme-gotham?branch=main&logo=githubactions&label=pipeline"/></a> <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/blob/main/LICENSE.txt"><img src="https://img.shields.io/badge/License-LPPL_1.3c-blue?logo=opensourceinitiative"/></a> <a href="https://gitlab.com/api/v4/projects/52144864/jobs/artifacts/main/raw/gotham.pdf?job=deploy-files"><img src="https://img.shields.io/badge/Documentation-PDF_online-green?logo=readthedocs"/></a> <a href="https://www.repostatus.org/lifecycle"><img src="https://img.shields.io/badge/repo_status-active-FC6D26?logo=framework&color=#F10001"/></a> </p> -<!-- Latest_Release-v1.2.0 Date: 2024-11-11 --> +<!-- Latest_Release-v1.2.1 Date: 2025-02-11 --> ## What is Gotham ? @@ -86,7 +86,7 @@ Several possibilities are available and tested: - download the `.sty` released zip files, - build from sources using `l3build`, - download or update from [CTAN](https://ctan.org/pkg/beamertheme-gotham), -- fork a example from [Overleaf](https://overleaf.com) . +- fork a example from [Overleaf](https://www.overleaf.com/read/ybdcnjxjrwgq#3ae7f9) . ### Download from release The zip file containing the `.sty` files is downloadable through our latest [release link](https://gitlab.com/RomainNOEL/beamertheme-gotham/-/releases/) diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann index e136a381f2a..1e339a47663 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann @@ -5,19 +5,14 @@ The `Gotham` package is a modern, minimal-ish, versatile and extendable theme fo +## Version: 1.2.1.c Date: 2025-02-11 -## Version: 1.2.0.a Date: 2024-11-11 - -### Breaking changes -- `standout template` option renamed to `standout BG template`. -- `\gothamFootlineOffset` length renamed `\gothamFootlineVOffset`. +### Fixes +- spacing vertical and horizontal between subsections toc. +- spacing vertical for sections with `gotham bullet` toc leading to an error with `minted` package ([https://gitlab.com/RomainNOEL/beamertheme-gotham/-/issues/4]). +- use of `minted` instead of `listings` for code highlighting in examples. ### News -- test with theorem from `thmtools`. -- add hook after colorset `\gothamHookPostColorBGSet`. -- add hook in footer `\gothamHookFooter` and add `\gothamFootlineHRightOffset` length. -- `standout template` option to change the whole page. - -### Fixes -- length of subtitle in title page of gotham-normal and gotham-splitvert -- primary palette typo
\ No newline at end of file +- add `\partpageOptions`, `\sectionpageOptions`, `\subsectionpageOptions`, `\subsubsectionpageOptions` controlling the frame options of parts and sections pages... +- add `\partpageTocOptions`, `\sectionpageTocOptions`, `\subsectionpageTocOptions`, `\subsubsectionpageTocOptions` controlling the frame options of the table of contents for parts and sections... +- add `\partTocOptions`, `\sectionTocOptions`, `\subsectionTocOptions`, `\subsubsectionTocOptions` controlling the options of table of contents for parts and sections...
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf Binary files differindex 6048764ed7e..8620fef1b9a 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf Binary files differindex a0feb189393..646b7e66033 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex index 02ddf9d8dcf..720d370acef 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex @@ -1,12 +1,12 @@ \documentclass{l3doc} - \usepackage[T1]{fontenc} + \usepackage[T1]{fontenc} \usepackage{pdfpages} \usepackage{standalone} % \usepackage{gotham} % \usepackage{readprov} % \ReadPackageInfos{beamerthemegotham} - \edef\GothamVersion{v1.2.0.a} %{\fileversion} - \edef\GothamDate{2024-11-11} %{\filedate} + \edef\GothamVersion{v1.2.1.c} %{\fileversion} + \edef\GothamDate{2025-02-11} %{\filedate} \usepackage{parskip} @@ -61,11 +61,20 @@ \usepackage{subcaption} % for subfigures \usepackage{cleveref} % for references - \providecommand{\defopt}[1]{default: #1}%{\underline{#1}} - \newenvironment{DescribeGothamOption}[3]{ - \DescribeOption{#1} % from l3doc + \providecommand{\defopt}[1]{\underline{#1}}%{default: #1}%{\underline{#1}} + \NewDocumentEnvironment{DescribeGothamOption}{ o m m m }{ + \DescribeOption{#2} % from l3doc + \IfNoValueTF{#1}{ + % true => left empty intentionally + }{ + \DescribeOption{% add extra info like added or updated dates to mimic 'function' env. + \rule[2.5ex]{\linewidth}{0.3pt} + \\[-3.5ex] + {\scriptsize #1 \hfill\ } + } + } \begin{minipage}[t]{\textwidth} - \textit{\textbf{\textcolor{tSec}{#2}}}\dotfill\,\defopt{#3}\par + \textit{\textbf{\textcolor{tSec}{#3}}}\dotfill\,\defopt{#4}\par \begingroup \vspace{0.5em} }{ @@ -388,7 +397,7 @@ % {list of possible values}{default}{ % A short description of the option. % }\end{DescribeGothamOption} - \begin{DescribeGothamOption}{standout template} + \begin{DescribeGothamOption}[added=2024-11-11]{standout template} {gotham, <your-name>}{gotham}{ Set the standin and stantout template to use when the |standin| or |stantout| frame option is activated. If you want to use your own template, this latter should be previously defined with: @@ -400,7 +409,7 @@ % {list of possible values}{default}{ % A short description of the option. % }\end{DescribeGothamOption} - \begin{DescribeGothamOption}{standout BG template} + \begin{DescribeGothamOption}[updated=2024-11-11]{standout BG template} {gotham, <your-name>}{gotham}{ Since most of the time the standin and standout are only varying from their backgrounds, \themename{} offers the possibility to change only and simply these local background through this option. This option sets the standin and stantout background template to use when the |standin| or |stantout| frame option is activated. @@ -851,13 +860,48 @@ % \begin{arguments} % \item |height| of the picture. % \end{arguments} - The command to change the title of frames containing part (or section or subsection) table of contents. + The command to change the title of frames containing part's (or section or subsection) table of contents. For example, you redefine this command through: \begin{lstlisting}[gobble=6] \renewcommand{\partContentName}{Part's agenda} \end{lstlisting} \end{function} + \begin{function}[added = 2025-01-06]{\partpageOptions, \sectionpageOptions, \subsectionpageOptions, \subsubsectionpageOptions} + % \begin{arguments} + % \item |height| of the picture. + % \end{arguments} + The commands to change the options of frames containing part's title (or section or subsection) at its start. + For example, you redefine this command through: + \begin{lstlisting}[gobble=6] + \renewcommand{\partpageOptions}{plain} + \end{lstlisting} + \end{function} + + \begin{function}[added = 2025-01-06]{\partpageTocOptions, \sectionpageTocOptions, \subsectionpageTocOptions}%, \subsubsectionpageTocOptions + % \begin{arguments} + % \item |height| of the picture. + % \end{arguments} + The command to change the options of frames containing part's (or section or subsection) table of contents. + For example, you redefine this command through: + \begin{lstlisting}[gobble=6] + \renewcommand{\partpageTocOptions}{nofooter} + \end{lstlisting} + \end{function} + + \begin{function}[added = 2025-01-06]{\partTocOptions, \sectionTocOptions, \subsectionTocOptions}%, \subsubsectionTocOptions + % \begin{arguments} + % \item |height| of the picture. + % \end{arguments} + The command to change the options for part's (or section or subsection) table of contents at the beginning of this part. + For example, you redefine this command through: + \begin{lstlisting}[gobble=6] + \renewcommand{\sectionTocOptions}{ + currentsection, hideallsubsections + } + \end{lstlisting} + \end{function} + \begin{variable}{gothamZerosectionframes} Boolean variable to flag if they are frame in a zeroth section. This variable helps to adapt the spreading of |mini frames nav| bar. @@ -876,7 +920,7 @@ \end{lstlisting} \end{variable} - \begin{function}{\gothamHookFooter} + \begin{function}[updated=2024-11-11]{\gothamHookFooter} % \begin{arguments} % \item |height| of the picture. % \end{arguments} @@ -889,7 +933,7 @@ \end{lstlisting} \end{function} - \begin{function}{\gothamHookPostColorBGSet} + \begin{function}[updated=2024-11-11]{\gothamHookPostColorBGSet} % \begin{arguments} % \item |height| of the picture. % \end{arguments} @@ -986,7 +1030,7 @@ |\gothamFootlineRuleHeight| controls the height and | \gothamFootlineRuleLength| the length of the rule used to delimit the footer. \end{variable} - \begin{variable}{\gothamFootlineHRightOffset, \gothamFootlineVOffset, \gothamFootlineHeight, \gothamFootlineDepth} + \begin{variable}[updated=2024-11-11]{\gothamFootlineHRightOffset, \gothamFootlineVOffset, \gothamFootlineHeight, \gothamFootlineDepth} |\gothamFootlineHRightOffset| is controlling the horizontal space between the right border of the page and the side of the footline. |\gothamFootlineVOffset| is controlling space between to bottom of the text (or the footnote) and the footline. |\gothamFootlineHeight| and |\gothamFootlineDepth| are controlling the height and depth of the footline baseline. @@ -1169,7 +1213,6 @@ \item Turn internal length into \_dim. \item Improve documentation. \item Add a hexagonal, wavy and add lengths on the blueprint layout backgrounds. - \item Remove calc package (that can be replaced by xfp or just fp). \item Remove colors from tests inner and outer. \item Replace the |\setbeamertemplate{yy}[default/xx]| by |\__gotham_inner_set_template:nn{title~page}| or merge them because the default values in dict/template are interesting but |\__gotham_inner_set_template| are simpler. \item add colorset more "blue-ish", "green-ish" ... from colorA etc. @@ -1189,37 +1232,44 @@ % \begin{documentation} -% \begin{macro|function|variable}{\nameMacro} -% \begin{syntax} -% \cs{nameMacro}\oarg{option1=value1, ...}\marg{gotham} -% \textrm{where the options are (default marked as} \defopt{default}\textrm{):} -% \meta{footer template} = \oarg{\defopt{gotham} \textbar ... } -% \end{syntax} -% Description of |nameMacro| which xxx. -% \end{macro|function|variable} +% \begin{macro|function|variable}[updated|added=2025-02-25]{\nameMacro} +% \begin{syntax} +% \cs{nameMacro}\oarg{option1=value1, ...}\marg{tempkg} +% \textrm{where the options are (default marked as} \defopt{default}\textrm{):} +% \meta{footer template} = \oarg{\defopt{tempkg} \textbar ... } +% \end{syntax} +% Description of |nameMacro| which xxx. +% \end{macro|function|variable} % \end{documentation} %%%% % \begin{implementation} -% \begin{macro|function|variable}{\nameMacro} -% \begin{arguments} -% \item |width| Name of the option to add, this name should also correspond to the name of the environment followed by the suffix 'env'. -% \end{arguments} +% \begin{macro|function|variable}[updated|added=2025-02-25]{\nameMacro} +% \begin{arguments} +% \item |width| Name of the option to add, this name should also correspond to the name of the environment followed by the suffix 'env'. +% \end{arguments} % Description +% \changes{v1.0.1}{2025-02-25}{original version} % \UnitTested % NOT FOR VARIABLES OF FUNCTIONS -% \TestFiles{gotham-test-xxx} % NOT FOR VARIABLES +% \TestFiles{tempkg-test-xxx} % NOT FOR VARIABLES % \begin{macrocode} - +%% MY CODE % \end{macrocode} -% \end{macro|function|variable} +% \end{macro|function|variable} % \end{implementation} + + % \begin{implementation} -% \begin{macro}{\nameMacro} +% \begin{macro}[updated|added=2025-02-25]{\nameMacro} +% \begin{arguments} +% \item |width| Name of the option to add, this name should also correspond to the name of the environment followed by the suffix 'env'. +% \end{arguments} % Description -% \UnitTested -% \TestFiles{gotham-test-048} +% \changes{v1.0.1}{2025-02-25}{original version} +% \UnitTested % NOT FOR VARIABLES OF FUNCTIONS +% \TestFiles{tempkg-test-xxx} % NOT FOR VARIABLES % \begin{macrocode} - +%% MY CODE % \end{macrocode} -% \end{macro} +% \end{macro} % \end{implementation}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf Binary files differindex 4d61d952ce9..56c726c6e2e 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex index 71bd8cf1e97..29155f4c1bd 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex @@ -1,27 +1,39 @@ \documentclass[aspectratio=169, 10pt]{beamer} \usetheme{gotham} - \gothamset{ - numbering= framenumber, - % tocframe template= gotham simple, - parttocframe default=off, - sectiontocframe default=off, - subsectiontocframe default=off, - } + \gothamset{ + numbering= framenumber, + % tocframe template= gotham simple, + parttocframe default=off, + sectiontocframe default=off, + subsectiontocframe default=off, + } \usepackage{standalone} \usepackage{tikz} \usepackage{pgfplots} \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least) \UseTblrLibrary{booktabs} % to load extra commands from booktabs - \usepackage{changepage} - - \usepackage{appendixnumberbeamer} - \usepackage[scale=2]{ccicons} - % \usepackage{pgfplots} - \usepgfplotslibrary{dateplot} - - \newcommand{\themename}{\textbf{\textsc{Gotham}}} + \usepackage{changepage} + \usepackage{appendixnumberbeamer} + \newcommand{\famName}[1]{\textsc{#1}} + \usepackage{minted} + \definecolor{codeback}{rgb}{0.90,0.91,0.92} + \definecolor{codebackdark}{rgb}{0.10,0.11,0.12} + \usemintedstyle{emacs} + \setmintedinline[tex]{bgcolor=codeback} + \setminted[tex]{ + autogobble, + bgcolor=codeback, + tabsize=4, + extrakeywords={usetheme,institute,maketitle,subtitle,gothamset,colorlet,setbeamercolor,plain,defbeamertemplate} + } + + \usepackage[scale=2]{ccicons} + % \usepackage{pgfplots} + \usepgfplotslibrary{dateplot} + + \newcommand{\themename}{\textbf{\textsc{Gotham}}} \title[]{Gotham} @@ -36,11 +48,11 @@ \maketitle - \begin{frame}[toc]{Table of contents}% - \tableofcontents%[hideallsubsections] - \end{frame} + \begin{frame}[toc]{Table of contents}% + \tableofcontents%[hideallsubsections] + \end{frame} - + %%%%%%%%%%%%%%%%%%%% %%% MAINMATTER %%% %%%%%%%%%%%%%%%%%%%% @@ -53,13 +65,13 @@ \appendix - \begin{frame}[fragile]{Backup slides} - Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions. + \begin{frame}[fragile]{Backup slides} + Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions. - The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides. + The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides. - \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix. - \end{frame} + \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix. + \end{frame} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf Binary files differindex e5eca503343..77c68978b82 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex index af6e53c6aba..e072f9fe775 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex @@ -1,28 +1,40 @@ \documentclass[aspectratio=43, 10pt]{beamer} \usetheme{gotham} - \gothamset{ - background=dark, - numbering= framenumber, - % tocframe template= gotham simple, - parttocframe default=off, - sectiontocframe default=off, - subsectiontocframe default=off, - } + \gothamset{ + background=dark, + numbering= framenumber, + % tocframe template= gotham simple, + parttocframe default=off, + sectiontocframe default=off, + subsectiontocframe default=off, + } \usepackage{standalone} \usepackage{tikz} \usepackage{pgfplots} \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least) \UseTblrLibrary{booktabs} % to load extra commands from booktabs - \usepackage{changepage} - - \usepackage{appendixnumberbeamer} - \usepackage[scale=2]{ccicons} - % \usepackage{pgfplots} - \usepgfplotslibrary{dateplot} - - \newcommand{\themename}{\textbf{\textsc{Gotham}}} + \usepackage{changepage} + \usepackage{appendixnumberbeamer} + \newcommand{\famName}[1]{\textsc{#1}} + \usepackage{minted} + \definecolor{codeback}{rgb}{0.90,0.91,0.92} + \definecolor{codebackdark}{rgb}{0.10,0.11,0.12} + \usemintedstyle{emacs} + \setmintedinline[tex]{bgcolor=codeback} + \setminted[tex]{ + autogobble, + bgcolor=codeback, + tabsize=4, + extrakeywords={usetheme,institute,maketitle,subtitle,gothamset,colorlet,setbeamercolor,plain,defbeamertemplate} + } + + \usepackage[scale=2]{ccicons} + % \usepackage{pgfplots} + \usepgfplotslibrary{dateplot} + + \newcommand{\themename}{\textbf{\textsc{Gotham}}} \title[]{Gotham} @@ -37,11 +49,11 @@ \maketitle - \begin{frame}[toc]{Table of contents}% - \tableofcontents%[hideallsubsections] - \end{frame} + \begin{frame}[toc]{Table of contents}% + \tableofcontents%[hideallsubsections] + \end{frame} - + %%%%%%%%%%%%%%%%%%%% %%% MAINMATTER %%% %%%%%%%%%%%%%%%%%%%% @@ -54,13 +66,13 @@ \appendix - \begin{frame}[fragile]{Backup slides} - Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions. + \begin{frame}[fragile]{Backup slides} + Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions. - The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides. + The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides. - \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix. - \end{frame} + \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix. + \end{frame} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf Binary files differindex beebdfbb2cf..cedf317dda3 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf Binary files differindex fe77dd5a176..03229dc762b 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf Binary files differindex 63fa4d5eb4a..772c89767d8 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex index 8267e1cf14f..4c237c99d42 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex @@ -4,49 +4,53 @@ \usepackage{standalone} \usepackage{tikz} \usepackage{pgfplots} - \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least) + \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least) \UseTblrLibrary{booktabs} % to load extra commands from booktabs \usepackage{changepage} + \usepackage{minted} + \definecolor{codeback}{rgb}{0.90,0.91,0.92} + \definecolor{codebackdark}{rgb}{0.10,0.11,0.12} + \newcommand{\famName}[1]{\textsc{#1}} \newcommand{\themename}{\textbf{\textsc{Gotham}}} -\begin{document} +\begin{document} \section{Gotham Theme} % FRAME - \begin{frame}[fragile]{Gotham} - - The \themename{} theme is a Beamer theme with a minimal-ish visual style largely inspired by the \href{https://github.com/matze/mtheme}{\textsc{Metropolis} Beamer Theme} by Matthias Vogelgesang (and some other Beamer themes). + \begin{frame}[fragile]{Gotham package} + + The \themename{} theme is a Beamer theme with a minimal-ish visual style largely inspired by the \href{https://github.com/matze/mtheme}{\textsc{Metropolis} Beamer Theme} by Matthias \famName{Vogelgesang} (and some other Beamer themes). Yet, \themename{} is highly extendable and versatile. \bigskip - + First, enable the theme by classically loading it: - - \begin{verbatim} + + \begin{minted}{tex} \documentclass{beamer} \usetheme{gotham} - \end{verbatim} - - Then, the all customization can be performed at any moment in the presentation using: + \end{minted} + + Then, all the customization can be performed at any moment in the presentation using: - \begin{verbatim} + \begin{minted}{tex} \gothamset{<option>=...} - \end{verbatim} + \end{minted} \end{frame} \subsection{Fonts} - % FRAME + % FRAME \begin{frame}[fragile]{Gotham title formats} Note, that you have to have Mozilla's \emph{Fira Sans} font and XeTeX or LuaTeX installed to enjoy this wonderful typography. \begin{columns}[T,onlytextwidth] \column{0.49\textwidth} - \themename{} supports 4 different title formats \verb|\gothamset{format frametitle=}| + \themename{} supports 4 different title formats \mintinline{tex}|\gothamset{format frametitle=}| \begin{itemize} \item regular \item \MakeLowercase{Lower} @@ -54,42 +58,36 @@ \item \MakeTitlecase{Title Case} \end{itemize} \column{0.49\textwidth} - \themename{} supports 3 different title shape \verb|\gothamset{shape frametitle=...}|: + \themename{} supports 3 different title shape \mintinline{tex}|\gothamset{shape frametitle=...}|: \begin{itemize} \item regular \item \textsc{Small caps} \item \textit{italic} \end{itemize} \end{columns} - + \vspace{2em} They can either be set at once for every title type or individually. \end{frame} - { \gothamset{shape frametitle=smallcaps, format frametitle=titlecase} + { \gothamset{format frametitle=upper, shape frametitle=italic} % FRAME - \begin{frame}{Titles: Small caps and titlecase} - This frame uses the title format options: \texttt{shape frametitle=smallcaps, format frametitle=titlecase}. - - \begin{alertblock}{Potential Problems} - Be aware that not every font supports small caps. - If for example you typeset your presentation with pdfTeX and the Computer Modern Sans Serif font, every text in small caps will be typeset with the Computer Modern Serif font instead. - Please refer to the documentation if you consider using it. - - As a rule of thumb: just use it for plaintext-only titles. - \end{alertblock} + \begin{frame}{Titles: Upper and italic} + This frame uses the title format options: \mintinline{tex}|format frametitle=upper|, \mintinline{tex}|shape frametitle=italic|. \end{frame} } - { \gothamset{format frametitle=upper, shape frametitle=italic} + { \gothamset{shape frametitle=smallcaps, format frametitle=titlecase} % FRAME - \begin{frame}{Titles: Upper and italic} - This frame uses the title format options: \texttt{format frametitle=upper, shape frametitle=smallcaps}. - - \begin{alertblock}{Potential problems} - As this title format also uses small caps you face the same problems as with the \texttt{smallcaps} title format. - Additionally this format can cause some other problems. + \begin{frame}{Titles: Small caps and titlecase} + This frame uses the title format options: \mintinline{tex}|shape frametitle=smallcaps|, \mintinline{tex}|format frametitle=titlecase|. + + \begin{alertblock}{Potential Problems} + Be aware that not every font supports small caps. + If for example you typeset your presentation with pdfTeX and the Computer Modern Sans Serif font, every text in \mintinline{tex}{smallcaps} will be typeset with the Computer Modern Serif font instead. Please refer to the documentation if you consider using it. + + As a rule of thumb: just use it for plaintext-only titles. \end{alertblock} \end{frame} } @@ -97,7 +95,7 @@ { \gothamset{format frametitle=lower} % FRAME \begin{frame}{Titles: LOWER and regular} - This frame uses the title format options: \texttt{format frametitle=lower, shape frametitle=regular}. + This frame uses the title format options: \mintinline{tex}{format frametitle=lower}, \mintinline{tex}{shape frametitle=regular}. \end{frame} } @@ -108,188 +106,210 @@ % FRAME \begin{frame}[fragile]{Presentation style via background color} The color mode (a.k.a. background color) can be changed using: - \begin{verbatim} \gothamset{background=dark | light | transparent} \end{verbatim} + \begin{minted}[bgcolor=codebackdark]{tex} + \gothamset{background=dark | light | transparent} + \end{minted} \end{frame} } - % FRAME + % FRAME \begin{frame}[fragile]{Blocks} Three different block environments are pre-defined and may be styled with an optional background color. - + \begin{columns}[T,onlytextwidth] - \column{0.3\textwidth} - \begin{verbatim}\gothamset{ - block=native}\end{verbatim} + \column{0.3\textwidth} + \begin{minted}{tex} + \gothamset{ + block=native} + \end{minted} - \begin{block}{Default} - Block content. - \end{block} - - \begin{alertblock}{Alert} - Block content. - \end{alertblock} - - \begin{exampleblock}{Example} - Block content. - \end{exampleblock} - - \column{0.3\textwidth} - - \gothamset{block=transparent} - \begin{verbatim}\gothamset{ - block=transparent}\end{verbatim} - - \begin{block}{Default} - Block content. - \end{block} - - \begin{alertblock}{Alert} - Block content. - \end{alertblock} - - \begin{exampleblock}{Example} - Block content. - \end{exampleblock} + \gothamset{block=native} + \begin{block}{Default} + Block content. + \end{block} + + \begin{alertblock}{Alert} + Block content. + \end{alertblock} + + \begin{exampleblock}{Example} + Block content. + \end{exampleblock} \column{0.3\textwidth} - - \gothamset{block=fill} - \begin{verbatim}\gothamset{ - block=fill}\end{verbatim} - - \begin{block}{Default} - Block content. - \end{block} - - \begin{alertblock}{Alert} - Block content. - \end{alertblock} - - \begin{exampleblock}{Example} - Block content. - \end{exampleblock} - + + \gothamset{block=transparent} + \begin{minted}{tex} + \gothamset{ + block=transparent} + \end{minted} + + \begin{block}{Default} + Block content. + \end{block} + + \begin{alertblock}{Alert} + Block content. + \end{alertblock} + + \begin{exampleblock}{Example} + Block content. + \end{exampleblock} + + \column{0.3\textwidth} + + \gothamset{block=fill} + \begin{minted}{tex} + \gothamset{ + block=fill} + \end{minted} + + \begin{block}{Default} + Block content. + \end{block} + + \begin{alertblock}{Alert} + Block content. + \end{alertblock} + + \begin{exampleblock}{Example} + Block content. + \end{exampleblock} + \end{columns} \end{frame} + {\gothamset{colorset=red} % FRAME \begin{frame}[fragile]{Color customization} - The colors can be changed using: - \begin{verbatim} - \colorlet{colorPale}{gPaleYell} % BG in light/normal mode - \colorlet{colorDark}{gDarkBlack} % FG in light/normal mode - \colorlet{colorA}{gDarkTeal} % frametitle, standin.out, - \colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in, - \colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks - \colorlet{colorC}{gDeepYellOr} % progress bar - \colorlet{colorD}{gLightOrange} % alert - \colorlet{colorE}{gLightGreen} % example - \end{verbatim} + The color theme can be used only in preamble with \mintinline{tex}|\usecolortheme{wolverine}| and without guarantees on the visual aspect. + + \themename{} offers predefined color setup at any time through \mintinline{tex}|\gothamset{colorset=red}| + + Otherwise, the colors can be changed manually using: + \begin{minted}{tex} + \colorlet{colorPale}{gPaleYell} % BG in light/normal mode + \colorlet{colorDark}{gDarkBlack} % FG in light/normal mode + \colorlet{colorA}{gDarkTeal} % frametitle, standin.out, + \colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in, + \colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks + \colorlet{colorC}{gDeepYellOr} % progress bar + \colorlet{colorD}{gLightOrange} % alert + \colorlet{colorE}{gLightGreen} % example + \end{minted} \end{frame} + } \subsection{Inner} % FRAME \begin{frame}[fragile]{Title page} - \themename{} offers the possibility to adapt the title page layout (printed with \verb|\maketitle| or \verb|\titlepage|). + \themename{} offers the possibility to adapt the title page layout (printed with \mintinline{tex}|\maketitle| or \mintinline{tex}|\titlepage|). This can be achieved using: + \begin{minted}{tex} + \defbeamertemplate{title page}{your name}{your defintion} + \gothamset{title page= your name} + \end{minted} - \begin{verbatim} \defbeamertemplate{title page}{your name}{your defintion} - \gothamset{title page= your name}\end{verbatim} - - \themename{} also predefined several templates such as: - \verb$gotham normal | gotham splitvert | gotham dividedpic$ \verb$| gotham reversed$ + \themename{} also predefined several templates such as: + \mintinline{tex}$gotham normal$ | \mintinline{tex}$gotham splitvert$ | \mintinline{tex}$gotham dividedpic$ | \mintinline{tex}$gotham reversed$ \end{frame} % FRAME \begin{frame}[fragile]{Table of contents} - \themename{} come with the possibility to apply different style for your table of contents (ToC) page. + \themename{} comes with the possibility to apply different styles for your table of contents (ToC) page. You can define your own ToC style as it follows: - \begin{verbatim} + \begin{minted}{tex} \defbeamertemplate{toc page}{your name}{your def} \gothamset{tocframe template= your name} - \end{verbatim} - Then, referring to this template using the frame option \verb|[toc]| in your presentation: - \begin{verbatim} + \end{minted} + Then, referring to this template using the frame option \mintinline{tex}|[toc]| in your presentation: + \begin{minted}{tex} \begin{frame}[toc]{Table of contents} \tableofcontents%[hideallsubsections] - \end{frame }\end{verbatim} + \end{frame } + \end{minted} - Or using one of the \themename{} predefined template, such as: \verb$gotham simple | gotham bullet$ + Or using one of the \themename{} predefined templates, such as: \mintinline{tex}$gotham simple | gotham bullet$ \end{frame} % FRAME \begin{frame}[fragile]{Sections} - \themename{} provides a multiple options to tune sections (respectively \verb|part|, \verb|section|, \verb|subsection| and \verb|subsubsection|). - Thus, using the setting controls: - - The section command \verb|\section{Elements}| from Beamer will appear very differently. - The section page will appear or disappear thanks to: \verb$\gothamset{sectionframe default=<on|off>}$, while its layout (when appearing) is controlled by: - \begin{verbatim} + \themename{} provides a multiple options to tune sections (respectively \mintinline{tex}|part|, \mintinline{tex}|section|, \mintinline{tex}|subsection| and \mintinline{tex}|subsubsection|). + + The section command \mintinline{tex}|\section{Elements}| from Beamer will appear very different. + The section page will appear or disappear thanks to: \mintinline{tex}$\gothamset{sectionframe default=<on|off>}$, while its layout (when appearing) is controlled by: + \begin{minted}{tex} \defbeamertemplate{part|sub|subsub|section frame} {your name}{your def} - \gothamset{sectionframe template= your name}\end{verbatim} + \gothamset{sectionframe template= your name} + \end{minted} - \themename{} predefined template are: \verb$gotham progressbar | gotham simple |$ \verb$gotham splitvert progressbar |$ \verb$gotham splitvert simple | gotham progressvert$ + \themename{} predefined template are: \mintinline{tex}$gotham progressbar | gotham simple |$ \mintinline{tex}$gotham splitvert progressbar |$ \mintinline{tex}$gotham splitvert simple | gotham progressvert$ \end{frame} % FRAME \begin{frame}[fragile]{Sections contents} - After the section page, you can (de)activate a page with table of contents in the section using \verb$\gothamset{sectiontocframe default=<on|off>}$, and its layout is controlled by: - \begin{verbatim} + After the section page, you can (de)activate a page with a table of contents for the section using \mintinline{tex}$\gothamset{sectiontocframe default=<on|off>}$, and its layout is controlled by: + \begin{minted}{tex} \defbeamertemplate{toc subsection frame}{your name}{your def} \gothamset{sectionframe template= your name} - \end{verbatim} + \end{minted} - \themename{} predefined template are: \verb$gotham simple | gotham bullet$ + \themename{} predefined template are: \mintinline{tex}$gotham simple | gotham bullet$ \end{frame} % FRAME \begin{frame}[fragile, watermark]{Watermark} With \themename{} you can locally or globally add watermark to your slides by using: - \begin{verbatim} \defbeamertemplate{background}{watermark/your name}{your def} - \gothamset{watermark template= your name}\end{verbatim} - - Then, this watermark can be turn on locally using \verb|\begin{frame}[watermark]| or globally with \verb|\gothamset{watermark default= on}| . - \end{frame} + \begin{minted}{tex} + \defbeamertemplate{background}{watermark/your name}{your def} + \gothamset{watermark template= your name} + \end{minted} + + Then, this watermark can be turned on locally using \mintinline{tex}|\begin{frame}[watermark]| or globally with \mintinline{tex}|\gothamset{watermark default= on}| . + \end{frame} % FRAME \begin{standinenv} \begin{frame}[fragile]{Standin} - \themename{} comes with 2 environments/specials layouts named \verb|standin| and \verb|standout|. - These specials layouts can be used to emphasize some content or last slide\textellipsis + \themename{} comes with 2 environments/special layouts named \mintinline{tex}|standin| and \mintinline{tex}|standout|. + These special layouts can be used to emphasize some content or last slide\textellipsis - This layout can be turn on using \verb|\begin{frame}[standin]| or using the dedicated environment (\verb|\begin{standinenv}\begin{frame}...\end{frame}\end{standinenv}|). + This layout can be turned on using \mintinline{tex}|\begin{frame}[standin]| or using the dedicated environment (\mintinline{tex}|\begin{standinenv}\begin{frame}...\end{frame}\end{standinenv}|). Note that the background can also be tuned using: - \begin{verbatim} \defbeamertemplate{background canvas}{standin/name}{your def} - \gothamset{standin BG template= name}\end{verbatim} - + \begin{minted}{tex} + \defbeamertemplate{background canvas}{standin/name}{your def} + \gothamset{standin BG template= name} + \end{minted} + \end{frame} \end{standinenv} % FRAME \begin{frame}[standout, watermark]{Standout} - Here is an example of standout (working as standin), that can be combined with a watermark. + Here is an example of standout (working as standin), which can be combined with a watermark. Another difference, apart the obvious color change is the font size and series. \end{frame} \subsection{Outer} - - {% - \setbeamertemplate{frame footer}{My custom footer} + + {\setbeamertemplate{frame footer}{My custom footer} % FRAME \begin{frame}[fragile]{Frame footer} - \themename{} defines a custom Beamer template to add a text to the footer. + \themename{} defines a custom Beamer template to add a text to the footer. It can be set via - \begin{verbatim}\setbeamertemplate{frame footer}{My custom footer}\end{verbatim} + \begin{minted}{tex} + \setbeamertemplate{frame footer}{My custom footer} + \end{minted} - Even after redefining (or not) your frame footer template, you can locally remove it with the frame option \verb|\begin{frame}[nofooter]|. + Even after redefining (or not) your frame footer template, you can locally remove it with the frame option \mintinline{tex}|\begin{frame}[nofooter]|. \end{frame} } @@ -298,15 +318,19 @@ \author[your shortauthor name]{Romain NOËL} % FRAME \begin{frame}[fragile, rotateFooter]{rotateFooter} - The default footer from \themename{}, it displays the \verb|shortdate|, \verb|shorttitle| and \verb|shortauthor|. + The default footer from \themename{}, it displays the \mintinline{tex}|shortdate|, \mintinline{tex}|shorttitle| and \mintinline{tex}|shortauthor|. So by filling these fields in your document setup, you will see them appear in your footer: - \begin{verbatim} \title[your shorttitle]{Your title} + \begin{minted}{tex} + \title[your shorttitle]{Your title} \date[shortdate]{\today} - \author[your shortauthor name]{John DOE} \end{verbatim} - - Since, we always need some extra space on some frames that would like to overlay a bit the footer, \themename{}'s footer offers also possibility to be put on side locally using \verb|\begin{frame}[rotateFooter]|, or globally with - \begin{verbatim} \gothamset{rotateFooter default=on} \end{verbatim} - If it has set globally, it can be deactivated locally with the frame option \verb|\begin{frame}[norotateFooter]|. + \author[your shortauthor name]{John DOE} + \end{minted} + + Since we always need some extra space on some frames that would like to overlay a bit the footer, \themename{}'s footer also offers possibility to be put locally on the side using \mintinline{tex}|\begin{frame}[rotateFooter]|, or globally with + \begin{minted}{tex} + \gothamset{rotateFooter default=on} + \end{minted} + If it has set globally, it can be deactivated locally with the frame option \mintinline{tex}|\begin{frame}[norotateFooter]|. \end{frame} \title[]{Gotham} @@ -316,74 +340,77 @@ } % FRAME \begin{frame}[edging, fragile]{Edging} - \themename{} has two hook commands, \verb|\gothamRightFiligrane| and \verb|\gothamLeftFiligrane|, that can be redefined to customize what to display in the edgings (a.k.a. filigrane, a.k.a. sidebar). - As example, one could do: - \begin{verbatim} + \themename{} has two hook commands, \mintinline{tex}|\gothamRightFiligrane| and \mintinline{tex}|\gothamLeftFiligrane|, that can be redefined to customize what to display in the edgings (a.k.a. filigrane, a.k.a. sidebar). + As an example, one could do: + \begin{minted}{tex} \renewcommand{\gothamRightFiligrane}{% \rotatebox{90}{gotham right filigrane pattern} - }\end{verbatim} + } + \end{minted} - Then, to set if it should be displayed or not, globally \begin{verbatim} \gothamset{edging default=on} \end{verbatim} - or locally with the frame option \verb|\begin{frame}[edging]| or \verb|\begin{frame}[noedging]|. + Then, to set if it should be displayed or not, globally + \begin{minted}{tex} + \gothamset{edging default=on} + \end{minted} + or locally with the frame option \mintinline{tex}|\begin{frame}[edging]| or \mintinline{tex}|\begin{frame}[noedging]|. \end{frame} % FRAME % \begin{nofootlineenv} \begin{frame}[fragile,noedging,nofooter]{Really wide contents} \begin{adjustwidth}{-2em}{-2em} - If you want a really wide content in your frame, you can change the size of your margin (requires \verb|\usepackage{changepage}| in your preamble). - You can also suppress the edging (\verb|[noedging]|) and footer (\verb|[nofooter]|) or even more radically footline (\verb|[nofootline]|). + If you want a really wide content in your frame, you can change the size of your margin (requires \mintinline{tex}|\usepackage{changepage}| in your preamble). + You can also suppress the edging (\mintinline{tex}|[noedging]|) and footer (\mintinline{tex}|[nofooter]|) or even more radically footline (\mintinline{tex}|[nofootline]|). - Here is an example combining them: - \begin{verbatim} + Here is an example combining them: + \begin{minted}{tex} \begin{frame}[noedging,nofootline]{extended frame} \begin{adjustwidth}{-2em}{-2em}% 2em extra to the left and 2em for right margin. wide content \end{adjustwidth} \end{frame } - \end{verbatim} + \end{minted} \end{adjustwidth} \end{frame} % \end{nofootlineenv} {% \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{% - \includegraphics[height=#1]{gotham-logo.pdf} - } + \includegraphics[height=#1]{gotham-logo.pdf} + } \logo{extra LOGO} % FRAME \begin{frame}[fragile]{Frametitle} \framesubtitle{with a subtitle} - The frametile template brought by \themename{} is relatively classic: it supports \verb|\subframetitle| and frame continuation (with \verb|[allowframebreaks]|) through templates that can be tuned. - Nevertheless, it the frametitle template also includes a hook for your institute logo in the top right corner, leaving the command \verb|\logo{}| free for your extra logos. - + The frametile template brought by \themename{} is relatively classic: it supports \mintinline{tex}|\subframetitle| and frame continuation (with \mintinline{tex}|[allowframebreaks]|) through templates that can be tuned. + Nevertheless, it the frametitle template also includes a hook for your institute logo in the top right corner, leaving the command \mintinline{tex}|\logo{}| free for your extra logos. + So, one can have both logos using: - \begin{verbatim} + \begin{minted}{tex} \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{ \includegraphics[height=#1]{gotham-logo.pdf} } \logo{extra LOGO} - \end{verbatim} + \end{minted} \end{frame} } \author[]{Romain NOËL} - {% - \gothamset{progressbar position=foot, numbering= totalframenumber} + {\gothamset{progressbar position=left, progressbar style= rounded box, progressbar advancement= brlt, numbering= circle} % FRAME \begin{frame}[fragile]{Numbering and progressbar} - \themename{} theme can numbering your frames in the bottom right corner using different styles. + \themename{} theme can numbering your frames in the bottom right corner using different styles. You can also decide to use a progression bar to indicate how much of your presentation remains. The setup of numbering and progression bar can be performed through: - \begin{verbatim} + \begin{minted}{tex} \gothamset{numbering= totalframenumber, progressbar position=foot} - \end{verbatim} + \end{minted} - Numbering available options are: \verb$none | framenumber | totalframenumber | appendixframenumber | pagenumber | totalpagenumber | circle$ + Numbering available options are: \mintinline{tex}$none | framenumber | totalframenumber | appendixframenumber | pagenumber $ \mintinline{tex}$| totalpagenumber | circle$ - Progressbar position available options are: \verb$none | head | frametitle | foot | circlehead$ + Progressbar position available options are: \mintinline{tex}$none | head | frametitle | foot | circlehead | left | right$ \end{frame} } diff --git a/Master/texmf-dist/source/latex/beamertheme-gotham/gotham.dtx b/Master/texmf-dist/source/latex/beamertheme-gotham/gotham.dtx index 896f9ce9776..e88a13ea34f 100644 --- a/Master/texmf-dist/source/latex/beamertheme-gotham/gotham.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-gotham/gotham.dtx @@ -23,7 +23,7 @@ \input expl3-generic \relax %</internal> %<class>\NeedsTeXFormat{LaTeX3e} -%<package>\ProvidesExplPackage{beamerthemegotham}{2024-11-11}{1.2.0.a}{A modern, minimal-ish, versatile and extendable yet robust theme for Beamer} +%<package>\ProvidesExplPackage{beamerthemegotham}{2025-02-11}{1.2.1.c}{A modern, minimal-ish, versatile and extendable yet robust theme for Beamer} %<author>Romain NOEL</author> %<maintainer>Romain NOEL</maintainer> %<url>https://gitlab.com/RomainNOEL/beamertheme-gotham</url> @@ -39,8 +39,8 @@ % \usepackage{gotham} % \usepackage{readprov} % \ReadPackageInfos{beamerthemegotham} - \edef\GothamVersion{v1.2.0.a} %{\fileversion} - \edef\GothamDate{2024-11-11} %{\filedate} + \edef\GothamVersion{v1.2.1.c} %{\fileversion} + \edef\GothamDate{2025-02-11} %{\filedate} \usepackage{parskip} \usepackage{setspace} @@ -92,12 +92,20 @@ \usepackage{subcaption} % For subfigures \usepackage{cleveref} % for references - \providecommand{\defopt}[1]{default: #1}%{\underline{#1}} - % \DescribeGothamOption{optionName}{possible values}{default value}{descrption} - \newenvironment{DescribeGothamOption}[3]{ - \DescribeOption{#1} % from l3doc + \providecommand{\defopt}[1]{\underline{#1}}%{default: #1}%{\underline{#1}} + \NewDocumentEnvironment{DescribeGothamOption}{ o m m m }{ + \DescribeOption{#2} % from l3doc + \IfNoValueTF{#1}{ + % true => left empty intentionally + }{ + \DescribeOption{% add extra info like added or updated dates to mimic 'function' env. + \rule[2.5ex]{\linewidth}{0.3pt} + \\[-3.5ex] + {\scriptsize #1 \hfill\ } + } + } \begin{minipage}[t]{\textwidth} - \textit{\textbf{\textcolor{tSec}{#2}}}\dotfill\,\defopt{#3}\par + \textit{\textbf{\textcolor{tSec}{#3}}}\dotfill\,\defopt{#4}\par \begingroup \vspace{0.5em} }{ @@ -188,10 +196,10 @@ %\begin{implementation} % \begin{macrocode} %<*font> -\ProvidesExplPackage{beamerfontthemegotham}{2024-11-11}{1.2.0.a}{gotham font theme} +\ProvidesExplPackage{beamerfontthemegotham}{2025-02-11}{1.2.1.c}{gotham font theme} \RequirePackage{expl3} -\RequirePackage{xparse} -\RequirePackage{etoolbox} +% \RequirePackage{xparse} +% \RequirePackage{etoolbox} \RequirePackage{ifxetex} \RequirePackage{ifluatex} % \end{macrocode} @@ -205,7 +213,7 @@ % \begin{implementation} % \begin{variable}{font messages} % Definition of the messages that are used and reused by font theme. -% \changes{v0.2.0}{2024/01/25}{New} +% \changes{v0.2.0}{2024-01-25}{New} % \begin{macrocode} \msg_new:nnn { gotham } { font-not-found } { @@ -303,7 +311,7 @@ \RequirePackage[no-math]{fontspec} } % - % We search for regular, italic, light, light italic,fonts under the default |Fira Sans| names. + % We search for regular, italic, light, light italic, fonts under the default |Fira Sans| names. \iffontsavailable{FiraSans-Light.otf, FiraSans-LightItalic.otf, FiraSans-Regular.otf, @@ -313,6 +321,7 @@ BoldFont={FiraSans-Regular.otf}, BoldItalicFont={FiraSans-Italic.otf}] {FiraSans-Light.otf} + \renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ % If this fails, the suffix OT --- used by some Linux distributions --- will be tried. \iffontsavailable{FiraSans~Light~OT, @@ -324,6 +333,7 @@ BoldFont={Fira~Sans~Regular~OT}, BoldItalicFont={Fira~Sans~Italic~OT}] {Fira~Sans~Light~OT} + \renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ % If this also fails, a warning will be displayed and the standard fonts will be used. \msg_warning:nn { gotham } { fonts-not-available }% @@ -337,6 +347,7 @@ % If this fails, the suffix OT --- used by some Linux distributions --- will be tried. \iffontsavailable{Fira~Mono~Medium~OT, Fira~Mono~Bold~OT}{ \setmonofont[BoldFont={Fira~Mono~Medium~OT}]{Fira~Mono~Bold~OT} + \renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ % If this also fails, a warning will be displayed and the standard fonts will be used. \msg_warning:nn { gotham } { fonts-not-available } @@ -973,9 +984,9 @@ %\begin{implementation} % \begin{macrocode} %<*color> -\ProvidesExplPackage{beamercolorthemegotham}{2024-11-11}{1.2.0.a}{Gotham color theme} +\ProvidesExplPackage{beamercolorthemegotham}{2025-02-11}{1.2.1.c}{Gotham color theme} \RequirePackage{expl3} -\RequirePackage{xparse} +% \RequirePackage{xparse} \RequirePackage{xcolor} % \end{macrocode} % \end{implementation} @@ -1578,10 +1589,11 @@ %\begin{implementation} % \begin{macrocode} %<*inner> -\ProvidesExplPackage{beamerinnerthemegotham}{2024-11-11}{1.2.0.a}{gotham inner theme} +\ProvidesExplPackage{beamerinnerthemegotham}{2025-02-11}{1.2.1.c}{gotham inner theme} \RequirePackage{expl3} -\RequirePackage{xparse} +% \RequirePackage{xparse} \RequirePackage{calc} +% \RequirePackage{xfp} \RequirePackage{tikz} % \end{macrocode} % \end{implementation} @@ -2959,7 +2971,17 @@ \providebool{subsectionContent} \booltrue{subsectionContent} \providecommand{\subsecContentName}{Subsection~content} +% \end{macrocode} +% \end{variable} +% \end{implementation} +% \begin{implementation} +% \begin{variable}{\providebool{subsubsectionContent}, \subsubsecContentName} +% Boolean variable to enable the table of contents of the subsubsection, and the command containing the 'table of contents' title. +% \begin{macrocode} % Subsubsection is not useful (at least up to understanding of the moment) because we do not display frame with the content of a subsubsection since it is the small unity we are working with. +\providebool{subsubsectionContent} +\booltrue{subsubsectionContent} +\providecommand{\subsubsecContentName}{Subsubsection~content} % \end{macrocode} % \end{variable} % \end{implementation} @@ -3003,10 +3025,81 @@ % \end{macro} % \end{implementation} +% \begin{documentation} +% \begin{variable}[added=2025-01-06]{\partpageOptions, \sectionpageOptions, \subsectionpageOptions, \subsubsectionpageOptions} +% Variable commands that contain the coma-separated list of options which are given to the partpage (respectively to the section, subsection and subsubsection). +% \end{variable} +% \end{documentation} +%%%% +% \begin{implementation} +% \begin{variable}[added=2025-01-06]{\partpageOptions, \sectionpageOptions, \subsectionpageOptions, \subsubsectionpageOptions} +% Options used in |\begin{frame}[\partpageOptions,part]{\partpage}...| . +% TESTED in gotham-test-1039 +% \changes{v1.2.1}{2025-01-06}{newly introduced} +% \begin{macrocode} +\providecommand{\partpageOptions}{noframenumbering} +\providecommand{\sectionpageOptions}{noframenumbering} +\providecommand{\subsectionpageOptions}{noframenumbering} +\providecommand{\subsubsectionpageOptions}{noframenumbering} +% \end{macrocode} +% \end{variable} +% \end{implementation} + +% \begin{documentation} +% \begin{variable}[added=2025-01-06]{\partpageTocOptions, \sectionpageTocOptions, \subsectionpageTocOptions, \subsubsectionpageTocOptions} +% Variable commands that contain the coma-separated list of options which are given to the table of contents page at the begin of a part (respectively to the section, subsection and subsubsection). +% \end{variable} +% \end{documentation} +%%%% % \begin{implementation} -% \begin{function}{\__gotham_inner_disable_partpage:, \__gotham_inner_enable_partpage:} -% Commands to disable or enable the display of a 'part page' frame at the begining of every new part. -% It replaces the |\newcommand{\gotham@disablepartpage}| and | \newcommand{\gotham@enablepartpage}| +% \begin{variable}[added=2025-01-06]{\partpageTocOptions, \sectionpageTocOptions, \subsectionpageTocOptions, \subsubsectionpageTocOptions} +% Options used in |\begin{frame}[\partpageTocOptions,tocpart]{toc part page...}| . +% TESTED in gotham-test-1039 +% \changes{v1.2.1}{2025-01-06}{newly introduced} +% \begin{macrocode} +\providecommand{\partpageTocOptions}{noframenumbering} +\providecommand{\sectionpageTocOptions}{noframenumbering} +\providecommand{\subsectionpageTocOptions}{noframenumbering} +% \providecommand{\subsubsectionpageTocOptions}{noframenumbering} +% \end{macrocode} +% \end{variable} +% \end{implementation} + +% \begin{documentation} +% \begin{variable}[added=2025-01-06]{\partTocOptions, \sectionTocOptions, \subsectionTocOptions, \subsubsectionTocOptions} +% Variable commands that contain the coma-separated list of options which are given to the table of content at the beginning of a part (respectively to the section, subsection and subsubsection). +% \end{variable} +% \end{documentation} +%%%% +% \begin{implementation} +% \begin{variable}[added=2025-01-06]{\partTocOptions, \sectionTocOptions, \subsectionTocOptions, \subsubsectionTocOptions} +% Options used in |\tableofcontents[\partTocOptions]| . +% TESTED in gotham-test-1039 +% \changes{v1.2.1}{2025-01-06}{newly introduced} +% \begin{macrocode} +\providecommand{\partTocOptions}{} +\providecommand{\sectionTocOptions}{ + currentsection, currentsubsection, + hideothersubsections, + sectionstyle=show/shaded, +} +\providecommand{\subsectionTocOptions}{ + currentsection, currentsubsection, + % currentsubsubsection, + hideothersubsections, + sectionstyle=show/shaded, + subsectionstyle=show/shaded/hide, + subsubsectionstyle=show/show/hide, +} +% \providecommand{\subsubsectionTocOptions}{} +% \end{macrocode} +% \end{variable} +% \end{implementation} + +% \begin{implementation} +% \begin{function}[updated=2025-01-06]{\__gotham_inner_disable_partpage:, \__gotham_inner_enable_partpage:} +% Commands to disable or enable the display of a 'part page' frame at the beginning of every new part. +% \changes{v1.2.1}{2025-01-06}{includes new variables} % \TestFiles{gotham-test-041} % \begin{macrocode} \cs_new_protected:Nn \__gotham_inner_disable_partpage: @@ -3022,14 +3115,32 @@ \ifbeamer@inframe \partpage \else - \frame[c, noframenumbering, part]{\partpage} + \ifdefempty{\partpageOptions}{ + % empty command + \frame[c, part]{\partpage} + }{ + % non-empty command + \frame[c, \expandafter\partpageOptions, part]{\partpage} + } \fi \ifbool{partContent}{ % true - \begin{frame}[noframenumbering, tocpart] - \frametitle{\partContentName} - \tableofcontents[part=\thepart] + \ifdefempty{\partpageTocOptions}{ + % empty command + \begin{frame}[tocpart] + }{ + % non-empty command + \begin{frame}[tocpart, \expandafter\partpageTocOptions] + } + \ifdefempty{\partContentName}{}{\frametitle{\partContentName}} + \ifdefempty{\partTocOptions}{ + % empty command + \tableofcontents[part=\thepart] + }{ + % non-empty command + \expandafter\tableofcontents[part=\thepart, \expandafter\partTocOptions] + } \end{frame} }{ % else empty @@ -3041,9 +3152,9 @@ % \end{implementation} % \begin{implementation} -% \begin{function}{\__gotham_inner_disable_sectionpage:, \__gotham_inner_enable_sectionpage:} -% Commands to disable or enable the display of a 'section page' frame at the begining of every new section. -% It replaces the |\newcommand{\gotham@disablesectionpage}| and | \newcommand{\gotham@enablesectionpage}| +% \begin{function}[updated=2025-01-06]{\__gotham_inner_disable_sectionpage:, \__gotham_inner_enable_sectionpage:} +% Commands to disable or enable the display of a 'section page' frame at the beginning of every new section. +% \changes{v1.2.1}{2025-01-06}{includes new variables} % \TestFiles{gotham-test-041} % \begin{macrocode} \cs_new_protected:Nn \__gotham_inner_disable_sectionpage: @@ -3059,21 +3170,31 @@ \ifbeamer@inframe \sectionpage \else - \frame[c, noframenumbering, section]{\sectionpage} + \ifdefempty{\sectionpageOptions}{ + % empty command + \frame[c, section]{\sectionpage} + }{ + % non-empty command + \frame[c, \expandafter\sectionpageOptions, section]{\sectionpage} + } \fi \ifbool{sectionContent}{ % true - \begin{frame}[noframenumbering, tocsec] - \frametitle{\secContentName} - {\tableofcontents[currentsection, currentsubsection, - hideothersubsections, - sectionstyle=show/shaded, - ] + \ifdefempty{\sectionpageTocOptions}{ + % empty command + \begin{frame}[tocsec] + }{ + % non-empty command + \begin{frame}[\expandafter\sectionpageTocOptions, tocsec] + } + \ifdefempty{\secContentName}{}{\frametitle{\secContentName}} + { + \expandafter\tableofcontents\expandafter[\sectionTocOptions] } \end{frame} }{ - % else empty + % else empty } } } @@ -3082,9 +3203,9 @@ % \end{implementation} % \begin{implementation} -% \begin{function}{\__gotham_inner_disable_subsectionpage:, \__gotham_inner_enable_subsectionpage:} -% Commands to disable or enable the display of a 'subsection page' frame at the begining of every new subsection. -% It replaces the |\newcommand{\gotham@disablesubsectionpage}| and | \newcommand{\gotham@enablesubsectionpage}| +% \begin{function}[updated=2025-01-06]{\__gotham_inner_disable_subsectionpage:, \__gotham_inner_enable_subsectionpage:} +% Commands to disable or enable the display of a 'subsection page' frame at the beginning of every new subsection. +% \changes{v1.2.1}{2025-01-06}{includes new variables} % \TestFiles{gotham-test-041} % \begin{macrocode} \cs_new_protected:Nn \__gotham_inner_disable_subsectionpage: @@ -3100,20 +3221,27 @@ \ifbeamer@inframe \subsectionpage \else - \frame[c, noframenumbering, subsec]{\subsectionpage} + \ifdefempty{\subsectionpageOptions}{ + % empty command + \frame[c, subsec]{\subsectionpage} + }{ + % non-empty command + \frame[c, \expandafter\subsectionpageOptions, subsec]{\subsectionpage} + } \fi \ifbool{subsectionContent}{ % true - \begin{frame}[noframenumbering, tocsubsec] - \frametitle{\subsecContentName} - {\tableofcontents[currentsection, currentsubsection, - %currentsubsubsection, - hideothersubsections, - sectionstyle=show/shaded, - subsectionstyle=show/shaded/hide, - subsubsectionstyle=show/show/hide, - ] + \ifdefempty{\subsectionpageTocOptions}{ + % empty command + \begin{frame}[tocsubsec] + }{ + % non-empty command + \begin{frame}[\expandafter\subsectionpageTocOptions, tocsubsec] + } + \ifdefempty{\subsecContentName}{}{\frametitle{\subsecContentName}} + { + \expandafter\tableofcontents\expandafter[\subsectionTocOptions] } \end{frame} }{ @@ -3126,9 +3254,9 @@ % \end{implementation} % \begin{implementation} -% \begin{function}{\__gotham_inner_disable_subsubsectionpage:, \__gotham_inner_enable_subsubsectionpage:} -% Commands to disable or enable the display of a 'subsubsection page' frame at the begining of every new subsubsection. -% It replaces the |\newcommand{\gotham@disablesubsubsectionpage}| and | \newcommand{\gotham@enablesubsubsectionpage}| +% \begin{function}[updated=2025-01-06]{\__gotham_inner_disable_subsubsectionpage:, \__gotham_inner_enable_subsubsectionpage:} +% Commands to disable or enable the display of a 'subsubsection page' frame at the beginning of every new subsubsection. +% \changes{v1.2.1}{2025-01-06}{includes new variables} % \TestFiles{gotham-test-041} % \begin{macrocode} \cs_new_protected:Nn \__gotham_inner_disable_subsubsectionpage: @@ -3144,8 +3272,33 @@ \ifbeamer@inframe \subsubsectionpage \else - \frame[c, noframenumbering, subsubsec]{\subsubsectionpage} + \ifdefempty{\subsubsectionpageOptions}{ + % empty command + \frame[c, subsubsec]{\subsubsectionpage} + }{ + % non-empty command + \frame[c, \expandafter\subsubsectionpageOptions, subsubsec]{\subsubsectionpage} + } \fi + + % I don't think anyone will use this for now. But, just in case I keep it commented. + % \ifbool{subsubsectionContent}{ + % % true + % \ifdefempty{\subsubsectionpageTocOptions}{ + % % empty command + % \begin{frame}[tocsubsubsec] + % }{ + % % non-empty command + % \begin{frame}[\expandafter\subsubsectionpageTocOptions, tocsubsubsec] + % } + % \ifdefempty{\subsubsecContentName}{}{\frametitle{\subsubsecContentName}} + % { + % \expandafter\tableofcontents\expandafter[\subsubsectionTocOptions] + % } + % \end{frame} + % }{ + % % else empty + % } } } % \end{macrocode} @@ -4144,35 +4297,36 @@ % \begin{implementation} % \begin{macro}{\defbeamertemplate{section~in~toc}{gotham~bullet}} % Template definitions for |gotham bullet| style of ToC that appear in section \textbar subsection \textbar subsubsection frame. +% \changes{v1.2.1}{2025-02-10}{adapt shaded subsection in toc} % \UnitTested % \TestFiles{gotham-test-042} % \begin{macrocode} \defbeamertemplate{section~in~toc}{gotham~bullet}{ - \hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number]{\textbf{\small\inserttocsectionnumber}}; - \ \tikz[baseline=-0.5ex]\node[section]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm] - \hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip} + \hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number]{\textbf{\inserttocsectionnumber}}; + \ \tikz[baseline=-0.5ex]\node[section]{\usebeamerfont*{toc~title}\inserttocsection};\\[-0.35cm] + \hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}{\par\vskip-0.35\baselineskip}\nointerlineskip} } \defbeamertemplate{subsection~in~toc}{gotham~bullet}{ \hspace*{0.53cm}\tikz[baseline=-0.5ex]\node[subsection~number]{}; - \hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsection};\\[-0.2cm] + \hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{subsubsection~in~toc}{gotham~bullet}{ \hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number]{}; - \hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm] + \hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection \gotham@strut};\\[-0.2cm] } % Shaded for sections already done in the presentation. \defbeamertemplate{section~in~toc~shaded}{gotham~bullet}{ - \hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number, fill=colorBackElement!40, text=background]{\usebeamerfont*{toc~subtitle}\textbf{\inserttocsectionnumber}}; - \ \tikz[baseline=-0.5ex]\node[section, text=colorExample!20]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm] - \hspace*{1.3cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip} + \hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number, fill=colorBackElement!40]{\usebeamerfont*{toc~subtitle}\textbf{\inserttocsectionnumber}}; + \ \tikz[baseline=-0.5ex]\node[section, text=colorBackElement!20]{\usebeamerfont*{toc~title}\inserttocsection};\\[-0.35cm] + \hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}{\par\vskip-0.35\baselineskip}\nointerlineskip} } \defbeamertemplate{subsection~in~toc~shaded}{gotham~bullet}{ - \hspace*{0.55cm}\tikz[baseline=-0.5ex]\node[subsection~number,fill=colorBackElement!20]{}; - \hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection, text=colorBackElement!20]{};\\[-0.2cm] + \hspace*{0.53cm}\tikz[baseline=-0.5ex]\node[subsection~number,fill=colorBackElement!20]{}; + \hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection, text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{subsubsection~in~toc~shaded}{gotham~bullet}{ \hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number,fill=colorBackElement!20]{}; - \hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection,text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm] + \hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection,text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection \gotham@strut};\\[-0.2cm] } % \end{macrocode} % \end{macro} @@ -4181,6 +4335,7 @@ % \begin{implementation} % \begin{macro}{\defbeamertemplate{section~in~toc}{gotham~bullet}} % Template definitions for |gotham simple| style of ToC that appear in section \textbar subsection \textbar subsubsection frame. +% \changes{v1.2.1}{2025-01-06}{adapt shaded subsection in toc} % \UnitTested % \TestFiles{gotham-test-042} % \begin{macrocode} @@ -4200,6 +4355,24 @@ \qquad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.\inserttocsubsubsectionnumber.}~\inserttocsubsubsection \\ } +\defbeamertemplate{section~in~toc~shaded}{gotham~simple}{ + \begin{colormixin}{20!parent.bg} + {{\inserttocsectionnumber}.}~\inserttocsection + \end{colormixin} + \\ +} +\defbeamertemplate{subsection~in~toc~shaded}{gotham~simple}{ + \begin{colormixin}{20!parent.bg} + \quad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.}~\inserttocsubsection + \end{colormixin} + \\ +} +\defbeamertemplate{subsubsection~in~toc~shaded}{gotham~simple}{ + \begin{colormixin}{20!parent.bg} + \qquad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.\inserttocsubsubsectionnumber.}~\inserttocsubsubsection + \end{colormixin} + \\ +} % \end{macrocode} % \end{macro} % \end{implementation} @@ -4208,6 +4381,7 @@ % \begin{macro}{\defbeamertemplate{background~canvas}{toc/gotham~simple}, \defbeamertemplate{toc~page}{gotham~simple|bullet}} % Definition of toc page style named gotham simple and gotham bullet, used for table of content pages. % Both are using a dedicated background canvas. +% \changes{v1.2.1}{2025-01-05}{add shaded subsection in toc setup} % \UnitTested % \TestFiles{gotham-test-042} % \begin{macrocode} @@ -4219,15 +4393,21 @@ \defbeamertemplate{toc~page}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] + \setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc/gotham~simple] } \defbeamertemplate{toc~page}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] + \setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc/gotham~simple] } % \end{macrocode} @@ -4283,8 +4463,11 @@ \defbeamertemplate{toc~part~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] + \setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~part~gotham] \setbeamertemplate{frametitle}[toc~gotham] % \usebeamertemplate*{part~page}% already included @@ -4292,8 +4475,11 @@ \defbeamertemplate{toc~section~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] + \setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~section~gotham] \setbeamertemplate{frametitle}[toc~gotham]% % \usebeamertemplate*{section~page}% already included @@ -4301,8 +4487,11 @@ \defbeamertemplate{toc~subsection~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] + \setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~subsection~gotham] \setbeamertemplate{frametitle}[toc~gotham] % \usebeamertemplate*{subsection~page}% already included @@ -4320,8 +4509,11 @@ \defbeamertemplate{toc~part~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] + \setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~part~gotham] \setbeamertemplate{frametitle}[toc~gotham] % \usebeamertemplate*{part~page}% already included @@ -4329,8 +4521,11 @@ \defbeamertemplate{toc~section~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] + \setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~section~gotham] \setbeamertemplate{frametitle}[toc~gotham]% % \usebeamertemplate*{section~page}% already included @@ -4338,8 +4533,11 @@ \defbeamertemplate{toc~subsection~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] + \setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] + \setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~subsection~gotham] \setbeamertemplate{frametitle}[toc~gotham] % \usebeamertemplate*{subsection~page}% already included @@ -4840,7 +5038,7 @@ %\begin{implementation} % \begin{macrocode} %<*outer> -\ProvidesExplPackage{beamerouterthemegotham}{2024-11-11}{1.2.0.a}{gotham outer theme} +\ProvidesExplPackage{beamerouterthemegotham}{2025-02-11}{1.2.1.c}{gotham outer theme} \RequirePackage{expl3} \RequirePackage{xfp} \RequirePackage{calc} @@ -5094,8 +5292,8 @@ % \begin{macrocode} % sidebar lengths \newlength{\sidebarRightHOffset} -\setlength{\sidebarRightHOffset}{-2.5ex} \newlength{\sidebarLeftHOffset} +\setlength{\sidebarRightHOffset}{-2.5ex} \setlength{\sidebarLeftHOffset}{+0.5ex} % \end{macrocode} % \end{variable} @@ -5846,7 +6044,7 @@ % \end{implementation} % \begin{documentation} -% \begin{variable}{\gothamFootlineVOffset, \gothamFootlineHRightOffset,\gothamFootlineHeight, \gothamFootlineDepth} +% \begin{variable}[updated=2024-11-11]{\gothamFootlineVOffset, \gothamFootlineHRightOffset,\gothamFootlineHeight, \gothamFootlineDepth} % Lengths controlling the position of |footline|. % |\gothamFootlineVOffset| is controlling vertical space between to bottom of the text (or the footnote) and the footline. % |\gothamFootlineVOffset| is by default -0.5ex, to have more space in the frame but if the footer is not really used, the space can be even more optimized using |\setlength{\gothamFootlineVOffset}{-2.0ex}|. @@ -5857,7 +6055,7 @@ % \end{documentation} %%%%%% % \begin{implementation} -% \begin{variable}{\gothamFootlineVOffset, \gothamFootlineHeight, \gothamFootlineDepth} +% \begin{variable}[updated=2024-11-11]{\gothamFootlineVOffset, \gothamFootlineHeight, \gothamFootlineDepth} % Lengths used in |footline| template. % \begin{macrocode} % Footline lengths @@ -8716,7 +8914,6 @@ % \begin{macrocode} %<*package> \RequirePackage{expl3} -\RequirePackage{xparse} % \RequirePackage{ifxetex} % \RequirePackage{ifluatex} % \RequirePackage{etoolbox} @@ -8871,7 +9068,84 @@ % % \end{macrocode} % \end{implementation} -% + +% \begin{documentation} +% \begin{function}{\gothamreset} +% \begin{syntax} +% \cs{gothamreset} +% \end{syntax} +% Command to reset gotham to default. Mainly useful when other theme have left some definitions. +% \end{function} +% \end{documentation} +%%%%%% +% \begin{implementation} +% \begin{function}{\gothamreset} +% \begin{arguments} +% \item |height| of the picture +% \end{arguments} +% Command to be redefined by users. +% \TestFiles{ gotham-test-046b} +% \begin{macrocode} +\DeclareDocumentCommand{\gothamreset}{m}{ + % commands + \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{ } + \renewcommand{\gothamInstituteLogoCircle}[1][4ex]{ } + \renewcommand{\gothamHookPostColorBGSet}{ + \colorlet{colorStandout}{colorA} + \colorlet{colorFrametitle}{colorA} + \colorlet{colorProgBar}{colorC} + \setbeamercolor{frametitle}{ + use=primary~palette, + parent=primary~palette, + bg=colorFrametitle, + fg=colorBG + } + \setbeamercolor{standout}{bg=colorStandout, fg=colorPale} + } + \renewcommand{\gothamtitlepagelogo}{} + \renewcommand{\gothamtitlepagebg}{} + \renewcommand{\gothamRightFiligrane}{} + \renewcommand{\gothamLeftFiligrane}{} + \renewcommand{\gothamHookFooter}{} + + % lengths + \setlength{\gothamProgressSectionHeight}{3pt} + \setlength{\sectionhoffset}{0pt} + \setlength{\sidebarRightHOffset}{-2.5ex} + \setlength{\sidebarLeftHOffset}{+0.5ex} + \setlength{\gothamFrametitleToppading}{2.2ex} + \setlength{\gothamFrametitleBottompading}{2.2ex} + \setlength{\gothamFrametitleLeftpading}{2.2ex} + \setlength{\gothamFrametitleRightpading}{2.2ex} + \setlength{\gothamFramesubtitleStrutend}{0pt} + \setlength{\gothamFootlineVOffset}{-0.5ex} + \setlength{\gothamFootlineDepth}{0.1ex} + \setlength{\gothamFootlineHeight}{1.5ex} + \setlength{\gothamFootlineHRightOffset}{\spaceskip} + \setlength{\gothamHposLeftRotFooter}{-7pt} + \setlength{\gothamHposRightRotFooter}{2pt} + \setlength{\gothamVposLeftRotFooter}{15pt} + \setlength{\gothamVposRightRotFooter}{15pt} + \setlength{\gothamLeftFooterPadding}{2.0ex} + \setlength{\gothamRightFooterPadding}{3.5ex} + \setlength{\gothamFooterHOffset}{0pt} + \setlength{\gothamFootlineRuleLeftPadding}{7mm} + \setlength{\gothamFootlineRuleHeight}{0.0pt} + \setlength{\gothamFootlineRuleLength}{15mm} + \setlength{\gothamProgressCircHeight}{1.8\baselineskip} + \setlength{\gothamCounterCircleRadius}{1.12ex} + \setlength{\gothamProgressCircBorderWidth}{1.65mm} + \setlength{\gothamCircleNumberingVshift}{1.4mm} + \setlength{\gothamCircleNumberingHshift}{2.6mm} + \setlength{\gothamProgressHeadFootLineheight}{1.2ex} + + % options to default + \keys_set:nn { gotham/all/all } { default } +} +% \end{macrocode} +% \end{function} +% \end{implementation} + % \begin{implementation} % \begin{macrocode} %\endinput diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty index 368f9c49201..8527881a4a3 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty @@ -21,9 +21,8 @@ %% The Current Maintainer of this work is Romain NOËL. %% Contributors: Romain NOËL (2023-20**) %% -\ProvidesExplPackage{beamercolorthemegotham}{2024-11-11}{1.2.0.a}{Gotham color theme} +\ProvidesExplPackage{beamercolorthemegotham}{2025-02-11}{1.2.1.c}{Gotham color theme} \RequirePackage{expl3} -\RequirePackage{xparse} \RequirePackage{xcolor} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%% COLOR %%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty index 5bbdfe5ba79..3d36b5bfa5f 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty @@ -21,10 +21,8 @@ %% The Current Maintainer of this work is Romain NOËL. %% Contributors: Romain NOËL (2023-20**) %% -\ProvidesExplPackage{beamerfontthemegotham}{2024-11-11}{1.2.0.a}{gotham font theme} +\ProvidesExplPackage{beamerfontthemegotham}{2025-02-11}{1.2.1.c}{gotham font theme} \RequirePackage{expl3} -\RequirePackage{xparse} -\RequirePackage{etoolbox} \RequirePackage{ifxetex} \RequirePackage{ifluatex} @@ -88,6 +86,7 @@ FiraSans-Italic.otf} BoldFont={FiraSans-Regular.otf}, BoldItalicFont={FiraSans-Italic.otf}] {FiraSans-Light.otf} +\renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ \iffontsavailable{FiraSans~Light~OT, FiraSans~LightItalic~OT, @@ -98,6 +97,7 @@ FiraSans~Italic~OT} BoldFont={Fira~Sans~Regular~OT}, BoldItalicFont={Fira~Sans~Italic~OT}] {Fira~Sans~Light~OT} +\renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ \msg_warning:nn { gotham } { fonts-not-available }% } @@ -107,6 +107,7 @@ BoldItalicFont={Fira~Sans~Italic~OT}] }{ \iffontsavailable{Fira~Mono~Medium~OT, Fira~Mono~Bold~OT}{ \setmonofont[BoldFont={Fira~Mono~Medium~OT}]{Fira~Mono~Bold~OT} +\renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter }{ \msg_warning:nn { gotham } { fonts-not-available } } diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty index 809020cbc9b..e9d2b2344be 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty @@ -21,9 +21,8 @@ %% The Current Maintainer of this work is Romain NOËL. %% Contributors: Romain NOËL (2023-20**) %% -\ProvidesExplPackage{beamerinnerthemegotham}{2024-11-11}{1.2.0.a}{gotham inner theme} +\ProvidesExplPackage{beamerinnerthemegotham}{2025-02-11}{1.2.1.c}{gotham inner theme} \RequirePackage{expl3} -\RequirePackage{xparse} \RequirePackage{calc} \RequirePackage{tikz} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -703,6 +702,9 @@ standin~template .code:n = { \providebool{subsectionContent} \booltrue{subsectionContent} \providecommand{\subsecContentName}{Subsection~content} +\providebool{subsubsectionContent} +\booltrue{subsubsectionContent} +\providecommand{\subsubsecContentName}{Subsubsection~content} \def\partname{\translate{Part}} \defbeamertemplate*{part~title}{gotham}{ @@ -734,6 +736,32 @@ standin~template .code:n = { \insertsubsubsectionhead } +%%%% +\providecommand{\partpageOptions}{noframenumbering} +\providecommand{\sectionpageOptions}{noframenumbering} +\providecommand{\subsectionpageOptions}{noframenumbering} +\providecommand{\subsubsectionpageOptions}{noframenumbering} + +%%%% +\providecommand{\partpageTocOptions}{noframenumbering} +\providecommand{\sectionpageTocOptions}{noframenumbering} +\providecommand{\subsectionpageTocOptions}{noframenumbering} + +%%%% +\providecommand{\partTocOptions}{} +\providecommand{\sectionTocOptions}{ +currentsection, currentsubsection, +hideothersubsections, +sectionstyle=show/shaded, +} +\providecommand{\subsectionTocOptions}{ +currentsection, currentsubsection, +hideothersubsections, +sectionstyle=show/shaded, +subsectionstyle=show/shaded/hide, +subsubsectionstyle=show/show/hide, +} + \cs_new_protected:Nn \__gotham_inner_disable_partpage: { \AtBeginPart{ @@ -746,13 +774,25 @@ standin~template .code:n = { \ifbeamer@inframe \partpage \else -\frame[c, noframenumbering, part]{\partpage} +\ifdefempty{\partpageOptions}{ +\frame[c, part]{\partpage} +}{ +\frame[c, \expandafter\partpageOptions, part]{\partpage} +} \fi \ifbool{partContent}{ -\begin{frame}[noframenumbering, tocpart] -\frametitle{\partContentName} +\ifdefempty{\partpageTocOptions}{ +\begin{frame}[tocpart] +}{ +\begin{frame}[tocpart, \expandafter\partpageTocOptions] +} +\ifdefempty{\partContentName}{}{\frametitle{\partContentName}} +\ifdefempty{\partTocOptions}{ \tableofcontents[part=\thepart] +}{ +\expandafter\tableofcontents[part=\thepart, \expandafter\partTocOptions] +} \end{frame} }{ } @@ -771,16 +811,22 @@ standin~template .code:n = { \ifbeamer@inframe \sectionpage \else -\frame[c, noframenumbering, section]{\sectionpage} +\ifdefempty{\sectionpageOptions}{ +\frame[c, section]{\sectionpage} +}{ +\frame[c, \expandafter\sectionpageOptions, section]{\sectionpage} +} \fi \ifbool{sectionContent}{ -\begin{frame}[noframenumbering, tocsec] -\frametitle{\secContentName} -{\tableofcontents[currentsection, currentsubsection, -hideothersubsections, -sectionstyle=show/shaded, -] +\ifdefempty{\sectionpageTocOptions}{ +\begin{frame}[tocsec] +}{ +\begin{frame}[\expandafter\sectionpageTocOptions, tocsec] +} +\ifdefempty{\secContentName}{}{\frametitle{\secContentName}} +{ +\expandafter\tableofcontents\expandafter[\sectionTocOptions] } \end{frame} }{ @@ -801,18 +847,22 @@ sectionstyle=show/shaded, \ifbeamer@inframe \subsectionpage \else -\frame[c, noframenumbering, subsec]{\subsectionpage} +\ifdefempty{\subsectionpageOptions}{ +\frame[c, subsec]{\subsectionpage} +}{ +\frame[c, \expandafter\subsectionpageOptions, subsec]{\subsectionpage} +} \fi \ifbool{subsectionContent}{ -\begin{frame}[noframenumbering, tocsubsec] -\frametitle{\subsecContentName} -{\tableofcontents[currentsection, currentsubsection, -hideothersubsections, -sectionstyle=show/shaded, -subsectionstyle=show/shaded/hide, -subsubsectionstyle=show/show/hide, -] +\ifdefempty{\subsectionpageTocOptions}{ +\begin{frame}[tocsubsec] +}{ +\begin{frame}[\expandafter\subsectionpageTocOptions, tocsubsec] +} +\ifdefempty{\subsecContentName}{}{\frametitle{\subsecContentName}} +{ +\expandafter\tableofcontents\expandafter[\subsectionTocOptions] } \end{frame} }{ @@ -833,8 +883,13 @@ subsubsectionstyle=show/show/hide, \ifbeamer@inframe \subsubsectionpage \else -\frame[c, noframenumbering, subsubsec]{\subsubsectionpage} +\ifdefempty{\subsubsectionpageOptions}{ +\frame[c, subsubsec]{\subsubsectionpage} +}{ +\frame[c, \expandafter\subsubsectionpageOptions, subsubsec]{\subsubsectionpage} +} \fi + } } @@ -1608,30 +1663,30 @@ align=left } \defbeamertemplate{section~in~toc}{gotham~bullet}{ -\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number]{\textbf{\small\inserttocsectionnumber}}; -\ \tikz[baseline=-0.5ex]\node[section]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm] -\hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip} +\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number]{\textbf{\inserttocsectionnumber}}; +\ \tikz[baseline=-0.5ex]\node[section]{\usebeamerfont*{toc~title}\inserttocsection};\\[-0.35cm] +\hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}{\par\vskip-0.35\baselineskip}\nointerlineskip} } \defbeamertemplate{subsection~in~toc}{gotham~bullet}{ \hspace*{0.53cm}\tikz[baseline=-0.5ex]\node[subsection~number]{}; -\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsection};\\[-0.2cm] +\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{subsubsection~in~toc}{gotham~bullet}{ \hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number]{}; -\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm] +\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{section~in~toc~shaded}{gotham~bullet}{ -\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number, fill=colorBackElement!40, text=background]{\usebeamerfont*{toc~subtitle}\textbf{\inserttocsectionnumber}}; -\ \tikz[baseline=-0.5ex]\node[section, text=colorExample!20]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm] -\hspace*{1.3cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip} +\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number, fill=colorBackElement!40]{\usebeamerfont*{toc~subtitle}\textbf{\inserttocsectionnumber}}; +\ \tikz[baseline=-0.5ex]\node[section, text=colorBackElement!20]{\usebeamerfont*{toc~title}\inserttocsection};\\[-0.35cm] +\hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}{\par\vskip-0.35\baselineskip}\nointerlineskip} } \defbeamertemplate{subsection~in~toc~shaded}{gotham~bullet}{ -\hspace*{0.55cm}\tikz[baseline=-0.5ex]\node[subsection~number,fill=colorBackElement!20]{}; -\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection, text=colorBackElement!20]{};\\[-0.2cm] +\hspace*{0.53cm}\tikz[baseline=-0.5ex]\node[subsection~number,fill=colorBackElement!20]{}; +\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection, text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{subsubsection~in~toc~shaded}{gotham~bullet}{ \hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number,fill=colorBackElement!20]{}; -\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection,text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm] +\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection,text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection \gotham@strut};\\[-0.2cm] } \defbeamertemplate{part~in~toc}{gotham~simple}{ @@ -1650,6 +1705,24 @@ align=left \qquad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.\inserttocsubsubsectionnumber.}~\inserttocsubsubsection \\ } +\defbeamertemplate{section~in~toc~shaded}{gotham~simple}{ +\begin{colormixin}{20!parent.bg} +{{\inserttocsectionnumber}.}~\inserttocsection +\end{colormixin} +\\ +} +\defbeamertemplate{subsection~in~toc~shaded}{gotham~simple}{ +\begin{colormixin}{20!parent.bg} +\quad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.}~\inserttocsubsection +\end{colormixin} +\\ +} +\defbeamertemplate{subsubsection~in~toc~shaded}{gotham~simple}{ +\begin{colormixin}{20!parent.bg} +\qquad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.\inserttocsubsubsectionnumber.}~\inserttocsubsubsection +\end{colormixin} +\\ +} \defbeamertemplate{background~canvas}{toc/gotham~simple}{ \ifbeamercolorempty[bg]{standin}{}{ @@ -1659,15 +1732,21 @@ align=left \defbeamertemplate{toc~page}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] +\setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc/gotham~simple] } \defbeamertemplate{toc~page}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] +\setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc/gotham~simple] } @@ -1690,24 +1769,33 @@ align=left \defbeamertemplate{toc~part~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] +\setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~part~gotham] \setbeamertemplate{frametitle}[toc~gotham] } \defbeamertemplate{toc~section~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] +\setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~section~gotham] \setbeamertemplate{frametitle}[toc~gotham]% } \defbeamertemplate{toc~subsection~frame}{gotham~simple}{ \setbeamertemplate{part~in~toc}[gotham~simple] \setbeamertemplate{section~in~toc}[gotham~simple] +\setbeamertemplate{section~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsection~in~toc}[gotham~simple] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{subsubsection~in~toc}[gotham~simple] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~simple] \setbeamertemplate{background~canvas}[toc~subsection~gotham] \setbeamertemplate{frametitle}[toc~gotham] } @@ -1715,24 +1803,33 @@ align=left \defbeamertemplate{toc~part~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] +\setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~part~gotham] \setbeamertemplate{frametitle}[toc~gotham] } \defbeamertemplate{toc~section~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] +\setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~section~gotham] \setbeamertemplate{frametitle}[toc~gotham]% } \defbeamertemplate{toc~subsection~frame}{gotham~bullet}{ \setbeamertemplate{part~in~toc}[gotham~bullet] \setbeamertemplate{section~in~toc}[gotham~bullet] +\setbeamertemplate{section~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{subsubsection~in~toc}[gotham~bullet] +\setbeamertemplate{subsubsection~in~toc~shaded}[gotham~bullet] \setbeamertemplate{background~canvas}[toc~subsection~gotham] \setbeamertemplate{frametitle}[toc~gotham] } diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty index dea71d04226..24b0f8bf385 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty @@ -21,7 +21,7 @@ %% The Current Maintainer of this work is Romain NOËL. %% Contributors: Romain NOËL (2023-20**) %% -\ProvidesExplPackage{beamerouterthemegotham}{2024-11-11}{1.2.0.a}{gotham outer theme} +\ProvidesExplPackage{beamerouterthemegotham}{2025-02-11}{1.2.1.c}{gotham outer theme} \RequirePackage{expl3} \RequirePackage{xfp} \RequirePackage{calc} @@ -156,8 +156,8 @@ As~example:~if~'\c_backslash_str defbeamertemplate{background}{watermark/gotham~ %%%%%% \newlength{\sidebarRightHOffset} -\setlength{\sidebarRightHOffset}{-2.5ex} \newlength{\sidebarLeftHOffset} +\setlength{\sidebarRightHOffset}{-2.5ex} \setlength{\sidebarLeftHOffset}{+0.5ex} %%%%%% diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty index cec7af94df2..129edf61d60 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty @@ -21,9 +21,8 @@ %% The Current Maintainer of this work is Romain NOËL. %% Contributors: Romain NOËL (2023-20**) %% -\ProvidesExplPackage{beamerthemegotham}{2024-11-11}{1.2.0.a}{A modern, minimal-ish, versatile and extendable yet robust theme for Beamer} +\ProvidesExplPackage{beamerthemegotham}{2025-02-11}{1.2.1.c}{A modern, minimal-ish, versatile and extendable yet robust theme for Beamer} \RequirePackage{expl3} -\RequirePackage{xparse} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%% PACKAGE %%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -129,6 +128,62 @@ unknown .code:n = \ProcessKeyOptions[ gotham / inner ] \ProcessKeyOptions[ gotham / outer ] + +%%%%%% +\DeclareDocumentCommand{\gothamreset}{m}{ +\renewcommand{\gothamInstituteLogoSquare}[1][4ex]{ } +\renewcommand{\gothamInstituteLogoCircle}[1][4ex]{ } +\renewcommand{\gothamHookPostColorBGSet}{ +\colorlet{colorStandout}{colorA} +\colorlet{colorFrametitle}{colorA} +\colorlet{colorProgBar}{colorC} +\setbeamercolor{frametitle}{ +use=primary~palette, +parent=primary~palette, +bg=colorFrametitle, +fg=colorBG +} +\setbeamercolor{standout}{bg=colorStandout, fg=colorPale} +} +\renewcommand{\gothamtitlepagelogo}{} +\renewcommand{\gothamtitlepagebg}{} +\renewcommand{\gothamRightFiligrane}{} +\renewcommand{\gothamLeftFiligrane}{} +\renewcommand{\gothamHookFooter}{} + +\setlength{\gothamProgressSectionHeight}{3pt} +\setlength{\sectionhoffset}{0pt} +\setlength{\sidebarRightHOffset}{-2.5ex} +\setlength{\sidebarLeftHOffset}{+0.5ex} +\setlength{\gothamFrametitleToppading}{2.2ex} +\setlength{\gothamFrametitleBottompading}{2.2ex} +\setlength{\gothamFrametitleLeftpading}{2.2ex} +\setlength{\gothamFrametitleRightpading}{2.2ex} +\setlength{\gothamFramesubtitleStrutend}{0pt} +\setlength{\gothamFootlineVOffset}{-0.5ex} +\setlength{\gothamFootlineDepth}{0.1ex} +\setlength{\gothamFootlineHeight}{1.5ex} +\setlength{\gothamFootlineHRightOffset}{\spaceskip} +\setlength{\gothamHposLeftRotFooter}{-7pt} +\setlength{\gothamHposRightRotFooter}{2pt} +\setlength{\gothamVposLeftRotFooter}{15pt} +\setlength{\gothamVposRightRotFooter}{15pt} +\setlength{\gothamLeftFooterPadding}{2.0ex} +\setlength{\gothamRightFooterPadding}{3.5ex} +\setlength{\gothamFooterHOffset}{0pt} +\setlength{\gothamFootlineRuleLeftPadding}{7mm} +\setlength{\gothamFootlineRuleHeight}{0.0pt} +\setlength{\gothamFootlineRuleLength}{15mm} +\setlength{\gothamProgressCircHeight}{1.8\baselineskip} +\setlength{\gothamCounterCircleRadius}{1.12ex} +\setlength{\gothamProgressCircBorderWidth}{1.65mm} +\setlength{\gothamCircleNumberingVshift}{1.4mm} +\setlength{\gothamCircleNumberingHshift}{2.6mm} +\setlength{\gothamProgressHeadFootLineheight}{1.2ex} + +\keys_set:nn { gotham/all/all } { default } +} + %% %% Adapted from classic "A model .dtx file" by Joseph Wright %% https://www.texdev.net/2009/10/06/a-model-dtx-file/ |