From a7ef56f18421a8ffb9d34c16ff9f017e45e4e6d3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 7 Sep 2021 03:03:54 +0000 Subject: CTAN sync 202109070303 --- .../source/beamercolorthemetrigon.dtx | 80 ++++++++++++++++------ 1 file changed, 58 insertions(+), 22 deletions(-) (limited to 'macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx') 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] % % \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} -- cgit v1.2.3