From 33c995c85bc1c5280fc16fb0895eea55ec390cc5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Mar 2022 21:22:31 +0000 Subject: beamertheme-trigon (10mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62597 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/beamertheme-trigon/trigon_demo.pdf | Bin 419465 -> 416666 bytes .../doc/latex/beamertheme-trigon/trigontheme.pdf | Bin 367313 -> 366853 bytes .../beamertheme-trigon/beamercolorthemetrigon.dtx | 2 +- .../beamertheme-trigon/beamerfontthemetrigon.dtx | 2 +- .../beamertheme-trigon/beamerinnerthemetrigon.dtx | 20 ++++++++++++-------- .../beamertheme-trigon/beamerouterthemetrigon.dtx | 16 ++++++++++------ .../latex/beamertheme-trigon/beamerthemetrigon.dtx | 2 +- .../latex/beamertheme-trigon/trigontheme.dtx | 13 +++++++++++++ .../beamertheme-trigon/beamercolorthemetrigon.sty | 2 +- .../beamertheme-trigon/beamerfontthemetrigon.sty | 2 +- .../beamertheme-trigon/beamerinnerthemetrigon.sty | 15 +++++++++------ .../beamertheme-trigon/beamerouterthemetrigon.sty | 10 ++++++---- .../latex/beamertheme-trigon/beamerthemetrigon.sty | 2 +- 13 files changed, 56 insertions(+), 30 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf index 45942368e5c..157574bf156 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf and b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf index 99d6007081c..f70379b53a8 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf and b/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf differ diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx index d5da8918f17..9e5780a7e71 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}[2021/11/10 v0.6.2 Trigon color theme] +\ProvidesPackage{beamercolorthemetrigon}[2022/03/10 v0.6.3 Trigon color theme] % % \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 790af1b4f94..0d2d1b15ba8 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}[2021/11/10 v0.6.2 Trigon font theme] +\ProvidesPackage{beamerfontthemetrigon}[2022/03/10 v0.6.3 Trigon font theme] % % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx index 614cfb38549..5726c1a5438 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}[2021/11/10 v0.6.2 Trigon inner theme] +\ProvidesPackage{beamerinnerthemetrigon}[2022/03/10 v0.6.3 Trigon inner theme] % % \fi % \CheckSum{0} @@ -46,12 +46,15 @@ % % \subsubsection{Definitions} % -% We define the command |\logobig| to specify the logo that needs to be applied -% displayed on the title frame. +% We define the command |\biglogo| to specify the logo that needs to be +% displayed on the title frame. This command is just a replacement for +% |\includegraphics|, so it accepts the same options. % \begin{macrocode} \def\logbig{} -\newcommand\biglogo[1]{ - \def\logbig{#1} +\newcommand\biglogo[2][width=0.28\textwidth]{ + \ifx#2\@empty\else + \def\logbig{\includegraphics[#1]{#2}} + \fi } % \end{macrocode} % @@ -290,7 +293,7 @@ \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) {\includegraphics[width=0.28\textwidth]{\logbig}}; + (.96*\the\paperwidth,.96*\the\paperheight) {\logbig}; \fi \end{tikzpicture} } @@ -305,7 +308,8 @@ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight); \leftColorTriangle{0.58\paperwidth}{0}{tGrey!30!tBg} \ifx\logbig\@empty \else - \node[anchor=north east,inner sep=0mm] at (.94*\the\paperwidth,.94*\the\paperheight) {\includegraphics[width=0.33\textwidth]{\logbig}}; + \node[anchor=north east,inner sep=0mm] at + (.94*\the\paperwidth,.94*\the\paperheight) {\logbig}; \fi \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme} @@ -491,7 +495,7 @@ \begin{minipage}[t][][t]{\textwidth} \centering% \ifx\logbig\@empty \else - \includegraphics[height=0.15\textheight]{\logbig} + \logbig \fi \end{minipage} \vskip15pt diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx index d33c019bcc4..de5dc23c169 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}[2021/11/10 v0.6.2 Trigon outer theme] +\ProvidesPackage{beamerouterthemetrigon}[2022/03/10 v0.6.3 Trigon outer theme] % % \fi % \CheckSum{0} @@ -35,12 +35,16 @@ % \end{macrocode} % % \subsubsection{Definitions} -% We define the command |\logsmall| to specify the logo that needs to be applied -% displayed on all normal frames. +% +% We define the command |\smalllogo| to specify the logo that needs to be applied +% displayed on all normal frames. This command is just a replacement for +% |\includegraphics|, so it accepts the same options. % \begin{macrocode} \def\logsmall{} -\newcommand\smalllogo[1]{ - \def\logsmall{#1} +\newcommand\smalllogo[2][width=20pt]{ + \ifx#2\@empty\else + \def\logsmall{\includegraphics[#1]{#2}} + \fi } % \end{macrocode} % @@ -100,7 +104,7 @@ \defbeamertemplate{headline}{none}{} \defbeamertemplate*{headline}{logo}{ \ifx\logsmall\@empty\else - \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt} + \hfill\logsmall\hspace{20pt}\vspace{-40pt} \fi } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx index 0f097e81acc..f2c56ad5eaf 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}[2021/11/10 v0.6.2 Trigon Beamer theme] +\ProvidesPackage{beamerthemetrigon}[2022/03/10 v0.6.3 Trigon Beamer theme] % % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx index 7e1dce7af99..bc468409404 100644 --- a/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx @@ -426,6 +426,19 @@ An easy way to customize the theme is to redefine these colors using \end{lstlisting} in your preamble. +\subsection{Logos} + +The package allows the inclusion of logos on the title page and on the content +slides. For that, the following commands are defined: +\begin{lstlisting} + \biglogo[]{path/to/your/titlepage_logo} + \smalllogo[]{path/to/your/titlepage_logo} +\end{lstlisting} +These two commands are just replacements for |\includegraphics| and they will +pass the options as-is so you can perfectly size and position the images. + + + \section{Tips \& Tricks} \subsection{Backup Slides} diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty index 439e3739749..1b14b337428 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}[2021/11/10 v0.6.2 Trigon color theme] +\ProvidesPackage{beamercolorthemetrigon}[2022/03/10 v0.6.3 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 83f9fc9d1eb..419e66b8731 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}[2021/11/10 v0.6.2 Trigon font theme] +\ProvidesPackage{beamerfontthemetrigon}[2022/03/10 v0.6.3 Trigon font theme] \RequirePackage{pgfopts} \pgfkeys{ /trigon/font/titleformat title/.cd, diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty index f12fd292f96..9314d2effc0 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty @@ -18,13 +18,15 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemetrigon}[2021/11/10 v0.6.2 Trigon inner theme] +\ProvidesPackage{beamerinnerthemetrigon}[2022/03/10 v0.6.3 Trigon inner theme] \RequirePackage{pgfopts} \RequirePackage{tikz} \usetikzlibrary{calc,3d} \def\logbig{} -\newcommand\biglogo[1]{ - \def\logbig{#1} +\newcommand\biglogo[2][width=0.28\textwidth]{ + \ifx#2\@empty\else + \def\logbig{\includegraphics[#1]{#2}} + \fi } \pgfkeys{ /trigon/inner/sectionpage/.cd, @@ -158,7 +160,7 @@ \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) {\includegraphics[width=0.28\textwidth]{\logbig}}; + (.96*\the\paperwidth,.96*\the\paperheight) {\logbig}; \fi \end{tikzpicture} } @@ -167,7 +169,8 @@ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight); \leftColorTriangle{0.58\paperwidth}{0}{tGrey!30!tBg} \ifx\logbig\@empty \else - \node[anchor=north east,inner sep=0mm] at (.94*\the\paperwidth,.94*\the\paperheight) {\includegraphics[width=0.33\textwidth]{\logbig}}; + \node[anchor=north east,inner sep=0mm] at + (.94*\the\paperwidth,.94*\the\paperheight) {\logbig}; \fi \ifx\inserttitlegraphic\@empty \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme} @@ -285,7 +288,7 @@ \begin{minipage}[t][][t]{\textwidth} \centering% \ifx\logbig\@empty \else - \includegraphics[height=0.15\textheight]{\logbig} + \logbig \fi \end{minipage} \vskip15pt diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty index 47062c5af29..856d74d0f13 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty @@ -18,11 +18,13 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/) %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemetrigon}[2021/11/10 v0.6.2 Trigon outer theme] +\ProvidesPackage{beamerouterthemetrigon}[2022/03/10 v0.6.3 Trigon outer theme] \RequirePackage{pgfopts} \def\logsmall{} -\newcommand\smalllogo[1]{ - \def\logsmall{#1} +\newcommand\smalllogo[2][width=20pt]{ + \ifx#2\@empty\else + \def\logsmall{\includegraphics[#1]{#2}} + \fi } \pgfkeys{ /trigon/outer/numbering/.cd, @@ -53,7 +55,7 @@ \defbeamertemplate{headline}{none}{} \defbeamertemplate*{headline}{logo}{ \ifx\logsmall\@empty\else - \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt} + \hfill\logsmall\hspace{20pt}\vspace{-40pt} \fi } \setbeamertemplate{navigation symbols}{} diff --git a/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty b/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty index 778ac5a6dc4..954effd0a03 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}[2021/11/10 v0.6.2 Trigon Beamer theme] +\ProvidesPackage{beamerthemetrigon}[2022/03/10 v0.6.3 Trigon Beamer theme] \RequirePackage{pgfopts} \RequirePackage{tikz} \pgfkeys{/trigon/.cd, -- cgit v1.2.3