summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon')
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md35
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex280
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdfbin417185 -> 418373 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx66
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdfbin356603 -> 362222 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx80
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx45
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx2
11 files changed, 448 insertions, 66 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
index 649600b187..5a98084061 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
@@ -19,14 +19,16 @@ 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 will be made available directly from CTAN and Overleaf once finished
-(hopefully).
+The theme is now available on [CTAN](https://ctan.org/pkg/beamertheme-trigon)
+and will be shared as a template on [Overleaf](https://www.overleaf.com)
+shortly.
Feature requests, issues and pull requests are welcome.
## Features
- Multiple style variations for title, section and regular slides
+- Dark theme
- Many convenient options (numbering style, toggle section slides, title font changes,...)
- Looks better on 16:9 format, but supports 4:3 as well
- Lightweight (does not require lots of additional packages)
@@ -52,6 +54,35 @@ Default Style | Example alternative style
## Installation
+To install a stable version of this theme, please refer to update instructions
+of your TeX distribution. Trigon has been on
+[CTAN](https://ctan.org/pkg/beamertheme-trigon) since March 2021. For users of
+typical TeX distributions (TexLive, MacTeX, MikTeX), simply updating your
+package list should install trigon on your system.
+
+If you want to use the cutting-edge development version of Trigon, you can
+install it manually by following these steps:
+1. **Download the source** using a `git clone` of the [Trigon
+ repository](https://gitlab.com/thlamb/beamertheme-trigon) or as a [zip
+ 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
+ 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
+ document.
+
+### Overleaf
+Trigon is not yet included in default TexLive installations. Therefore, it is
+not natively available on [Overleaf](https://overleaf.com) (it should be
+included at the end of Q3 2021). In the meantime, a template project was made
+and will be kept updated with the current master version. To use it, follow
+[this link](https://www.overleaf.com/read/dvbnhdcbfknk), copy the project
+(menu/copy project) and modify it to your needs.
+
+Once the theme will be properly included to Overleaf, a basic template will be
+added to the Overleaf theme gallery.
## Usage
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex
new file mode 100644
index 0000000000..5c38f0636d
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex
@@ -0,0 +1,280 @@
+%--------------------------------------
+% Create title frame
+\titleframe
+
+%--------------------------------------
+% Table of contents
+\begin{frame}{Overview}
+ \setbeamertemplate{section in toc}[sections numbered]
+ \tableofcontents[hideallsubsections]
+\end{frame}
+
+
+%==============================================
+\section{Introduction}
+%==============================================
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{A short introduction to Trigon}
+ \themename is a modern, elegant and versatile theme for Beamer, inspired by
+ the
+ \href{https://github.com/matze/mtheme}{\textsc{metropolis} theme} from Matthias
+ Vogelgesang.
+ \vfill
+ \themename comes with lots of nice extra features
+ \begin{itemize}
+ \item Multiple style variations for title, section and normal slides
+ \item Simple customization of theme colors
+ \item Lots of convenient options to tweak the design
+ \end{itemize}
+\end{frame}
+
+
+%==============================================
+\section{Layout}
+%==============================================
+
+\subsection{Layout variations}
+
+\begin{frame}[fragile=singleslide]{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ The general style for the title, section and regular frames can be changed
+ easily with simple options. Here are some examples for the title page
+ \begin{figure}[ht!]
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-03.jpg}}
+ \caption*{plain}
+ \end{subfigure}
+ \hspace{\fill}
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-02.jpg}}
+ \caption*{style1}
+ \end{subfigure}
+ \hspace{\fill}
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-01.jpg}}
+ \caption*{style2 (default)}
+ \end{subfigure}
+ \end{figure}
+\end{frame}
+
+%--------------------------------------
+\subsection{Fonts}
+
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ This theme is using \textit{Source Sans Pro} font for all elements by default.
+ This can be disabled by providing the option \texttt{usesourcefonts=false}.
+ \vfill
+ 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
+ \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*}
+\end{frame}
+
+
+%==============================================
+\section{Elements}
+%==============================================
+\subsection{Charts}
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{columns}[c, onlytextwidth]
+ \column{0.47\textwidth}
+ Use the theme color \texttt{tPrim}, \texttt{tSec}, \texttt{tGrey} and
+ \texttt{tAccent} to have charts directly fit the main theme of presentation.
+ \vfill
+ \begin{itemize}
+ \item Easy variants using \texttt{color!x} to lighten or darken the colors
+ \end{itemize}
+ \hfill
+ \column{0.47\textwidth}
+ \center
+ \resizebox{0.9\textwidth}{!}{%
+ \begin{tikzpicture}
+ \pie[color={tPrim, tPrim!75, tPrim!50, tPrim!25},
+ rotate=90, hide number, text= legend]
+ {50/tPrim, 32/tPrim!75, 16/tPrim!50, 2/tPrim!25}
+ \end{tikzpicture}
+ }
+ \end{columns}
+\end{frame}
+
+\subsection{Lists}
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{columns}[T,onlytextwidth]
+ \column{0.28\textwidth}
+ Items
+ \begin{itemize}
+ \item Item 1
+ \begin{itemize}
+ \item Subitem 1
+ \item Subitem 2
+ \end{itemize}
+ \item Item 2
+ \item Item 3
+ \end{itemize}
+
+ \column{0.42\textwidth}
+ Enumerations
+ \begin{enumerate}
+ \item The Fellowship of the Ring,
+ \item The Two Towers,
+ \item The Return of the King.
+ \end{enumerate}
+
+ \column{0.30\textwidth}
+ Descriptions
+ \begin{description}
+ \item[Trigon] Modern. \item[Default] Outdated.
+ \end{description}
+ \end{columns}
+\end{frame}
+
+%--------------------------------------
+\subsection{Figures}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+
+ \begin{figure}
+ \newcounter{density}
+ \setcounter{density}{20}
+ \begin{tikzpicture}
+ \def\couleur{tAccent}
+ \def\color{tSec}
+ \path[coordinate] (0,0) coordinate(A)
+ ++( 60:5cm) coordinate(B)
+ ++(-60:5cm) coordinate(C);
+ \path[coordinate] (0,0) coordinate(D)
+ ++(60:5cm) coordinate(E)
+ ++(180:5cm) coordinate(F);
+ \draw[fill=\couleur!\thedensity] (A) -- (B) -- (C) -- cycle;
+ \draw[fill=\color!\thedensity] (D) -- (E) -- (F) -- cycle;
+ \foreach \x in {1,...,15}{%
+ \pgfmathsetcounter{density}{\thedensity+10}
+ \setcounter{density}{\thedensity}
+ \path[coordinate] coordinate(X) at (A){};
+ \path[coordinate] (A) -- (B) coordinate[pos=.15](A)
+ -- (C) coordinate[pos=.15](B)
+ -- (X) coordinate[pos=.15](C);
+ \draw[fill=\couleur!\thedensity] (A)--(B)--(C)--cycle;
+ }
+ \setcounter{density}{20}
+ \foreach \x in {1,...,15}{%
+ \pgfmathsetcounter{density}{\thedensity+10}
+ \setcounter{density}{\thedensity}
+ \path[coordinate] coordinate(X) at (D){};
+ \path[coordinate] (D) -- (E) coordinate[pos=.15](D)
+ -- (F) coordinate[pos=.15](E)
+ -- (X) coordinate[pos=.15](F);
+ \draw[fill=\color!\thedensity] (D)--(E)--(F)--cycle;
+ }
+ \end{tikzpicture}
+ \caption{Rotated triangles from
+ \href{http://www.texample.net/tikz/examples/rotated-triangle/}{texample.net}.}
+ \end{figure}
+\end{frame}
+
+%--------------------------------------
+\subsection{Tables}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{table}[H]
+ \centering
+ \caption{A nice table example}
+ \begin{tabular}{@{} lccc @{}}
+ \toprule
+ & \textbf{Velocity} & \textbf{Angle} & \textbf{Vertical force} \\
+ & $U$ & $\alpha$ & $F_z$ \\
+ & [m/s] & [$^\circ$] & [N] \\
+ \midrule
+ 2D simulation & 9 & 2 & 9.23 \\
+ 3D simulation & 10.0 & 3 & 15.039 \\
+ Experiment A & 11.31 & 2.5 & 13.2 \\
+ Experiment B & 11.26 & 2.7 & 12.6 \\
+ Experiment C & 11.33 & 2.47 & 13.6 \\
+ \bottomrule
+ \end{tabular}
+ \end{table}
+
+\end{frame}
+
+%--------------------------------------
+\subsection{Blocks}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{block}{Regular block}
+ Just a regular block
+ \end{block}
+ \begin{alertblock}{Alert block}
+ Some important thing
+ \end{alertblock}
+ \begin{exampleblock}{Example block}
+ No difference with regular block to avoid excessive distraction
+ \end{exampleblock}
+\end{frame}
+
+%--------------------------------------
+\subsection{Frame footer}
+{
+\setbeamertemplate{frame footer}{My custom footer}
+\begin{frame}[fragile]
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \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}
+\end{frame}
+}
+
+\begin{frame}{References}
+ Some references to showcase [allowframebreaks] \cite{knuth92,ConcreteMath,Simpson,Er01,greenwade93}
+\end{frame}
+
+%==============================================
+\section{Conclusion}
+%==============================================
+\begin{frame}{Summary}
+
+ Get the source of this theme and the demo presentation from
+
+ \begin{center}\url{gitlab.com/thlamb/beamertheme-trigon}\end{center}
+
+ As for \textsc{metropolis}, \themename is licensed under a
+ \href{http://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
+ Attribution-ShareAlike 4.0 International License}.
+
+ \begin{center}\ccbysa\end{center}
+
+\end{frame}
+
+%==============================================
+%\begin{frame}[standout]
+% Questions?
+%\end{frame}
+
+\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.
+
+ The best way to do this is to include the \verb|appendixnumberbeamer|
+ package 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}
+
+\begin{frame}[allowframebreaks]{References}
+
+ \bibliography{demo}
+ \bibliographystyle{abbrv}
+
+\end{frame}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
index 5ba9ff31de..b68674e1b7 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
index 9ac49cfa97..8b9e68a4ba 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
@@ -10,7 +10,7 @@
% Image for the title page (use includegraphics option to properly size/place it)
\titlegraphic{\includegraphics[height=\paperheight]{library.jpg}}
-\usetheme[sectionstyle=style2]{trigon}
+\usetheme[background=light,sectionstyle=style2]{trigon}
% Define logos to use (comment if no logo)
\biglogo{trigon_full.pdf} % Used on titlepage only
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
index e40dd1431f..f7d6503a2d 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
@@ -111,7 +111,7 @@
\themename found its origin and inspiration in the graphical guidelines
resulting from the visual identity overhaul of the
-\href{https://www.uliege.be}{Univeristy of Liège} (Belgium).\\
+\href{https://www.uliege.be}{University of Liège} (Belgium).\\
Although directly inspired from these guidelines, \themename was stripped out of
any mention or specificities related the University and its faculties. This
makes the \themename theme perfectly suitable for many different contexts.
@@ -130,6 +130,26 @@ Any feature request, issue report or merge requests are welcome.
%% ------------------------------------
\section{Getting Started}
+\subsection{Installing from CTAN}
+The latest stable version of \themename is available on
+\href{https://ctan.org/pkg/beamertheme-trigon}{CTAN} and should now be part of
+the usual \TeX\ distibutions (\TeX\ Live, Mac\TeX\ , Mik\TeX\ ), under the name
+\textit{beamertheme-trigon}. It means that if your distribution is kept
+up-to-date, the package should normally be already installed on your system. If
+this is not the case, consider updating the packages of your Tex distribution.
+
+For \TeX\ Live and Mac\TeX\ users, this usually means running
+\begin{lstlisting}
+tlmgr update --all
+\end{lstlisting}
+, or if administrative privileges are required
+\begin{lstlisting}
+sudo tlmgr update --all
+\end{lstlisting}
+
+For Mik\TeX\ users, please refer to \href{https://miktex.org/howto/update-miktex}{the official Mik\TeX\ documentation}.
+
+
\subsection{Installing from Gitlab}
If you want to use the cutting-edge development version of \themename, you can
@@ -163,14 +183,17 @@ options for advanced users:
\end{description}
-\subsection{Other install methods}
+\subsection{Overleaf}
+As of the writing of this documentation (September 5,2021), the theme is not yet
+natively supported on Overleaf. It will be added once they update their package
+list, which is planned for end of Q3 2021
+(\href{https://gitlab.com/thlamb/beamertheme-trigon/-/issues/1#note_558034187}{see
+discussion on that topic}).
-\themename will be proposed for integration on \href{https://www.ctan.org}{CTAN}
-shortly. It will then hopefully be integrated to texlive, miktex, etc. In the
-meantime, only the installation from Gitlab is possible.
+In the meantime, a \href{https://www.overleaf.com/read/dvbnhdcbfknk}{template
+project} was created on Overleaf so users can just copy this project and use
+that as a basis for their own presentation.
-Once accepted on CTAN, the theme will also be made available on
-\href{https://www.overleaf.com}{Overleaf}.
\subsection{A Minimal Example}
@@ -243,6 +266,11 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
\subsubsection{Main theme}
+\DescribeOption{background}{light,dark}{light}{%
+ Provides the option to have a dark background and light foreground instead of
+ the reverse.
+}
+
\DescribeOption{titleformat}%
{regular, smallcaps, allsmallcaps, allcaps}
{regular}{
@@ -254,7 +282,7 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
}
\DescribeOption{usesourcefonts}{true,false}{true}{%
- Choses if the |sourcesanspro| font package should be loaded |true| or not
+ Chooses if the |sourcesanspro| font package should be loaded |true| or not
|false|.
}
@@ -342,14 +370,15 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
and |example|.
}
-\DescribeOption{headingcolor}{black, theme}{black}{
+\DescribeOption{headingcolor}{default, theme}{default}{
Controls weather the color of all headings (title page, frame title, etc.)
- should be in |black| in a slightly darker shade of the theme color |theme|.
+ should be in black (|default|) or in a slightly darker shade of the theme
+ color |theme|.
}
-\DescribeOption{textgcolor}{black, theme}{black}{
- Controls weather the color of the regular text elements should be in |black|
- in a slightly darker shade of the theme color |theme|.
+\DescribeOption{textgcolor}{default, theme}{default}{
+ Controls weather the color of the regular text elements should be in black
+ (|default|) or in a slightly darker shade of the theme color |theme|.
}
\subsubsection{Font theme}
@@ -369,7 +398,7 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
The included \themename color theme is used by default, but its colors can be
easily changed to suit your tastes. All of the theme's styles are defined in
-terms of four colors:
+terms of a few main colors:
\begin{itemize}
\item |tPrim| The primary theme color, used for main triangle elements, and
for headings and text if the appropriate options are selected.
@@ -378,6 +407,10 @@ terms of four colors:
\item |tAccent| The accent color, used mostly for alerted text.
\item |tGrey| A grey color, used for background elements (triangles, blocks,
etc.).
+ \item |tTxt| The default text color.
+ \item |tBg| The default background color.
+ \item |tGreyBg| A tint of grey to use for the triangle elements.
+ \item |tTheme| A tint of the |tPrim| color to use for some triangle elements.
\end{itemize}
An easy way to customize the theme is to redefine these colors using
@@ -385,8 +418,7 @@ An easy way to customize the theme is to redefine these colors using
\begin{lstlisting}
\colorlet{tPrim}{ ... }
\colorlet{tSec}{ ... }
- \colorlet{tAccent}{ ... }
- \colorlet{tGrey}{ ... }
+ ...
\end{lstlisting}
in your preamble.
@@ -439,7 +471,7 @@ only alphabetic characters and do not require the expansion of any macros.
\section{License}
\themename is licensed under the terms of the
-\href{https://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
+\href{https://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
Attribution-ShareAlike 4.0} license.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
index 417c09721a..9e7a19cc6c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
index 521869762e..15e5a94897 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2021/03/25 v0.5.0 Trigon color theme]
+\ProvidesPackage{beamercolorthemetrigon}[2021/09/06 v0.6.0 Trigon color theme]
%</package>
% \fi
% \CheckSum{0}
@@ -35,15 +35,27 @@
%
%
% \subsubsection{Options}
+% \begin{macro}{colors}
+% Provides the option to have a dark background and light foreground instead
+% of the reverse.
+% \begin{macrocode}
+\pgfkeys{
+ /trigon/color/background/.cd,
+ .is choice,
+ dark/.code=\trigon@colors@dark,
+ light/.code=\trigon@colors@light
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{headingcolor}
% Select the color to use for all headings (title, section, frame, etc.).
% \begin{macrocode}
-\def\headcol{black}
+\def\headcol{tDefaulttxt}
\pgfkeys{
/trigon/color/headingcolor/.cd,
.is choice,
- black/.code=\def\headcol{black},
+ default/.code=\def\headcol{tTxt},
theme/.code=\def\headcol{tPrim}
}
% \end{macrocode}
@@ -56,8 +68,8 @@
\pgfkeys{
/trigon/color/textcolor/.cd,
.is choice,
- black/.code=\def\txtcol{black},
- theme/.code=\def\txtcol{tPrim!50!black}
+ default/.code=\def\txtcol{tTxt},
+ theme/.code=\def\txtcol{tPrim!50!tTxt}
}
% \end{macrocode}
% \end{macro}
@@ -78,9 +90,10 @@
% \begin{macrocode}
\newcommand{\trigon@color@setdefaults}{
\pgfkeys{/trigon/color/.cd,
+ background=light,
block=fill,
- headingcolor=black,
- textcolor=black
+ headingcolor=default,
+ textcolor=default
}
}
% \end{macrocode}
@@ -89,20 +102,43 @@
% \subsubsection{Base colors}
%
% \begin{macrocode}
-\definecolor{tPrim}{HTML}{00707F} % Green-Blue
-\definecolor{tSec}{HTML}{5FA4B0} % Green-Blue light
-\definecolor{tAccent}{HTML}{F07F3C} % Orange
-\definecolor{tGrey}{HTML}{E6E6E1} % Grey-Beige
+\definecolor{tGreenBlue}{HTML}{00707F}
+\definecolor{tGreenBlueLight}{HTML}{5FA4B0}
+\definecolor{tOrange}{HTML}{F07F3C}
+\definecolor{tYellowOrange}{HTML}{F8AA00}
+\definecolor{tBeigePale}{HTML}{E6E6E1}
+\definecolor{tBeige}{HTML}{C6C0B4}
+\definecolor{tDarkBg}{HTML}{232931}
+\definecolor{tDarkFg}{HTML}{EEEEEE}
+\definecolor{tLightBg}{HTML}{FFFFFF}
% \end{macrocode}
%
% \subsubsection{Derived elements}
%
% All the elements are set using the base colors defined here above.
% \begin{macrocode}
-\setbeamercolor{background canvas}{bg=white}
-\setbeamercolor{normal text}{fg=\txtcol, bg= }
+\newcommand{\trigon@colors@dark}{
+ \colorlet{tPrim}{tGreenBlueLight}
+ \colorlet{tSec}{tGreenBlue}
+ \colorlet{tAccent}{tYellowOrange}
+ \colorlet{tTxt}{tDarkFg}
+ \colorlet{tBg}{tDarkBg}
+ \colorlet{tGreyBg}{tGrey!7!tBg}
+}
+\newcommand{\trigon@colors@light}{
+ \colorlet{tPrim}{tGreenBlue}
+ \colorlet{tSec}{tGreenBlue}
+ \colorlet{tAccent}{tOrange}
+ \colorlet{tTxt}{black}
+ \colorlet{tBg}{tLightBg}
+ \colorlet{tGreyBg}{tGrey!25!tBg}
+}
+\colorlet{tGrey}{tBeige}
+\colorlet{tTheme}{tGreenBlue}
+\setbeamercolor{background canvas}{bg=tBg}
+\setbeamercolor{normal text}{fg=\txtcol, bg=tBg}
+\setbeamercolor{example text}{fg=tPrim}
\setbeamercolor{alerted text}{fg=tAccent}
-\setbeamercolor{example text}{fg=tSec}
\setbeamercolor{title}{fg=\headcol, bg= , parent=normal text}
\setbeamercolor{titlelike}{use=title, parent=title}
@@ -116,7 +152,7 @@
% \end{macrocode}
%
%
-% Block environments such as |theorem| and |example| have a |tGrey| background
+% Block environments such as |theorem| and |example| have a grey-tinted background
% color by default. The option |block=transparent| removes the background color.
% \begin{macrocode}
\newcommand{\trigon@block@transparent}{
@@ -134,7 +170,7 @@
\setbeamercolor{block title}{%
use=normal text,
fg=normal text.fg,
- bg=normal text.bg!80!fg
+ bg=normal text.bg!80!normal text.fg
}
\setbeamercolor{block body}{
use={block title, normal text},
@@ -158,18 +194,18 @@
%
% The color of other smaller elements is defined as follows
% \begin{macrocode}
-\setbeamercolor{footnote}{fg=normal text.fg!90}
+\setbeamercolor{footnote}{fg=normal text.fg!90!normal text.bg}
\setbeamercolor{footnote mark}{fg=.}
-\setbeamercolor{footline}{fg=normal text.fg!50, parent=normal text}
-\setbeamercolor{caption}{fg=black!60, parent=normal text}
+\setbeamercolor{footline}{fg=normal text.fg!50!normal text.bg, parent=normal text}
+\setbeamercolor{caption}{fg=normal text.fg!60!normal text.bg, parent=normal text}
-\setbeamercolor{itemize item}{fg=tPrim, parent=normal text}
+\setbeamercolor{itemize item}{use=example text, parent=example text}
\setbeamercolor{itemize subitem}{use=itemize item, parent=itemize item}
\setbeamercolor{itemize subsubitem}{use=itemize item, parent=itemize item}
-\setbeamercolor{enumerate item}{fg=tPrim, parent=normal text}
+\setbeamercolor{enumerate item}{use=example text, parent=example text}
\setbeamercolor{enumerate subitem}{use=enumerate item, parent=enumerate item}
\setbeamercolor{enumerate subsubitem}{use=enumerate item, parent=enumerate item}
-\setbeamercolor{description item}{fg=tPrim, parent=normal text}
+\setbeamercolor{description item}{use=example text, parent=example text}
% \end{macrocode}
%
% \subsubsection{Process package options}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
index fcc9ed34a3..74e5ee3965 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2021/03/25 v0.5.0 Trigon font theme]
+\ProvidesPackage{beamerfontthemetrigon}[2021/09/06 v0.6.0 Trigon font theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
index c234dfc343..60344f6d4b 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2021/03/25 v0.5.0 Trigon inner theme]
+\ProvidesPackage{beamerinnerthemetrigon}[2021/09/06 v0.6.0 Trigon inner theme]
%</package>
% \fi
% \CheckSum{0}
@@ -79,9 +79,12 @@
\pgfkeys{
/trigon/inner/slidestyle/.cd,
.is choice,
- blank/.code=\def\slidestyle{blank},
- style1/.code=\def\slidestyle{smallcornertriangle},
+ blank/.code=\def\slidestyle{blank}
+ \setbeamertemplate{background}[\slidestyle],
+ style1/.code=\def\slidestyle{smallcornertriangle}
+ \setbeamertemplate{background}[\slidestyle],
cyber/.code=\def\slidestyle{cyberbottom}
+ \setbeamertemplate{background}[\slidestyle]
}
% \end{macrocode}
% \end{macro}
@@ -221,7 +224,7 @@
\defbeamertemplate{background}{smallcornertriangle}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30}
+ \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -232,10 +235,10 @@
% frames when the appropriate option is selected).
% \begin{macrocode}
\defbeamertemplate{background}{cyberbottom}{
-\tikzstyle{cyberVertex}=[scale=1,draw=tGrey!60,circle,fill=white]
-\tikzstyle{cyberVertex2}=[scale=0.5,draw=tGrey!60,circle,fill=tGrey!60]
-\tikzstyle{cyberEdge} = [draw,color=tGrey!60]
-\begin{tikzpicture}[blend group=multiply]
+\tikzstyle{cyberVertex}=[scale=1,draw=tGreyBg,circle,fill=tBg]
+\tikzstyle{cyberVertex2}=[scale=0.5,draw=tGreyBg,circle,fill=tGreyBg]
+\tikzstyle{cyberEdge} = [draw,color=tGreyBg]
+\begin{tikzpicture}%[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
\foreach \pos/\name in {
{(-0.05\paperwidth,0.75\paperheight)/0},
@@ -278,16 +281,16 @@
\begin{tikzpicture}
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
\begin{scope}[blend group=multiply]
- \path[fill=tPrim]\leftTriangle{0.5\paperwidth}{0};
- \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30};
+ \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}{tPrim}
+ \leftColorTriangle{0.73\paperwidth}{0.70\paperheight}{tTheme}
\else
\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}
- \path[fill=white]\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) {\includegraphics[width=0.28\textwidth]{\logbig}};
@@ -303,12 +306,12 @@
\defbeamertemplate{background}{titlesmallimage}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.58\paperwidth}{0}{tGrey!30}
+ \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}};
\fi
\ifx\inserttitlegraphic\@empty
- \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tPrim}
+ \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme}
\else
\path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight};
\node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
@@ -325,7 +328,7 @@
\defbeamertemplate{background}{bottomtrianglescolor}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tPrim}
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
\rightColorTriangle{0.38\paperwidth}{0}{tSec}
\end{tikzpicture}
}
@@ -339,8 +342,8 @@
\defbeamertemplate{background}{bottomtrianglesbw}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tPrim}
- \rightColorTriangle{0.38\paperwidth}{0}{tGrey}
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -352,8 +355,8 @@
\defbeamertemplate{background}{bigtriangles}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tPrim}
- \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey}
+ \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
+ \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -365,8 +368,8 @@
\defbeamertemplate{background}{lefttriangles}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tPrim}
- \leftColorTriangle{0.775\paperwidth}{0}{tGrey}
+ \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
+ \leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
index e8302d4e23..41ab019fc5 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2021/03/25 v0.5.0 Trigon outer theme]
+\ProvidesPackage{beamerouterthemetrigon}[2021/09/06 v0.6.0 Trigon outer theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
index 1cd8f763f6..b12e1dc7e8 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2021/03/25 v0.5.0 Trigon Beamer theme]
+\ProvidesPackage{beamerthemetrigon}[2021/09/06 v0.6.0 Trigon Beamer theme]
%</package>
% \fi
% \CheckSum{0}