diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-20 21:02:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-20 21:02:22 +0000 |
commit | 9650bd56184562a4ab789fd5ee3e646a7da2a073 (patch) | |
tree | f9b1ab332d60946cac2c2cadd36c1accbd9df34a | |
parent | 239c55ae3f8e2094032eaccae51f71e25362b338 (diff) |
beamertheme-trigon (20feb23)
git-svn-id: svn://tug.org/texlive/trunk@65985 c570f23f-e606-0410-a88d-b1316a301751
14 files changed, 94 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md b/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md index 2643816c1fc..ebb5cdd058d 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md +++ b/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md @@ -19,8 +19,8 @@ high degree of customization. The main design focuses on triangular shapes for major layout elements and noise minimization for the main body of the work. -The theme is now available on [CTAN](https://ctan.org/pkg/beamertheme-trigon) -and a template is publicly available on the [Overleaf +The theme is available on [CTAN](https://ctan.org/pkg/beamertheme-trigon) +and a demo template is publicly available on the [Overleaf Gallery][overleaf-gallery]. Feature requests, issues and pull requests are welcome. @@ -69,7 +69,7 @@ install it manually by following these steps: archive](https://gitlab.com/thlamb/beamertheme-trigon/-/archive/master/beamertheme-trigon-master.zip) 2. **Compile the style files** by running `make sty` inside the downloaded directory. (Or run LaTeX directly on `source/trigontheme.ins`.) -3. **Move the resulting `*.sty` files** to the folder containing your +3. **Move the resulting `.sty` files** to the folder containing your presentation. To use Trigon with many presentations, run `make install` or move the `*.sty` files to a folder in your TeX path instead. 4. **Use the theme** by declaring `\usetheme{trigon}` in the preamble of your @@ -77,16 +77,29 @@ install it manually by following these steps: ### Overleaf -Since October 2021, [TexLive 2021 is available on -Overleaf](https://www.overleaf.com/blog/tex-live-2021-now-available). Trigon is -therefore automatically supported for new documents. If you want to switch older -documents to use the Trigon theme, you need to [select TexLive 2021 or higher as -your TeX Live -version](https://www.overleaf.com/blog/new-feature-select-your-tex-live-compiler-version) -(this may cause issues with other packages used in your presentation). +The version of **Trigon** available on Overleaf may not be the latest one. +Overleaf relies on Texlive for its backend latex installation, which they update +once a year (typically around end of Q3). Depending on the time of the year, it +is therefore possible that some of the latest features and developments are not +available on Overleaf. -In addition to that, a template project was created and is publicly available in -the [Overleaf Gallery][overleaf-gallery] to bootstrap your presentation. +_Note that you can see the current version of all packages by using `\listfiles` +in the preamble of the document and looking at the logs of the compilation._ + +Moreover, to avoid breaking changes, documents created with one version of +TexLive keep this same version when they are edited. To use a more recent +version of Trigon in your older documents, you need to [instruct Overleaf to use +the most recent +TexLive](https://www.overleaf.com/blog/new-feature-select-your-tex-live-compiler-version) +Keep in mind that this may cause issues with other packages used in your +presentation that would be updated as well. + +If you still want to use the very latest development, it is best to download the +source code of the package here or over CTAN, compile the `.sty` files locally +and place them at the root of you project on CTAN. + +A template project was created and is publicly available in the [Overleaf +Gallery][overleaf-gallery] to bootstrap your presentation. ## Usage @@ -105,19 +118,18 @@ following criteria: - Maximum three main triangles on the layout - Blending type "multiply" for overlapping triangles - Triangles must all be equilateral (60° angles), some useful macros are - defined in _beamerinnerthemettrigon.dtx_ for that + defined in _beamerinnerthemettrigon.dtx_ for that ## References & Acknowledgment - The theme structure and options are heavily based on the [Metropolis theme](https://github.com/matze/mtheme) -- Illustration picture for the demo titlepage from Taryn Elliott @ - [pexels](https://pexels.com) (published under Pexel License, free to use - without attribution). +- The picture used on the title page of the demo is "_Man in Red Jacket Standing + on the Stairs_": Photo by [Taryn Elliott from Pexels][man-red-jacket]. ## License -Copyright 2021 by Thomas Lambert <trigon@thl.ovh>. +Copyright 2021-2023 by Thomas Lambert <trigon@thl.ovh>. **Author and maintainer**: Thomas Lambert. @@ -126,8 +138,12 @@ International License](https://creativecommons.org/licenses/by-sa/4.0/), which is essentially a _free software_ license. Do not hesitate to copy and modify the code to fit your needs. +Some parts of this repository may be released under a different license than the +main theme. See the [NOTICE.md](NOTICE.md) file for more details. + [demo-shield]: https://img.shields.io/badge/Demo-PDF-blue.svg [docs-shield]: https://img.shields.io/badge/Documentation-PDF-blue.svg [demo-url]: https://gitlab.com/thlamb/beamertheme-trigon/-/jobs/artifacts/master/raw/demo/trigon_demo.pdf?job=tex-compile [docs-url]: https://gitlab.com/thlamb/beamertheme-trigon/-/jobs/artifacts/master/raw/docs/trigontheme.pdf?job=tex-compile [overleaf-gallery]: https://www.overleaf.com/latex/templates/trigon-beamer-theme/wjyyzvdzqkgf +[man-red-jacket]: https://www.pexels.com/photo/man-in-red-jacket-standing-on-the-stairs-4390730/ diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex b/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex index c0bb1aa40aa..4e215f091f6 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex @@ -70,7 +70,7 @@ Emphasis can be added by using \textbf{bold} typeface, \textit{italic}, \alert{alert} or {\color{tPrim}{simple colors}}. \vfill - Equations are typsetted with this font as well + Equations are typeset with this font as well \begin{equation*} F(x|\mu,s) = \int_{-\infty}^x s^{-1}\left(1+e^{-\frac{v-\mu}{s}}\right)^{-2} e^{-\frac{v-\mu}{s}}\;\mathsf{d}v = \frac{1}{1+e^{-\frac{x-\mu}{s}}} \end{equation*} diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf Binary files differindex 4877533c2e8..a0f438e65b3 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf Binary files differindex 7928b7be641..5f8925ec69c 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf +++ b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx index 2b3c3b7fc9c..6c83aedd674 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemetrigon}[2022/05/08 v0.6.6 Trigon color theme] +\ProvidesPackage{beamercolorthemetrigon}[2023/02/20 v0.7.0 Trigon color theme] %</package> % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx index e126efc2615..800a7861456 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemetrigon}[2022/05/08 v0.6.6 Trigon font theme] +\ProvidesPackage{beamerfontthemetrigon}[2023/02/20 v0.7.0 Trigon font theme] %</package> % \fi % \CheckSum{0} @@ -268,22 +268,28 @@ % the frame title we have to patch |\beamer@@frametitle|. % % \begin{macrocode} +\providecommand{\beamer@insertframetitlecontinuation}{ + \usebeamertemplate*{frametitle continuation} +} \patchcmd{\beamer@@frametitle} -{{% - \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space% - \usebeamertemplate*{frametitle continuation}\fi}}% - \gdef\beamer@frametitle{#2}% - \gdef\beamer@shortframetitle{#1}% -}} -{{% - \gdef\insertframetitle{{\trigon@frametitleformat{#2}\ifnum% - \beamer@autobreakcount>0\relax{}\space% - \usebeamertemplate*{frametitle continuation}\fi}}% - \gdef\beamer@frametitle{#2}% - \gdef\beamer@shortframetitle{#1}% -}} + {\gdef\insertframetitle{{% + #2% + \ifnum\beamer@autobreakcount>0 + \relax{}\space% + \beamer@insertframetitlecontinuation% + \fi% + }}% + } + {\gdef\insertframetitle{{% + \trigon@frametitleformat{#2}% + \ifnum\beamer@autobreakcount>0 + \relax{}\space% + \beamer@insertframetitlecontinuation% + \fi% + }}% + } {} -{\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc} +{\PackageWarning{beamerfontthemetrigon}{Patching frame title failed}\@ehc} % \end{macrocode} % % \subsubsection{General font definitions} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx index 3d67da40980..9f0eb4cb8ab 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemetrigon}[2022/05/08 v0.6.6 Trigon inner theme] +\ProvidesPackage{beamerinnerthemetrigon}[2023/02/20 v0.7.0 Trigon inner theme] %</package> % \fi % \CheckSum{0} @@ -285,17 +285,17 @@ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight); \begin{scope}[blend group=multiply] \clip(0,0) rectangle(\the\paperwidth,\the\paperheight); - \path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0}; - \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg}; + \path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0} + \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg} \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.73\paperwidth}{0.70\paperheight}{tTheme} \else - \path[clip]\leftTriangle{0.73\paperwidth}{0.70\paperheight}; + \path[clip]\leftTriangle{0.73\paperwidth}{0.70\paperheight} \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic}; \fi \end{scope} \clip(0,0) rectangle(\the\paperwidth,\the\paperheight); - \path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight}; + \path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight} \ifx\logbig\@empty \else \node[anchor=north east,inner sep=0mm] at (.96*\the\paperwidth,.96*\the\paperheight) {\logbig}; @@ -319,7 +319,7 @@ \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme} \else - \path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight}; + \path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight} \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic}; \fi \end{tikzpicture} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx index 3ec2bcf617f..fd5b410997d 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemetrigon}[2022/05/08 v0.6.6 Trigon outer theme] +\ProvidesPackage{beamerouterthemetrigon}[2023/02/20 v0.7.0 Trigon outer theme] %</package> % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx index b378824d710..3f18e776aaa 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemetrigon}[2022/05/08 v0.6.6 Trigon Beamer theme] +\ProvidesPackage{beamerthemetrigon}[2023/02/20 v0.7.0 Trigon Beamer theme] %</package> % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty index b3d88809b2e..e55f471024f 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty @@ -18,7 +18,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemetrigon}[2022/05/08 v0.6.6 Trigon color theme] +\ProvidesPackage{beamercolorthemetrigon}[2023/02/20 v0.7.0 Trigon color theme] \RequirePackage{pgfopts} \pgfkeys{ /trigon/color/background/.cd, diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty index 80f40f039be..4d1d0287219 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty @@ -18,7 +18,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemetrigon}[2022/05/08 v0.6.6 Trigon font theme] +\ProvidesPackage{beamerfontthemetrigon}[2023/02/20 v0.7.0 Trigon font theme] \RequirePackage{pgfopts} \pgfkeys{ /trigon/font/titleformat title/.cd, @@ -202,22 +202,28 @@ \if@tempswa\else \PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc \fi +\providecommand{\beamer@insertframetitlecontinuation}{ + \usebeamertemplate*{frametitle continuation} +} \patchcmd{\beamer@@frametitle} -{{% - \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space% - \usebeamertemplate*{frametitle continuation}\fi}}% - \gdef\beamer@frametitle{#2}% - \gdef\beamer@shortframetitle{#1}% -}} -{{% - \gdef\insertframetitle{{\trigon@frametitleformat{#2}\ifnum% - \beamer@autobreakcount>0\relax{}\space% - \usebeamertemplate*{frametitle continuation}\fi}}% - \gdef\beamer@frametitle{#2}% - \gdef\beamer@shortframetitle{#1}% -}} + {\gdef\insertframetitle{{% + #2% + \ifnum\beamer@autobreakcount>0 + \relax{}\space% + \beamer@insertframetitlecontinuation% + \fi% + }}% + } + {\gdef\insertframetitle{{% + \trigon@frametitleformat{#2}% + \ifnum\beamer@autobreakcount>0 + \relax{}\space% + \beamer@insertframetitlecontinuation% + \fi% + }}% + } {} -{\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc} +{\PackageWarning{beamerfontthemetrigon}{Patching frame title failed}\@ehc} \setbeamerfont{author} {size=\normalsize} \setbeamerfont{title} {size=\LARGE,series=\bfseries} \setbeamerfont{section title}{size=\LARGE,series=\mdseries} diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty index e2e79ddb6f1..851ea38b9a7 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty @@ -18,7 +18,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemetrigon}[2022/05/08 v0.6.6 Trigon inner theme] +\ProvidesPackage{beamerinnerthemetrigon}[2023/02/20 v0.7.0 Trigon inner theme] \RequirePackage{pgfopts} \RequirePackage{tikz} \usetikzlibrary{calc,3d} @@ -152,17 +152,17 @@ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight); \begin{scope}[blend group=multiply] \clip(0,0) rectangle(\the\paperwidth,\the\paperheight); - \path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0}; - \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg}; + \path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0} + \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg} \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.73\paperwidth}{0.70\paperheight}{tTheme} \else - \path[clip]\leftTriangle{0.73\paperwidth}{0.70\paperheight}; + \path[clip]\leftTriangle{0.73\paperwidth}{0.70\paperheight} \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic}; \fi \end{scope} \clip(0,0) rectangle(\the\paperwidth,\the\paperheight); - \path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight}; + \path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight} \ifx\logbig\@empty \else \node[anchor=north east,inner sep=0mm] at (.96*\the\paperwidth,.96*\the\paperheight) {\logbig}; @@ -180,7 +180,7 @@ \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme} \else - \path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight}; + \path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight} \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic}; \fi \end{tikzpicture} diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty index bf1341d442b..c498e581bf5 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty @@ -18,7 +18,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemetrigon}[2022/05/08 v0.6.6 Trigon outer theme] +\ProvidesPackage{beamerouterthemetrigon}[2023/02/20 v0.7.0 Trigon outer theme] \RequirePackage{pgfopts} \def\logsmall{} \newcommand*\smalllogo[2][width=20pt]{ diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty index 7534fd69390..eaa5f8115e6 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty @@ -18,7 +18,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemetrigon}[2022/05/08 v0.6.6 Trigon Beamer theme] +\ProvidesPackage{beamerthemetrigon}[2023/02/20 v0.7.0 Trigon Beamer theme] \RequirePackage{pgfopts} \RequirePackage{tikz} \pgfkeys{/trigon/.cd, |