texlive[61020] Master/texmf-dist: beamertheme-trigon (10nov21)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 10 22:18:14 CET 2021
Revision: 61020
http://tug.org/svn/texlive?view=revision&revision=61020
Author: karl
Date: 2021-11-10 22:18:14 +0100 (Wed, 10 Nov 2021)
Log Message:
-----------
beamertheme-trigon (10nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.tex
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx
trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty
trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty
trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty
trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty
trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf
trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf
trunk/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile
Modified: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/README.md 2021-11-10 21:18:14 UTC (rev 61020)
@@ -20,8 +20,8 @@
minimization for the main body of the work.
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.
+and a template is publicly available on the [Overleaf
+Gallery][overleaf-gallery].
Feature requests, issues and pull requests are welcome.
@@ -29,7 +29,8 @@
- Multiple style variations for title, section and regular slides
- Dark theme
-- Many convenient options (numbering style, toggle section slides, title font changes,...)
+- 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)
- Similar options than with [Metropolis theme](https://github.com/matze/mtheme)
@@ -41,19 +42,19 @@
use other fonts, the package can be disabled using the option
`usesourcefonts=false`.
+## Screenshots
-## Screenshots
Default Style | Example alternative style
----------------------------------------|---------------------------------------
- | 
- | 
- | 
- | 
- | 
- | 
+ | 
+ | 
+ | 
+ | 
+ | 
+ | 
+## Installation
-## 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
@@ -62,6 +63,7 @@
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)
@@ -74,18 +76,20 @@
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.
+Since October 2021, [TexLive 2011 is availabe 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).
+In addition to that, a template project was created and is publicly availabe in
+the [Overleaf Gallery][overleaf-gallery] to bootstrap your presentation.
## Usage
+
See [the package documentation][docs-url] for a detailed view of the package
options.
@@ -97,6 +101,7 @@
If you want to propose an interesting alternative layout for this theme (for
the title, section or regular slides), please make sure to respect the
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
@@ -121,9 +126,8 @@
is essentially a _free software_ license. Do not hesitate to copy and modify
the code to fit your needs.
-
[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
Modified: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/frames.tex 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,6 +13,7 @@
%==============================================
\section{Introduction}
%==============================================
+
\begin{frame}{\insertsectionhead}
\framesubtitle{A short introduction to Trigon}
\themename is a modern, elegant and versatile theme for Beamer, inspired by
@@ -79,7 +80,9 @@
%==============================================
\section{Elements}
%==============================================
+
\subsection{Charts}
+
\begin{frame}{\insertsectionhead}
\framesubtitle{\insertsubsectionhead}
\begin{columns}[c, onlytextwidth]
@@ -103,7 +106,9 @@
\end{columns}
\end{frame}
+%--------------------------------------
\subsection{Lists}
+
\begin{frame}{\insertsectionhead}
\framesubtitle{\insertsubsectionhead}
\begin{columns}[T,onlytextwidth]
@@ -137,6 +142,7 @@
%--------------------------------------
\subsection{Figures}
+
\begin{frame}
\frametitle{\insertsectionhead}
\framesubtitle{\insertsubsectionhead}
@@ -182,6 +188,7 @@
%--------------------------------------
\subsection{Tables}
+
\begin{frame}
\frametitle{\insertsectionhead}
\framesubtitle{\insertsubsectionhead}
@@ -207,6 +214,7 @@
%--------------------------------------
\subsection{Blocks}
+
\begin{frame}
\frametitle{\insertsectionhead}
\framesubtitle{\insertsubsectionhead}
@@ -223,14 +231,15 @@
%--------------------------------------
\subsection{Frame footer}
+
{
-\setbeamertemplate{frame footer}{My custom footer}
-\begin{frame}[fragile]
- \frametitle{\insertsectionhead}
- \framesubtitle{\insertsubsectionhead}
+ \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}
+ \end{frame}
}
\begin{frame}{References}
@@ -240,11 +249,13 @@
%==============================================
\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}
+ \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
@@ -251,14 +262,9 @@
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}
@@ -272,9 +278,8 @@
slides in the appendix.
\end{frame}
+%--------------------------------------
\begin{frame}[allowframebreaks]{References}
-
\bibliography{demo}
\bibliographystyle{abbrv}
-
\end{frame}
Added: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg 2021-11-10 21:18:14 UTC (rev 61020)
Property changes on: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/library.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.tex 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_demo.tex 2021-11-10 21:18:14 UTC (rev 61020)
@@ -17,6 +17,7 @@
\smalllogo{trigon_small.pdf} % Used on top right corner of regular frames
% ------ If you want to change the theme default colors, do it here ------
+%\definecolor{tTheme}{HTML}{00843B} % Green
%\definecolor{tPrim}{HTML}{00843B} % Green
%\definecolor{tSec}{HTML}{289B38} % Green light
%\definecolor{tAccent}{HTML}{F07F3C} % Orange
@@ -25,7 +26,7 @@
% ------ Packages and definitions used for this demo. Can be removed ------
\usepackage{appendixnumberbeamer} % To use \appendix command
\pdfstringdefDisableCommands{% Fix hyperref translate warning with \appendix
-\def\translate#1{#1}%
+ \def\translate#1{#1}%
}
\usepackage{pgf-pie} % For pie charts
\usepackage{caption} % For subfigures
@@ -39,6 +40,7 @@
%==============================================================================
% BEGIN DOCUMENT
%==============================================================================
+
\begin{document}
\include{frames}
Added: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf 2021-11-10 21:18:14 UTC (rev 61020)
Property changes on: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_full.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf 2021-11-10 21:18:14 UTC (rev 61020)
Property changes on: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigon_small.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/beamertheme-trigon/trigontheme.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile (rev 0)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile 2021-11-10 21:18:14 UTC (rev 61020)
@@ -0,0 +1,127 @@
+MAKEFLAGS := -j 1
+
+INS = source/beamerthemetrigon.ins
+PACKAGE_SRC = $(wildcard source/*.dtx)
+PACKAGE_STY = $(notdir $(PACKAGE_SRC:%.dtx=%.sty))
+
+DEMO_SRC = demo/trigon_demo.tex
+DEMO_PDF = demo/trigon_demo.pdf
+DEMO_ALT_SRC= demo/trigon_demo_alt.tex
+DEMO_ALT_PDF= demo/trigon_demo_alt.pdf
+DEMO_SRC_OTHER = demo/frames.tex \
+ demo/library.jpg \
+ demo/trigon_full.pdf \
+ demo/trigon_small.pdf
+
+DOC_SRC = docs/trigontheme.dtx
+DOC_PDF = docs/trigontheme.pdf
+
+LAYOUTS_SRC = screenshots/trigon_layouts.tex
+LAYOUTS_PDF = screenshots/trigon_layouts.pdf
+LAYOUTS_IMG := screenshots/layout_example-01.jpg \
+ screenshots/layout_example-02.jpg \
+ screenshots/layout_example-03.jpg
+
+TESTS_DIR = tests/
+TESTS_SRC = $(wildcard tests/test-*.tex)
+TESTS_PDF = $(notdir $(TESTS_SRC:%.tex=%.pdf))
+
+CTAN_CONTENT = README.md Makefile $(INS) $(PACKAGE_SRC) $(DOC_SRC) $(DOC_PDF) $(DEMO_SRC) $(DEMO_SRC_OTHER) $(DEMO_PDF)
+
+DESTDIR ?= $(shell kpsewhich -var-value=TEXMFHOME)
+INSTALL_DIR = $(DESTDIR)/tex/latex/beamertheme-trigon
+DOC_DIR = $(DESTDIR)/doc/latex/beamertheme-trigon
+LATEXMK_CONF = $(shell pwd)/latexmkrc
+CACHE_DIR := $(shell pwd)/.latex-cache
+
+COMPILE_TEX := latexmk -xelatex -cd
+CLEAN_TEX := latexmk -c -cd
+CLEAN_PDF := latexmk -C -cd
+
+export TEXINPUTS:=$(shell pwd):$(shell pwd)//:${TEXINPUTS}
+
+.PHONY: all sty doc demo layouts screenshots tests clean install uninstall ctan clean-cache clean-sty Clean pkg-version
+
+all: sty layouts doc demo
+
+sty: $(PACKAGE_STY)
+
+doc: $(DOC_PDF)
+
+demo: $(DEMO_PDF) $(DEMO_ALT_PDF)
+
+layouts: $(LAYOUTS_IMG)
+
+screenshots: $(LAYOUTS_SRC) $(DEMO_PDF) $(DEMO_ALT_PDF)
+ @cd $(dir $(DEMO_PDF)) && pdftoppm $(notdir $(DEMO_PDF)) trigon_demo -jpeg
+ @cd $(dir $(DEMO_ALT_PDF)) && pdftoppm $(notdir $(DEMO_ALT_PDF)) trigon_demo_alt -jpeg
+ @mv $(dir $(DEMO_PDF))trigon_demo*-{01,03,04,07,09,13}.jpg $(dir $(LAYOUTS_SRC))/.
+ @rm $(dir $(DEMO_PDF))trigon_demo*.jpg
+
+tests: $(TESTS_PDF)
+
+clean: clean-cache clean-sty
+
+Clean: clean clean-pdf clean-img
+
+install: $(PACKAGE_STY) $(DOC_PDF)
+ @mkdir -p $(INSTALL_DIR)
+ @cp $(PACKAGE_STY) $(INSTALL_DIR)
+ @mkdir -p $(DOC_DIR)
+ @cp $(DOC_PDF) $(DOC_DIR)
+
+uninstall:
+ @rm -f "$(addprefix $(INSTALL_DIR)/, $(PACKAGE_STY))"
+ @rmdir "$(INSTALL_DIR)"
+ @rm -f "$(DOC_DIR)/$(notdir $(DOC_PDF))"
+ @rmdir "$(DOC_DIR)"
+
+clean-cache:
+ @rm -rf "$(CACHE_DIR)"
+ $(CLEAN_TEX) $(PACKAGE_SRC) $(DEMO_SRC) $(DEMO_ALT_SRC) $(DOC_SRC) $(LAYOUTS_SRC) $(TESTS_SRC)
+
+clean-pdf:
+ $(CLEAN_PDF) $(PACKAGE_SRC) $(DEMO_SRC) $(DEMO_ALT_SRC) $(DOC_SRC) $(LAYOUTS_SRC) $(TESTS_SRC)
+
+clean-sty:
+ @rm -f $(PACKAGE_STY)
+
+clean-img:
+ @rm -f $(dir $(LAYOUTS_SRC))/*.jpg
+
+
+ctan: $(CTAN_CONTENT) pkg-version
+ @tar --transform "s@\(.*\)@trigon/\1@" -cf trigon-$(shell date "+%Y-%m-%d").tar.gz $(CTAN_CONTENT)
+
+pkg-version:
+ @sed -i 's at v\([0-9]\{1,\}\.\)\{1,\}[0-9]\{1,\}@$(shell git describe --abbrev=0 --tags)@g' $(PACKAGE_SRC)
+ @sed -i 's@\[20[0-9][0-9]/[0-9]*/[0-9]*@\[$(shell date "+%Y/%m/%d")@g' $(PACKAGE_SRC)
+
+$(CACHE_DIR):
+ @mkdir -p $(CACHE_DIR)
+
+$(PACKAGE_STY): $(PACKAGE_SRC) $(INS) | clean-cache $(CACHE_DIR)
+ @cd $(dir $(INS)) && latex -output-directory=$(CACHE_DIR) $(notdir $(INS))
+ @cp $(addprefix $(CACHE_DIR)/,$(PACKAGE_STY)) .
+
+$(DOC_PDF): $(DOC_SRC) $(PACKAGE_STY) $(LAYOUTS_IMG)
+ $(CLEAN_TEX) $(DOC_SRC)
+ $(COMPILE_TEX) $(DOC_SRC)
+
+$(DEMO_PDF): $(LAYOUTS_IMG) $(DEMO_SRC) $(PACKAGE_STY)
+ $(CLEAN_TEX) $(DEMO_SRC)
+ $(COMPILE_TEX) $(DEMO_SRC)
+
+$(DEMO_ALT_PDF): $(LAYOUTS_IMG) $(DEMO_ALT_SRC) $(PACKAGE_STY)
+ $(CLEAN_TEX) $(DEMO_ALT_SRC)
+ $(COMPILE_TEX) $(DEMO_ALT_SRC)
+
+$(LAYOUTS_PDF): $(LAYOUTS_SRC) $(PACKAGE_STY)
+ $(CLEAN_TEX) $(LAYOUTS_SRC)
+ $(COMPILE_TEX) $(LAYOUTS_SRC)
+
+$(LAYOUTS_IMG): $(LAYOUTS_PDF)
+ @cd $(dir $(LAYOUTS_PDF)) && pdftoppm $(notdir $(LAYOUTS_PDF)) layout_example -jpeg
+
+$(TESTS_PDF): $(TESTS_SRC) $(PACKAGE_STY)
+ $(COMPILE_TEX) -quiet $(TESTS_SRC)
Property changes on: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2021/09/06 v0.6.0 Trigon color theme]
+\ProvidesPackage{beamercolorthemetrigon}[2021/11/10 v0.6.2 Trigon color theme]
%</package>
% \fi
% \CheckSum{0}
@@ -32,68 +32,67 @@
\RequirePackage{pgfopts}
% \end{macrocode}
%
+% \subsubsection{Options}
%
-%
-% \subsubsection{Options}
% \begin{macro}{colors}
-% Provides the option to have a dark background and light foreground instead
-% of the reverse.
+% 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 at colors@dark,
- light/.code=\trigon at colors@light
+ .is choice,
+ dark/.code=\trigon at colors@dark,
+ light/.code=\trigon at colors@light
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{headingcolor}
-% Select the color to use for all headings (title, section, frame, etc.).
+% Select the color to use for all headings (title, section, frame, etc.).
% \begin{macrocode}
\def\headcol{tDefaulttxt}
\pgfkeys{
/trigon/color/headingcolor/.cd,
- .is choice,
- default/.code=\def\headcol{tTxt},
- theme/.code=\def\headcol{tPrim}
+ .is choice,
+ default/.code=\def\headcol{tTxt},
+ theme/.code=\def\headcol{tPrim}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{textcolor}
-% Select the color to use for all headings (title, section, frame, etc.).
+% Select the color to use for all headings (title, section, frame, etc.).
% \begin{macrocode}
\def\txtcol{black}
\pgfkeys{
/trigon/color/textcolor/.cd,
- .is choice,
- default/.code=\def\txtcol{tTxt},
- theme/.code=\def\txtcol{tPrim!50!tTxt}
+ .is choice,
+ default/.code=\def\txtcol{tTxt},
+ theme/.code=\def\txtcol{tPrim!50!tTxt}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{block}
-% Optionally removes the light grey background to block environments like
-% |theorem| and |example|.
+% Optionally removes the light grey background to block environments like
+% |theorem| and |example|.
% \begin{macrocode}
\pgfkeys{
/trigon/color/block/.cd,
- .is choice,
- transparent/.code=\trigon at block@transparent,
- fill/.code=\trigon at block@fill
+ .is choice,
+ transparent/.code=\trigon at block@transparent,
+ fill/.code=\trigon at block@fill
}
%
% \begin{macro}{\trigon at color@setdefaults}
-% Sets default values for color theme options.
+% Sets default values for color theme options.
% \begin{macrocode}
\newcommand{\trigon at color@setdefaults}{
\pgfkeys{/trigon/color/.cd,
- background=light,
- block=fill,
- headingcolor=default,
- textcolor=default
+ background=light,
+ block=fill,
+ headingcolor=default,
+ textcolor=default
}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2021/09/06 v0.6.0 Trigon font theme]
+\ProvidesPackage{beamerfontthemetrigon}[2021/11/10 v0.6.2 Trigon font theme]
%</package>
% \fi
% \CheckSum{0}
@@ -25,147 +25,144 @@
% \subsection{\themename font theme}
% A |beamer| font theme sets the style of the font used in the document.
%
-%
% \subsubsection{Package dependencies}
% \begin{macrocode}
\RequirePackage{pgfopts}
% \end{macrocode}
%
-%
-%
% \subsubsection{Title format options}
%
% \begin{macro}{titleformat title}
-% Controls the format of the title.
+% Controls the format of the title.
% \begin{macrocode}
\pgfkeys{
/trigon/font/titleformat title/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at titleformat\@empty%
- \setbeamerfont{title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at titleformat\@empty%
- \setbeamerfont{title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at titleformat\lowercase%
- \setbeamerfont{title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at titleformat\uppercase%
- \setbeamerfont{title}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at titleformat\@empty%
+ \setbeamerfont{title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at titleformat\@empty%
+ \setbeamerfont{title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at titleformat\lowercase%
+ \setbeamerfont{title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat title=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at titleformat\uppercase%
+ \setbeamerfont{title}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat title=allcaps can lead to problems%
+ }
+ },
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titleformat subtitle}
-% Controls the format of the subtitle.
+% Controls the format of the subtitle.
% \begin{macrocode}
\pgfkeys{
/trigon/font/titleformat subtitle/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at subtitleformat\lowercase%
- \setbeamerfont{subtitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at subtitleformat\uppercase%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at subtitleformat\lowercase%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at subtitleformat\uppercase%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat subtitle=allcaps can lead to problems%
+ }
+ },
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titleformat section}
-% Controls the format of the section title.
+% Controls the format of the section title.
% \begin{macrocode}
\pgfkeys{
/trigon/font/titleformat section/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at sectiontitleformat\MakeLowercase%
- \setbeamerfont{section title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat section=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at sectiontitleformat\MakeUppercase%
- \setbeamerfont{section title}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat section=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at sectiontitleformat\MakeLowercase%
+ \setbeamerfont{section title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat section=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at sectiontitleformat\MakeUppercase%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat section=allcaps can lead to problems%
+ }
+ },
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titleformat frame}
-% Controls the format of the frame title.
+% Controls the format of the frame title.
% \begin{macrocode}
\pgfkeys{
/trigon/font/titleformat frame/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at frametitleformat\MakeLowercase%
- \setbeamerfont{frametitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at frametitleformat\MakeUppercase%
- \setbeamerfont{frametitle}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at frametitleformat\MakeLowercase%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat frame=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at frametitleformat\MakeUppercase%
+ \setbeamerfont{frametitle}{shape=\normalfont}
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat frame=allcaps can lead to problems%
+ }
+ },
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titleformat aliases}
-% Allows |titleformat title| et al. to be used in the |\usetheme|
-% declaration, where \LaTeX{} automatically removes all spaces.
+% Allows |titleformat title| et al. to be used in the |\usetheme|
+% declaration, where \LaTeX{} automatically removes all spaces.
% \begin{macrocode}
\pgfkeys{
/trigon/font/.cd,
@@ -178,7 +175,7 @@
% \end{macro}
%
% \begin{macro}{\trigon at font@setdefaults}
-% Sets default values for font theme options.
+% Sets default values for font theme options.
% \begin{macrocode}
\newcommand{\trigon at font@setdefaults}{
\pgfkeys{/trigon/font/.cd,
@@ -205,64 +202,63 @@
% This solution was suggested by Enrico Gregorio in an answer to
% \href{http://tex.stackexchange.com/questions/112526/}{this StackExchange
% question}.
-%
% \begin{macrocode}
\patchcmd{\beamer at title}%
- {\def\inserttitle{#2}}%
- {\def\inserttitle{\trigon at titleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
+{\def\inserttitle{#2}}%
+{\def\inserttitle{\trigon at titleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
\patchcmd{\beamer at subtitle}%
- {\def\insertsubtitle{#2}}%
- {\def\insertsubtitle{\trigon at subtitleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
+{\def\insertsubtitle{#2}}%
+{\def\insertsubtitle{\trigon at subtitleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
\patchcmd{\sectionentry}
- {\def\insertsectionhead{#2}}
- {\def\insertsectionhead{\trigon at sectiontitleformat{#2}}}
- {}
- {\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
+{\def\insertsectionhead{#2}}
+{\def\insertsectionhead{\trigon at sectiontitleformat{#2}}}
+{}
+{\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
\@tempswafalse
\patchcmd{\beamer at section}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at section}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{%
- \trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{%
+\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at section}
- {\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
- {\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
+{\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if at tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
\@tempswafalse
\patchcmd{\beamer at subsection}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at subsection}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{%
- \trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{%
+\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at subsection}
- {\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
- {\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
+{\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if at tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
@@ -273,24 +269,23 @@
%
% \begin{macrocode}
\patchcmd{\beamer@@frametitle}
- {{%
- \gdef\insertframetitle{{#2\ifnum\beamer at autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+{{%
+ \gdef\insertframetitle{{#2\ifnum\beamer at autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer at frametitle{#2}%
\gdef\beamer at shortframetitle{#1}%
- }}
- {{%
- \gdef\insertframetitle{{\trigon at frametitleformat{#2}\ifnum%
- \beamer at autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+}}
+{{%
+ \gdef\insertframetitle{{\trigon at frametitleformat{#2}\ifnum%
+ \beamer at autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer at frametitle{#2}%
\gdef\beamer at shortframetitle{#1}%
- }}
- {}
- {\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc}
+}}
+{}
+{\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc}
% \end{macrocode}
%
-%
% \subsubsection{General font definitions}
%
% \begin{macrocode}
@@ -313,7 +308,7 @@
\setbeamerfont{description item}{series=\bfseries}
\setbeamerfont{caption}{size=\small}
\setbeamerfont{caption name}{series=\bfseries}
-% \end{macrocode}
+% \end{macrocode}
%
% \subsubsection{Process package options}
%
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2021/09/06 v0.6.0 Trigon inner theme]
+\ProvidesPackage{beamerinnerthemetrigon}[2021/11/10 v0.6.2 Trigon inner theme]
%</package>
% \fi
% \CheckSum{0}
@@ -36,7 +36,6 @@
% \item footnotes and plain text.
% \end{itemize}
%
-%
% \subsubsection{Package dependencies}
%
% \begin{macrocode}
@@ -45,75 +44,74 @@
\usetikzlibrary{calc,3d}
% \end{macrocode}
%
+% \subsubsection{Definitions}
%
-% \subsubsection{Definitions}
% We define the command |\logobig| to specify the logo that needs to be applied
% displayed on the title frame.
% \begin{macrocode}
\def\logbig{}
\newcommand\biglogo[1]{
- \def\logbig{#1}
+ \def\logbig{#1}
}
% \end{macrocode}
%
-%
% \subsubsection{Options}
%
% \begin{macro}{sectionpage}
-% Controls whereas a slide with the section title should be inserted at the
-% beginning of the section or not.
+% Controls whereas a slide with the section title should be inserted at the
+% beginning of the section or not.
% \begin{macrocode}
\pgfkeys{
- /trigon/inner/sectionpage/.cd,
- .is choice,
- none/.code=\trigon at disablesectionpage,
- simple/.code=\trigon at enablesectionpage
+ /trigon/inner/sectionpage/.cd,
+ .is choice,
+ none/.code=\trigon at disablesectionpage,
+ simple/.code=\trigon at enablesectionpage
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{slidestyle}
-% Controls the layout that should be used for regular slides.
+% Controls the layout that should be used for regular slides.
% \begin{macrocode}
\def\slidestyle{}
\pgfkeys{
- /trigon/inner/slidestyle/.cd,
- .is choice,
- blank/.code=\def\slidestyle{blank}
- \setbeamertemplate{background}[\slidestyle],
- style1/.code=\def\slidestyle{smallcornertriangle}
- \setbeamertemplate{background}[\slidestyle],
- cyber/.code=\def\slidestyle{cyberbottom}
- \setbeamertemplate{background}[\slidestyle]
+ /trigon/inner/slidestyle/.cd,
+ .is choice,
+ 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}
%
% \begin{macro}{titlestyle}
-% Controls the layout that should be used for the title page.
+% Controls the layout that should be used for the title page.
% \begin{macrocode}
\def\titlestyle{}
\pgfkeys{
- /trigon/inner/titlestyle/.cd,
- .is choice,
- plain/.code=\def\titlestyle{bottomtrianglescolor},
- style1/.code=\def\titlestyle{titlesmallimage},
- style2/.code=\def\titlestyle{titlebigimage}
+ /trigon/inner/titlestyle/.cd,
+ .is choice,
+ plain/.code=\def\titlestyle{bottomtrianglescolor},
+ style1/.code=\def\titlestyle{titlesmallimage},
+ style2/.code=\def\titlestyle{titlebigimage}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{sectionstyle}
-% Controls the layout that should be used for the title page.
+% Controls the layout that should be used for the title page.
% \begin{macrocode}
\def\sectionstyle{}
\pgfkeys{
- /trigon/inner/sectionstyle/.cd,
- .is choice,
- plain/.code=\def\sectionstyle{bottomtrianglescolor},
- style1/.code=\def\sectionstyle{bigtriangles},
- style2/.code=\def\sectionstyle{lefttriangles},
- style3/.code=\def\sectionstyle{bottomtrianglesbw}
+ /trigon/inner/sectionstyle/.cd,
+ .is choice,
+ plain/.code=\def\sectionstyle{bottomtrianglescolor},
+ style1/.code=\def\sectionstyle{bigtriangles},
+ style2/.code=\def\sectionstyle{lefttriangles},
+ style3/.code=\def\sectionstyle{bottomtrianglesbw}
}
% \end{macrocode}
% \end{macro}
@@ -120,20 +118,19 @@
%
%
% \begin{macro}{\trigon at inner@setdefaults}
-% Sets default values for the inner theme options.
+% Sets default values for the inner theme options.
% \begin{macrocode}
\newcommand{\trigon at inner@setdefaults}{
- \pgfkeys{/trigon/inner/.cd,
- sectionpage=simple,
- slidestyle=blank,
- titlestyle=style2,
- sectionstyle=plain
- }
+ \pgfkeys{/trigon/inner/.cd,
+ sectionpage=simple,
+ slidestyle=blank,
+ titlestyle=style2,
+ sectionstyle=plain
+ }
}
% \end{macrocode}
% \end{macro}
%
-%
% \subsubsection{Backgrounds}
%
% First of all, we define a few commands in order easily create the triangles
@@ -142,67 +139,67 @@
% fits the different aspect ratio possible.
%
% \begin{macro}{\leftTriangle}
-% Defines a triangle with the base on the left side (pointing right).
+% Defines a triangle with the base on the left side (pointing right).
% \begin{macrocode}
\newcommand{\leftTriangle}[2]{
- (#1,#2)
- -- (0,{#2 + tan(30)*#1} )
- -- (0,{#2 - tan(30)*#1} )
- -- cycle;
+ (#1,#2)
+ -- (0,{#2 + tan(30)*#1} )
+ -- (0,{#2 - tan(30)*#1} )
+ -- cycle;
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\righTriangle}
-% Defines a triangle with the base on the right side (pointing left).
+% Defines a triangle with the base on the right side (pointing left).
% \begin{macrocode}
\newcommand{\rightTriangle}[2]{
- (#1,#2)
- -- (\the\paperwidth,{#2 + tan(30)*(\the\paperwidth-#1)} )
- -- (\the\paperwidth,{#2 - tan(30)*(\the\paperwidth-#1)} )
- -- cycle;
+ (#1,#2)
+ -- (\the\paperwidth,{#2 + tan(30)*(\the\paperwidth-#1)} )
+ -- (\the\paperwidth,{#2 - tan(30)*(\the\paperwidth-#1)} )
+ -- cycle;
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\topTriangle}
-% Defines a triangle with the base on the bottom side (pointing top).
+% Defines a triangle with the base on the bottom side (pointing top).
% \begin{macrocode}
\newcommand{\topTriangle}[2]{
- (#1,#2)
- -- ({#1 - tan(60)*#2},0)
- -- ({#1 + tan(60)*#2},0)
- -- cycle;
+ (#1,#2)
+ -- ({#1 - tan(60)*#2},0)
+ -- ({#1 + tan(60)*#2},0)
+ -- cycle;
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\leftColorTriangle}
-% Defines a colored triangle with the base on the left side (pointing right).
+% Defines a colored triangle with the base on the left side (pointing right).
% \begin{macrocode}
\newcommand{\leftColorTriangle}[3]{
- \path[fill=#3]
- \leftTriangle{#1}{#2}
+ \path[fill=#3]
+ \leftTriangle{#1}{#2}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\righColorTriangle}
-% Defines a colored triangle with the base on the right side (pointing left).
+% Defines a colored triangle with the base on the right side (pointing left).
% \begin{macrocode}
\newcommand{\rightColorTriangle}[3]{
- \path[fill=#3]
- \rightTriangle{#1}{#2}
+ \path[fill=#3]
+ \rightTriangle{#1}{#2}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\topColorTriangle}
-% Defines a colored triangle with the base on the bottom side (pointing top).
+% Defines a colored triangle with the base on the bottom side (pointing top).
% \begin{macrocode}
\newcommand{\topColorTriangle}[3]{
- \path[fill=#3]
- \topTriangle{#1}{#2}
+ \path[fill=#3]
+ \topTriangle{#1}{#2}
}
% \end{macrocode}
% \end{macro}
@@ -211,7 +208,7 @@
% We then define the different backgrounds choices.
%
% \begin{macro}{blank}
-% Blank slide background.
+% Blank slide background.
% \begin{macrocode}
\defbeamertemplate{background}{blank}{}
% \end{macrocode}
@@ -218,159 +215,158 @@
% \end{macro}
%
% \begin{macro}{smallcornertriangle}
-% Background with a small triangle in bottom left corner (used for normal
-% frames when the appropriate option is selected).
+% Background with a small triangle in bottom left corner (used for normal
+% frames when the appropriate option is selected).
% \begin{macrocode}
\defbeamertemplate{background}{smallcornertriangle}{
- \begin{tikzpicture}[blend group=multiply]
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{cyberbottom}
-% Background with "mesh" effect on the bottom left corner (used for normal
-% frames when the appropriate option is selected).
+% Background with "mesh" effect on the bottom left corner (used for normal
+% frames when the appropriate option is selected).
% \begin{macrocode}
\defbeamertemplate{background}{cyberbottom}{
-\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},
- {(0.02\paperwidth,0.53\paperheight)/1},
- {(-0.04\paperwidth,0.38\paperheight)/2},
- {(0.08\paperwidth,0.40\paperheight)/3},
- {(0.052\paperwidth,0.21\paperheight)/5},
- {(0.24\paperwidth,0.26\paperheight)/6},
- {(-0.08\paperwidth,-0.06\paperheight)/7},
- {(0.12\paperwidth,0.07\paperheight)/8},
- {(0.2\paperwidth,0.-0.08\paperheight)/9},
- {(0.38\paperwidth,0.06\paperheight)/10},
- {(0.56\paperwidth,-0.08\paperheight)/11}}
- \node[cyberVertex] (\name) at \pos {};
- \foreach \pos/\name in {
- {(-0.05\paperwidth,0.75\paperheight)/0},
- {(0.02\paperwidth,0.53\paperheight)/1},
- {(-0.04\paperwidth,0.38\paperheight)/2},
- {(0.08\paperwidth,0.40\paperheight)/3},
- {(0.052\paperwidth,0.21\paperheight)/5},
- {(0.24\paperwidth,0.26\paperheight)/6},
- {(-0.08\paperwidth,-0.06\paperheight)/7},
- {(0.12\paperwidth,0.07\paperheight)/8},
- {(0.2\paperwidth,0.-0.08\paperheight)/9},
- {(0.38\paperwidth,0.06\paperheight)/10},
- {(0.56\paperwidth,-0.08\paperheight)/11}}
- \node[cyberVertex2] (\name_2) at \pos {};
- \foreach \source/ \dest in
- {0/1,1/2,1/3,2/3,2/5,3/5,3/6,5/6,5/7,7/8,5/8,8/6,8/9,6/9,9/10,10/6,10/11}
- \path[cyberEdge] (\source) -- (\dest);
-\end{tikzpicture}
+ \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},
+ {(0.02\paperwidth,0.53\paperheight)/1},
+ {(-0.04\paperwidth,0.38\paperheight)/2},
+ {(0.08\paperwidth,0.40\paperheight)/3},
+ {(0.052\paperwidth,0.21\paperheight)/5},
+ {(0.24\paperwidth,0.26\paperheight)/6},
+ {(-0.08\paperwidth,-0.06\paperheight)/7},
+ {(0.12\paperwidth,0.07\paperheight)/8},
+ {(0.2\paperwidth,0.-0.08\paperheight)/9},
+ {(0.38\paperwidth,0.06\paperheight)/10},
+ {(0.56\paperwidth,-0.08\paperheight)/11}}
+ \node[cyberVertex] (\name) at \pos {};
+ \foreach \pos/\name in {
+ {(-0.05\paperwidth,0.75\paperheight)/0},
+ {(0.02\paperwidth,0.53\paperheight)/1},
+ {(-0.04\paperwidth,0.38\paperheight)/2},
+ {(0.08\paperwidth,0.40\paperheight)/3},
+ {(0.052\paperwidth,0.21\paperheight)/5},
+ {(0.24\paperwidth,0.26\paperheight)/6},
+ {(-0.08\paperwidth,-0.06\paperheight)/7},
+ {(0.12\paperwidth,0.07\paperheight)/8},
+ {(0.2\paperwidth,0.-0.08\paperheight)/9},
+ {(0.38\paperwidth,0.06\paperheight)/10},
+ {(0.56\paperwidth,-0.08\paperheight)/11}}
+ \node[cyberVertex2] (\name_2) at \pos {};
+ \foreach \source/ \dest in
+ {0/1,1/2,1/3,2/3,2/5,3/5,3/6,5/6,5/7,7/8,5/8,8/6,8/9,6/9,9/10,10/6,10/11}
+ \path[cyberEdge] (\source) -- (\dest);
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titlebigimage}
-% Background for title page with a big image in the top left corener.
+% Background for title page with a big image in the top left corener.
% \begin{macrocode}
\defbeamertemplate{background}{titlebigimage}{
- \begin{tikzpicture}
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \begin{scope}[blend group=multiply]
- \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};
- \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
- \fi
- \end{scope}
- \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}};
- \fi
- \end{tikzpicture}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \begin{scope}[blend group=multiply]
+ \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};
+ \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
+ \fi
+ \end{scope}
+ \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}};
+ \fi
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titlesmallimage}
-% Background for the titlepage with a small image in the top left corner.
+% Background for the titlepage with a small image in the top left corner.
% \begin{macrocode}
\defbeamertemplate{background}{titlesmallimage}{
- \begin{tikzpicture}[blend group=multiply]
- \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}};
- \fi
- \ifx\inserttitlegraphic\@empty
- \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};
- \fi
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \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}};
+ \fi
+ \ifx\inserttitlegraphic\@empty
+ \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};
+ \fi
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bottomtrianglescolor}
-% Background for title/section pages with two colored triangles in the
-% bottom.
+% Background for title/section pages with two colored triangles in the bottom.
% \begin{macrocode}
\defbeamertemplate{background}{bottomtrianglescolor}{
- \begin{tikzpicture}[blend group=multiply]
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
- \rightColorTriangle{0.38\paperwidth}{0}{tSec}
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tSec}
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bottomtrianglesbw}
-% Background for title/section pages with two black and white triangles in
-% the bottom.
+% Background for title/section pages with two black and white triangles in the
+% bottom.
% \begin{macrocode}
\defbeamertemplate{background}{bottomtrianglesbw}{
- \begin{tikzpicture}[blend group=multiply]
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
- \rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bigtriangles}
-% Background for section pages with a big triangle on the left.
+% Background for section pages with a big triangle on the left.
% \begin{macrocode}
\defbeamertemplate{background}{bigtriangles}{
- \begin{tikzpicture}[blend group=multiply]
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
- \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
+ \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{lefttriangles}
-% Background for section pages with small triangles on the left.
+% Background for section pages with small triangles on the left.
% \begin{macrocode}
\defbeamertemplate{background}{lefttriangles}{
- \begin{tikzpicture}[blend group=multiply]
- \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
- \leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
- \end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
+ \leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
@@ -385,35 +381,35 @@
% background afterwards.
%
% \begin{macro}{\titleframe}
-% Sets the titleframe.
+% Sets the titleframe.
% \begin{macrocode}
\newcommand{\titleframe}{
- \setbeamertemplate{title page}[\titlestyle]
- \setbeamertemplate{background}[\titlestyle]
- \frame[plain,noframenumbering]{\titlepage}
- \setbeamertemplate{background}[\slidestyle]
+ \setbeamertemplate{title page}[\titlestyle]
+ \setbeamertemplate{background}[\titlestyle]
+ \frame[plain,noframenumbering]{\titlepage}
+ \setbeamertemplate{background}[\slidestyle]
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\sectionframe}
-% Sets the titleframe.
+% Sets the titleframe.
% \begin{macrocode}
\newcommand{\sectionframe}{
- \setbeamertemplate{section page}[\sectionstyle]
- \setbeamertemplate{background}[\sectionstyle]
- \frame[plain,noframenumbering]{\sectionpage}
- \setbeamertemplate{background}[\slidestyle]
+ \setbeamertemplate{section page}[\sectionstyle]
+ \setbeamertemplate{background}[\sectionstyle]
+ \frame[plain,noframenumbering]{\sectionpage}
+ \setbeamertemplate{background}[\slidestyle]
}
\newcommand{\trigon at disablesectionpage}{
- \AtBeginSection{
- % intentionally empty
- }
+ \AtBeginSection{
+ % intentionally empty
+ }
}
\newcommand{\trigon at enablesectionpage}{
- \AtBeginSection{
- \sectionframe
- }
+ \AtBeginSection{
+ \sectionframe
+ }
}
% \end{macrocode}
% \end{macro}
@@ -424,178 +420,286 @@
% frame, so the fit nicely with the different background selected.
%
% \begin{macro}{titlebigimage}
-% Place the text on the title frame with a big image on the top left side.
+% Place the text on the title frame with a big image on the top left side.
% \begin{macrocode}
\defbeamertemplate{title page}{titlebigimage}
{
- \vskip140pt
- \begin{flushright}
- \begin{minipage}[t][][c]{0.5\textwidth}%
- \centering
- \usebeamerfont{title}\usebeamercolor[fg]{title}
- \inserttitle\par
- \end{minipage}
- \ifx \insertsubtitle\@empty
- \else
- \vskip15pt
- \begin{minipage}[t][][c]{0.5\textwidth}%
- \centering
- \usebeamerfont{subtitle}\insertsubtitle\par%
- \end{minipage}
- \fi
- \vskip15pt
- \begin{minipage}[t][][c]{0.5\textwidth}%
- \centering
- \usebeamerfont{author}\insertauthor%
- \vskip10pt
- \usebeamerfont{date}\insertdate%
- \end{minipage}
- \end{flushright}
- \vfill
+ \vskip135pt
+ \begin{flushright}
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{title}\usebeamercolor[fg]{title}
+ \inserttitle\par
+ \end{minipage}
+ \ifx \insertsubtitle\@empty
+ \else
+ \vskip15pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{minipage}
+ \fi
+ \vskip13pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{author}\insertauthor%
+ \vskip5pt
+ \usebeamerfont{date}\insertdate%
+ \end{minipage}
+\end{flushright}
+\vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titlesmallimage}
-% Place the text on the title frame with a small image on the top left side.
+% Place the text on the title frame with a small image on the top left side.
% \begin{macrocode}
\defbeamertemplate{title page}{titlesmallimage}
{
- \vskip140pt%
- \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{title page header}
- \usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle\par%
- \end{beamercolorbox}%
- \ifx \insertsubtitle\@empty
- \else
- \vskip8pt
- \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{subtitle page header}
- \usebeamerfont{subtitle}\insertsubtitle\par%
- \end{beamercolorbox}%
- \fi
- \vskip10pt
- \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{author}
- \usebeamerfont{author}\insertauthor%
- \end{beamercolorbox}
- \vskip2pt%
- \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{date}
- \usebeamerfont{date}\insertdate%
- \end{beamercolorbox}
- \vfill
+ \vskip140pt%
+ \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{title page header}
+ \usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle\par%
+ \end{beamercolorbox}%
+ \ifx \insertsubtitle\@empty
+\else
+ \vskip8pt
+ \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{subtitle page header}
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{beamercolorbox}%
+\fi
+\vskip10pt
+\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{author}
+ \usebeamerfont{author}\insertauthor%
+\end{beamercolorbox}
+\vskip2pt%
+\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{date}
+ \usebeamerfont{date}\insertdate%
+\end{beamercolorbox}
+\vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bottomtrianglescolor}
-% Place the text on the title frame with two triangles on the bottom.
+% Place the text on the title frame with two triangles on the bottom.
% \begin{macrocode}
\defbeamertemplate{title page}{bottomtrianglescolor}
{
- \vskip0pt
- \begin{center}
- \begin{minipage}[t][][t]{\textwidth}
- \centering%
- \ifx\logbig\@empty \else
- \includegraphics[height=0.15\textheight]{\logbig}
- \fi
- \end{minipage}
- \vskip15pt
- \begin{minipage}[t][][c]{\textwidth}%
- \centering
- \usebeamerfont{title}\usebeamercolor[fg]{title}
- \inserttitle\par
- \end{minipage}
- \ifx \insertsubtitle\@empty
- \else
- \vskip15pt
- \begin{minipage}[t][][c]{\textwidth}%
- \centering
- \usebeamerfont{subtitle}\insertsubtitle\par%
- \end{minipage}
- \fi
- \vskip20pt
- \begin{minipage}[t][][c]{0.5\textwidth}%
- \centering
- \usebeamerfont{author}\insertauthor\\[0.3cm]%
- \usebeamerfont{date}\insertdate
- \end{minipage}
- \end{center}
- \vfill
+ \vskip0pt
+ \begin{center}
+ \begin{minipage}[t][][t]{\textwidth}
+ \centering%
+ \ifx\logbig\@empty \else
+ \includegraphics[height=0.15\textheight]{\logbig}
+ \fi
+ \end{minipage}
+ \vskip15pt
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{title}\usebeamercolor[fg]{title}
+ \inserttitle\par
+ \end{minipage}
+ \ifx \insertsubtitle\@empty
+ \else
+ \vskip15pt
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{minipage}
+ \fi
+ \vskip20pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{author}\insertauthor\\[0.3cm]%
+ \usebeamerfont{date}\insertdate
+ \end{minipage}
+\end{center}
+\vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bottomtrianglescolor}
-% Place the text on the section frame with two colored triangles on the
-% bottom.
+% Place the text on the section frame with two colored triangles on the
+% bottom.
% \begin{macrocode}
\defbeamertemplate{section page}{bottomtrianglescolor}
{
- \vskip40pt
- \begin{center}
- \begin{minipage}[t][][c]{\textwidth}%
- \centering
- \usebeamerfont{section title}\usebeamercolor[fg]{title}
- \insertsectionhead\par
- \end{minipage}
- \end{center}
- \vfill
+ \vskip40pt
+ \begin{center}
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{minipage}
+ \end{center}
+ \vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bottomtrianglesbw}
-% Place the text on the section frame with two black and white triangles on
-% the bottom.
+% Place the text on the section frame with two black and white triangles on
+% the bottom.
% \begin{macrocode}
\defbeamertemplate{section page}{bottomtrianglesbw}
{
- \vskip40pt
- \begin{center}
- \begin{minipage}[t][][c]{\textwidth}%
- \centering
- \usebeamerfont{section title}\usebeamercolor[fg]{title}
- \insertsectionhead\par
- \end{minipage}
- \end{center}
- \vfill
+ \vskip40pt
+ \begin{center}
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{minipage}
+ \end{center}
+ \vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{bigtriangles}
-% Place the text on the section frame with two big triangles.
+% Place the text on the section frame with two big triangles.
% \begin{macrocode}
\defbeamertemplate{section page}{bigtriangles}
{
- \vskip200pt
- \begin{flushright}
- \begin{minipage}[t]{0.62\textwidth}%7
- \usebeamerfont{section title}\usebeamercolor[fg]{title}
- \raggedleft
- \insertsectionhead\par
- \end{minipage}
- \end{flushright}
- \vfill
+ \vskip200pt
+ \begin{flushright}
+ \begin{minipage}[t]{0.62\textwidth}%7
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \raggedleft
+ \insertsectionhead\par
+ \end{minipage}
+ \end{flushright}
+ \vfill
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{lefttriangles}
-% Place the text on the section frame with two small left triangles.
+% Place the text on the section frame with two small left triangles.
% \begin{macrocode}
\defbeamertemplate{section page}{lefttriangles}
{
- \vskip25pt
- \begin{beamercolorbox}[wd=\textwidth,leftskip=100pt,sep=4pt]{section page header}
- \usebeamerfont{section title}\usebeamercolor[fg]{title}
- \insertsectionhead\par
- \end{beamercolorbox}%
- \vfill
+ \vskip25pt
+ \begin{beamercolorbox}[wd=\textwidth,leftskip=100pt,sep=4pt]{section page header}
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{beamercolorbox}%
+ \vfill
}
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Block environments}
%
+% \begin{macro}{block}
+% \begin{macro}{block alerted}
+% \begin{macro}{block example}
+%
+% The three different block environments differ only in their colours.
+% Rather than repeat the essentially the same template three times, we use
+% the auxiliary macro |\trigon at block| to define all three templates.
+%
+% \begin{macrocode}
+\newlength{\trigon at blocksep}
+\newlength{\trigon at blockadjust}
+\setlength{\trigon at blocksep}{0.75ex}
+\setlength{\trigon at blockadjust}{0.25ex}
+\providecommand{\trigon at strut}{%
+ \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
+}
+\newcommand{\trigon at block}[1]{
+ \par\vskip\medskipamount%
+ \setlength{\parskip}{0pt}
+% \end{macrocode}
+%
+% If a background color is defined for the block title or body, we need to
+% add a little bit of padding to the corresponding box. Ideally, this would
+% be accomplished by setting |colsep=0.75ex|, which is intended to add
+% ``color separation space'' only when the box has a colored background.
+% Unfortunately, |colsep| also adds this separation if the background color
+% is inherited, even if the inherited color is actually empty.
+% (The technical reason for this boils down to the fact that the |\ifx|
+% directive does not expand macros.)
+%
+% To achieve the correct spacing for |alertblock|s and |exampleblock|s
+% as well as for normal blocks, we have to begin the |beamercolorbox|
+% differently based on whether |block title| has an empty background.
+%
+% If the |block title| background is empty, or the user has explicitly
+% removed the background from (e.g.) |block title alerted|, we just need to
+% set a rightskip for a nice ragged-right block title.
+%
+% \begin{macrocode}
+ \ifbeamercolorempty[bg]{block title#1}{%
+ \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{%
+ \ifbeamercolorempty[bg]{block title}{%
+ \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}%
+ }%
+% \end{macrocode}
+%
+% Otherwise, if the |block title| has a background, we set the padding based
+% on |\trigon at blockskip|. However, we have to visually compensate for
+% the |\trigon at strut| added to the block title (see below) by
+% subtracting |\trigon at blockadjust| from the top and bottom padding.
+%
+% \begin{macrocode}
+ {%
+ \begin{beamercolorbox}[
+ sep=\dimexpr\trigon at blocksep-\trigon at blockadjust\relax,
+ leftskip=\trigon at blockadjust,
+ rightskip=\dimexpr\trigon at blockadjust plus 4em\relax
+ ]{block title#1}%
+ }}%
+% \end{macrocode}
+%
+% We can now set the contents of the |block title|. The zero-width but
+% positive-height box |\trigon at strut| ensures that the block title box
+% has a consistent height, even if it lacks punctuation, ascenders, or
+% descenders.
+%
+% \begin{macrocode}
+ \usebeamerfont*{block title#1}%
+ \trigon at strut%
+ \insertblocktitle%
+ \trigon at strut%
+ \end{beamercolorbox}%
+% \end{macrocode}
+%
+% Next, we typeset the |block body|. This the code is similar to, but simpler
+% than, the |block title| code since we don't need to adjust for any struts.
+%
+% \begin{macrocode}
+ \nointerlineskip%
+ \ifbeamercolorempty[bg]{block body#1}{%
+ \begin{beamercolorbox}[vmode]{block body#1}}{
+ \ifbeamercolorempty[bg]{block body}{%
+ \begin{beamercolorbox}[vmode]{block body#1}%
+ }{%
+ \begin{beamercolorbox}[sep=\trigon at blocksep, vmode]{block body#1}%
+ \vspace{-\trigon at parskip}
+ }}%
+ \usebeamerfont{block body#1}%
+ \setlength{\parskip}{\trigon at parskip}%
+}
+% \end{macrocode}
+%
+% This concludes the auxiliary macro |\trigon at block|. Finally,
+% we define the block beamer templates using this macro.
+%
+% \begin{macrocode}
+\setbeamertemplate{block begin}{\trigon at block{}}
+\setbeamertemplate{block alerted begin}{\trigon at block{ alerted}}
+\setbeamertemplate{block example begin}{\trigon at block{ example}}
+\setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \subsubsection{Lists and floats}
%
% \begin{macrocode}
@@ -603,8 +707,17 @@
\setbeamertemplate{caption}[numbered]
% \end{macrocode}
%
+% \subsubsection{Text and spacing settings}
%
+% \begin{macrocode}
+\newlength{\trigon at parskip}
+\setlength{\trigon at parskip}{0.5em}
+\setlength{\parskip}{\trigon at parskip}
+\linespread{1.15}
+% \end{macrocode}
+%
% \subsubsection{Margins}
+%
% The margins are defined as
% \begin{macrocode}
\setbeamersize{text margin left=.05\paperwidth, text margin right=.05\paperwidth}
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2021/09/06 v0.6.0 Trigon outer theme]
+\ProvidesPackage{beamerouterthemetrigon}[2021/11/10 v0.6.2 Trigon outer theme]
%</package>
% \fi
% \CheckSum{0}
@@ -37,79 +37,79 @@
% \subsubsection{Definitions}
% We define the command |\logsmall| to specify the logo that needs to be applied
% displayed on all normal frames.
-% \begin{macrocode}
+% \begin{macrocode}
\def\logsmall{}
\newcommand\smalllogo[1]{
\def\logsmall{#1}
}
-% \end{macrocode}
+% \end{macrocode}
%
% \subsubsection{Options}
%
% \begin{macro}{numbering}
-% Adds slide number to the bottom of each regular frame
-% \begin{macrocode}
+% Adds slide number to the bottom of each regular frame
+% \begin{macrocode}
\pgfkeys{
/trigon/outer/numbering/.cd,
- .is choice,
- none/.code=\setbeamertemplate{frame numbering}[none],
- counter/.code=\setbeamertemplate{frame numbering}[counter],
- fraction/.code=\setbeamertemplate{frame numbering}[fraction]
+ .is choice,
+ none/.code=\setbeamertemplate{frame numbering}[none],
+ counter/.code=\setbeamertemplate{frame numbering}[counter],
+ fraction/.code=\setbeamertemplate{frame numbering}[fraction]
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\trigon at outer@setdefaults}
-% Sets default values for the outer theme options.
-% \begin{macrocode}
+% Sets default values for the outer theme options.
+% \begin{macrocode}
\newcommand{\trigon at outer@setdefaults}{
\pgfkeys{/trigon/outer/.cd,
numbering=counter
}
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Frame title}
%
-% \subsubsection{Frame title}
% \begin{macro}{frametitle}
% Template for the frame title
-% \begin{macrocode}
+% \begin{macrocode}
\defbeamertemplate*{frametitle}{trigon}
{
\vspace{-1pt}
\begin{beamercolorbox}[wd=\paperwidth,leftskip=0.05\paperwidth]{frametitle}
- \vskip.4cm
- \ifx\insertframesubtitle\@empty%
+ \vskip.4cm
+ \ifx\insertframesubtitle\@empty%
{\usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle}%
- \else%
+ \else%
{\usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle}\\[-.25cm]
{\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}%
- \fi
- \vskip.3cm
+ \fi
+ \vskip.3cm
\end{beamercolorbox}
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Fame header}
%
-% \subsubsection{Fame header}
% \begin{macro}{headline}
% Templates for the frame header
-% \begin{macrocode}
+% \begin{macrocode}
\defbeamertemplate{headline}{none}{}
\defbeamertemplate*{headline}{logo}{
-\ifx\logsmall\@empty\else
- \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt}
-\fi
+ \ifx\logsmall\@empty\else
+ \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt}
+ \fi
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Frame footer}
%
-% \subsubsection{Frame footer}
% Define various template for frame footer and manage frame numbering.
-% \begin{macrocode}
+% \begin{macrocode}
\setbeamertemplate{navigation symbols}{}
\defbeamertemplate{frame footer}{none}{}
@@ -131,22 +131,22 @@
}
\setbeamertemplate{footline}[plain]
-% \end{macrocode}
+% \end{macrocode}
%
% \begin{macro}{appendix}
-% Removes page numbering and per-slide progress bars when |\appendix| is
-% called. This makes it easier to include additional ``backup slides'' at
-% the end of the presentation, especially in conjunction with the package
-% |appendixnumberbeamer|.
+% Removes page numbering and per-slide progress bars when |\appendix| is
+% called. This makes it easier to include additional ``backup slides'' at
+% the end of the presentation, especially in conjunction with the package
+% |appendixnumberbeamer|.
% \begin{macrocode}
\AtBeginDocument{%
\apptocmd{\appendix}{%
\pgfkeys{%
/trigon/outer/.cd,
- numbering=none}
- }{}{}
+ numbering=none}
+ }{}{}
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \subsubsection{Process package options}
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2021/09/06 v0.6.0 Trigon Beamer theme]
+\ProvidesPackage{beamerthemetrigon}[2021/11/10 v0.6.2 Trigon Beamer theme]
%</package>
% \fi
% \CheckSum{0}
@@ -29,20 +29,17 @@
% \themename theme and route the theme options accordingly. It also
% provides some custom commands and environments for the user.
%
-%
% \subsubsection{Package dependencies}
%
-% \begin{macrocode}
+% \begin{macrocode}
\RequirePackage{pgfopts}
\RequirePackage{tikz}
% \end{macrocode}
%
-%
%\subsubsection{Options}
%
% Most options are passed off to the component sub-packages.
-%
-% \begin{macrocode}
+% \begin{macrocode}
\pgfkeys{/trigon/.cd,
.search also={
/trigon/inner,
@@ -54,57 +51,56 @@
% \end{macrocode}
%
% \begin{macro}{titleformat plain}
-% Controls the formatting of the text on standout ``plain'' frames.
-% \begin{macrocode}
+% Controls the formatting of the text on standout ``plain'' frames.
+% \begin{macrocode}
\pgfkeys{
/trigon/titleformat plain/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at plaintitleformat\MakeLowercase%
- \setbeamerfont{standout}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at plaintitleformat\MakeUppercase%
- \setbeamerfont{standout}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at plaintitleformat\MakeLowercase%
+ \setbeamerfont{standout}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat plain=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at plaintitleformat\MakeUppercase%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat plain=allcaps can lead to problems%
+ }
+ },
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{titleformat}
-% Sets a standard format for titles, subtitles, section titles, frame
-% titles, and the text on standout ``plain'' frames.
-% \begin{macrocode}
+% Sets a standard format for titles, subtitles, section titles, frame titles,
+% and the text on standout ``plain'' frames.
+% \begin{macrocode}
\pgfkeys{
/trigon/titleformat/.code=\pgfkeysalso{
- font/titleformat title=#1,
- font/titleformat subtitle=#1,
- font/titleformat section=#1,
- font/titleformat frame=#1,
- titleformat plain=#1,
- }
+ font/titleformat title=#1,
+ font/titleformat subtitle=#1,
+ font/titleformat section=#1,
+ font/titleformat frame=#1,
+ titleformat plain=#1,
+ }
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{usesourcefonts}
-% Select whereas the Source Sans Pro font is being loaded automatically or
-% not.
-% \begin{macrocode}
+% Select whereas the Source Sans Pro font is being loaded automatically or not.
+% \begin{macrocode}
\newif\if at trigon@usesourcefonts
\pgfkeys{/trigon/.cd,
usesourcefonts/.is if=@trigon at usesourcefonts,
@@ -113,12 +109,13 @@
% \end{macrocode}
% \end{macro}
%
+%
% \subsubsection{Component sub-packages}
%
% Having processed the options, we can now load the component sub-packages of
% the theme.
%
-% \begin{macrocode}
+% \begin{macrocode}
\useinnertheme{trigon}
\useoutertheme{trigon}
\usecolortheme{trigon}
@@ -132,15 +129,16 @@
% on multiple sub-packages.
%
% \begin{macro}{\metroset}
-% Allows the user to change options midway through a presentation.
+% Allows the user to change options midway through a presentation.
% \begin{macrocode}
\newcommand{\trigonset}[1]{\pgfkeys{/trigon/.cd,#1}}
% \end{macrocode}
% \end{macro}
%
+%
% \subsubsection{Process package options}
%
-% \begin{macrocode}
+% \begin{macrocode}
\ProcessOptionsBeamer
\ProcessPgfOptions{/trigon}
\if at trigon@usesourcefonts%
Modified: trunk/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx 2021-11-10 21:18:14 UTC (rev 61020)
@@ -59,7 +59,7 @@
aboveskip=1em,
belowskip=1em,
morekeywords={usetheme,institute,maketitle, at trigon@titleformat,%
- plain,trigonset,setbeamercolor},
+ plain,trigonset,setbeamercolor},
}
\lstMakeShortInline|
\usepackage{metalogo}
@@ -67,9 +67,9 @@
\setcounter{tocdepth}{2}
\usepackage[colorlinks=true,
- linkcolor=tPrim,
- menucolor=tPrim,
- urlcolor=tPrim]{hyperref}
+linkcolor=tPrim,
+menucolor=tPrim,
+urlcolor=tPrim]{hyperref}
\setlength{\fboxsep}{0pt}%
\usepackage{caption} % For subfigures
@@ -184,15 +184,19 @@
\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}).
+Since October 2021,
+\href{https://www.overleaf.com/blog/tex-live-2021-now-available}{TexLive 2011 is
+availabe on Overleaf}. \themename is therefore automatically supported for new
+documents. If you want to switch older documents to use the \themename theme,
+you need to
+\href{https://www.overleaf.com/blog/new-feature-select-your-tex-live-compiler-version}{select
+TexLive 2021 or higher as your TeX Live version} (this may cause issues with
+other packages used in your presentation).
-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.
+In addition to that, a template project was created and is publicly availabe in
+the
+\href{https://www.overleaf.com/latex/templates/trigon-beamer-theme/wjyyzvdzqkgf}{Overleaf
+Gallery} to bootstrap your presentation.
\subsection{A Minimal Example}
@@ -272,8 +276,8 @@
}
\DescribeOption{titleformat}%
- {regular, smallcaps, allsmallcaps, allcaps}
- {regular}{
+{regular, smallcaps, allsmallcaps, allcaps}
+{regular}{
Changes the format of titles, subtitles, section titles, frame titles, and
the text on ``standout'' frames. The available options produce
Regular, \textsc{SmallCaps}, \textsc{\MakeLowercase{AllSmallCaps}}, or
@@ -387,8 +391,8 @@
\DescribeMacro{titleformat subtitle}
\DescribeMacro{titleformat section}
\DescribeOption{titleformat frame}%
- {regular, smallcaps, allsmallcaps, allcaps}%
- {regular}{
+{regular, smallcaps, allsmallcaps, allcaps}%
+{regular}{
Individually controls the format of titles, subtitles, section titles, and
frame titles (see |titleformat|, above).
}
@@ -449,17 +453,17 @@
|\MakeUppercase| can cause unexpected problems. For example:
\begin{itemize}
- \item Some commands, like |\\|, do not work inside |\MakeLowercase| and
- |\MakeUppercase|. (See \textsc{Metropolis}
+ \item Some commands, like |\\|, do not work inside |\MakeLowercase| and
+ |\MakeUppercase|. (See \textsc{Metropolis}
\href{https://github.com/matze/mtheme/issues/125} {\#125})
- \item Only alphabetic characters are affected by |\MakeLowercase|, so
+ \item Only alphabetic characters are affected by |\MakeLowercase|, so
numerals and punctuation remain at full height. This can spoil some of the
aesthetic benefits of |allsmallcaps|. (See \textsc{Metropolis}
\href{https://github.com/matze/mtheme/issues/33}{\#33})
- \item |\MakeLowercase| and |\MakeUppercase| apply to math mode and
+ \item |\MakeLowercase| and |\MakeUppercase| apply to math mode and
|\scshape| does not. This can easily introduce mathematical errors that
are hard to catch.
- \item It is impossible to typeset symbols which are encoded as uppercase
+ \item It is impossible to typeset symbols which are encoded as uppercase
letters in a different font. In particular, |\mathbb| and |\mathcal|
letters will be replaced by other math glyphs. (See \textsc{Metropolis}
\href{https://github.com/matze/mtheme/issues/153}{\#153})
Modified: trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamercolorthemetrigon.sty 2021-11-10 21:18:14 UTC (rev 61020)
@@ -18,40 +18,40 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/)
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2021/09/06 v0.6.0 Trigon color theme]
+\ProvidesPackage{beamercolorthemetrigon}[2021/11/10 v0.6.2 Trigon color theme]
\RequirePackage{pgfopts}
\pgfkeys{
/trigon/color/background/.cd,
- .is choice,
- dark/.code=\trigon at colors@dark,
- light/.code=\trigon at colors@light
+ .is choice,
+ dark/.code=\trigon at colors@dark,
+ light/.code=\trigon at colors@light
}
\def\headcol{tDefaulttxt}
\pgfkeys{
/trigon/color/headingcolor/.cd,
- .is choice,
- default/.code=\def\headcol{tTxt},
- theme/.code=\def\headcol{tPrim}
+ .is choice,
+ default/.code=\def\headcol{tTxt},
+ theme/.code=\def\headcol{tPrim}
}
\def\txtcol{black}
\pgfkeys{
/trigon/color/textcolor/.cd,
- .is choice,
- default/.code=\def\txtcol{tTxt},
- theme/.code=\def\txtcol{tPrim!50!tTxt}
+ .is choice,
+ default/.code=\def\txtcol{tTxt},
+ theme/.code=\def\txtcol{tPrim!50!tTxt}
}
\pgfkeys{
/trigon/color/block/.cd,
- .is choice,
- transparent/.code=\trigon at block@transparent,
- fill/.code=\trigon at block@fill
+ .is choice,
+ transparent/.code=\trigon at block@transparent,
+ fill/.code=\trigon at block@fill
}
\newcommand{\trigon at color@setdefaults}{
\pgfkeys{/trigon/color/.cd,
- background=light,
- block=fill,
- headingcolor=default,
- textcolor=default
+ background=light,
+ block=fill,
+ headingcolor=default,
+ textcolor=default
}
}
\definecolor{tGreenBlue}{HTML}{00707F}
Modified: trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerfontthemetrigon.sty 2021-11-10 21:18:14 UTC (rev 61020)
@@ -18,111 +18,111 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/)
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2021/09/06 v0.6.0 Trigon font theme]
+\ProvidesPackage{beamerfontthemetrigon}[2021/11/10 v0.6.2 Trigon font theme]
\RequirePackage{pgfopts}
\pgfkeys{
/trigon/font/titleformat title/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at titleformat\@empty%
- \setbeamerfont{title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at titleformat\@empty%
- \setbeamerfont{title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at titleformat\lowercase%
- \setbeamerfont{title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at titleformat\uppercase%
- \setbeamerfont{title}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at titleformat\@empty%
+ \setbeamerfont{title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at titleformat\@empty%
+ \setbeamerfont{title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at titleformat\lowercase%
+ \setbeamerfont{title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat title=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at titleformat\uppercase%
+ \setbeamerfont{title}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat title=allcaps can lead to problems%
+ }
+ },
}
\pgfkeys{
/trigon/font/titleformat subtitle/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at subtitleformat\lowercase%
- \setbeamerfont{subtitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at subtitleformat\uppercase%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at subtitleformat\lowercase%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at subtitleformat\uppercase%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat subtitle=allcaps can lead to problems%
+ }
+ },
}
\pgfkeys{
/trigon/font/titleformat section/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at sectiontitleformat\MakeLowercase%
- \setbeamerfont{section title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat section=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at sectiontitleformat\MakeUppercase%
- \setbeamerfont{section title}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat section=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at sectiontitleformat\MakeLowercase%
+ \setbeamerfont{section title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat section=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at sectiontitleformat\MakeUppercase%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat section=allcaps can lead to problems%
+ }
+ },
}
\pgfkeys{
/trigon/font/titleformat frame/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at frametitleformat\MakeLowercase%
- \setbeamerfont{frametitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at frametitleformat\MakeUppercase%
- \setbeamerfont{frametitle}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at frametitleformat\MakeLowercase%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat frame=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at frametitleformat\MakeUppercase%
+ \setbeamerfont{frametitle}{shape=\normalfont}
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat frame=allcaps can lead to problems%
+ }
+ },
}
\pgfkeys{
/trigon/font/.cd,
@@ -144,80 +144,80 @@
\def\trigon at sectiontitleformat#1{#1}
\def\trigon at frametitleformat#1{#1}
\patchcmd{\beamer at title}%
- {\def\inserttitle{#2}}%
- {\def\inserttitle{\trigon at titleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
+{\def\inserttitle{#2}}%
+{\def\inserttitle{\trigon at titleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
\patchcmd{\beamer at subtitle}%
- {\def\insertsubtitle{#2}}%
- {\def\insertsubtitle{\trigon at subtitleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
+{\def\insertsubtitle{#2}}%
+{\def\insertsubtitle{\trigon at subtitleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
\patchcmd{\sectionentry}
- {\def\insertsectionhead{#2}}
- {\def\insertsectionhead{\trigon at sectiontitleformat{#2}}}
- {}
- {\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
+{\def\insertsectionhead{#2}}
+{\def\insertsectionhead{\trigon at sectiontitleformat{#2}}}
+{}
+{\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
\@tempswafalse
\patchcmd{\beamer at section}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at section}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{%
- \trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c at page}{%
+\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at section}
- {\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
- {\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
+{\protected at edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if at tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
\@tempswafalse
\patchcmd{\beamer at subsection}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{\unexpanded{#1}}}}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at subsection}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{%
- \trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{#1}}}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c at page}{%
+\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer at subsection}
- {\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
- {\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
- \noexpand\trigon at sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{#1}}}
+{\protected at edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c at page}{%
+\noexpand\trigon at sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if at tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
\patchcmd{\beamer@@frametitle}
- {{%
- \gdef\insertframetitle{{#2\ifnum\beamer at autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+{{%
+ \gdef\insertframetitle{{#2\ifnum\beamer at autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer at frametitle{#2}%
\gdef\beamer at shortframetitle{#1}%
- }}
- {{%
- \gdef\insertframetitle{{\trigon at frametitleformat{#2}\ifnum%
- \beamer at autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+}}
+{{%
+ \gdef\insertframetitle{{\trigon at frametitleformat{#2}\ifnum%
+ \beamer at autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer at frametitle{#2}%
\gdef\beamer at shortframetitle{#1}%
- }}
- {}
- {\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc}
+}}
+{}
+{\PackageError{beamerfontthemetrigon}{Patching frame title failed}\@ehc}
\setbeamerfont{author} {size=\normalsize}
\setbeamerfont{title} {size=\LARGE,series=\bfseries}
\setbeamerfont{section title}{size=\LARGE,series=\mdseries}
Modified: trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerinnerthemetrigon.sty 2021-11-10 21:18:14 UTC (rev 61020)
@@ -18,345 +18,395 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/)
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2021/09/06 v0.6.0 Trigon inner theme]
+\ProvidesPackage{beamerinnerthemetrigon}[2021/11/10 v0.6.2 Trigon inner theme]
\RequirePackage{pgfopts}
\RequirePackage{tikz}
\usetikzlibrary{calc,3d}
\def\logbig{}
\newcommand\biglogo[1]{
-\def\logbig{#1}
+ \def\logbig{#1}
}
\pgfkeys{
-/trigon/inner/sectionpage/.cd,
-.is choice,
-none/.code=\trigon at disablesectionpage,
-simple/.code=\trigon at enablesectionpage
+ /trigon/inner/sectionpage/.cd,
+ .is choice,
+ none/.code=\trigon at disablesectionpage,
+ simple/.code=\trigon at enablesectionpage
}
\def\slidestyle{}
\pgfkeys{
-/trigon/inner/slidestyle/.cd,
-.is choice,
-blank/.code=\def\slidestyle{blank}
-\setbeamertemplate{background}[\slidestyle],
-style1/.code=\def\slidestyle{smallcornertriangle}
-\setbeamertemplate{background}[\slidestyle],
-cyber/.code=\def\slidestyle{cyberbottom}
-\setbeamertemplate{background}[\slidestyle]
+ /trigon/inner/slidestyle/.cd,
+ .is choice,
+ blank/.code=\def\slidestyle{blank}
+ \setbeamertemplate{background}[\slidestyle],
+ style1/.code=\def\slidestyle{smallcornertriangle}
+ \setbeamertemplate{background}[\slidestyle],
+ cyber/.code=\def\slidestyle{cyberbottom}
+ \setbeamertemplate{background}[\slidestyle]
}
\def\titlestyle{}
\pgfkeys{
-/trigon/inner/titlestyle/.cd,
-.is choice,
-plain/.code=\def\titlestyle{bottomtrianglescolor},
-style1/.code=\def\titlestyle{titlesmallimage},
-style2/.code=\def\titlestyle{titlebigimage}
+ /trigon/inner/titlestyle/.cd,
+ .is choice,
+ plain/.code=\def\titlestyle{bottomtrianglescolor},
+ style1/.code=\def\titlestyle{titlesmallimage},
+ style2/.code=\def\titlestyle{titlebigimage}
}
\def\sectionstyle{}
\pgfkeys{
-/trigon/inner/sectionstyle/.cd,
-.is choice,
-plain/.code=\def\sectionstyle{bottomtrianglescolor},
-style1/.code=\def\sectionstyle{bigtriangles},
-style2/.code=\def\sectionstyle{lefttriangles},
-style3/.code=\def\sectionstyle{bottomtrianglesbw}
+ /trigon/inner/sectionstyle/.cd,
+ .is choice,
+ plain/.code=\def\sectionstyle{bottomtrianglescolor},
+ style1/.code=\def\sectionstyle{bigtriangles},
+ style2/.code=\def\sectionstyle{lefttriangles},
+ style3/.code=\def\sectionstyle{bottomtrianglesbw}
}
\newcommand{\trigon at inner@setdefaults}{
-\pgfkeys{/trigon/inner/.cd,
-sectionpage=simple,
-slidestyle=blank,
-titlestyle=style2,
-sectionstyle=plain
+ \pgfkeys{/trigon/inner/.cd,
+ sectionpage=simple,
+ slidestyle=blank,
+ titlestyle=style2,
+ sectionstyle=plain
+ }
}
-}
\newcommand{\leftTriangle}[2]{
-(#1,#2)
--- (0,{#2 + tan(30)*#1} )
--- (0,{#2 - tan(30)*#1} )
--- cycle;
+ (#1,#2)
+ -- (0,{#2 + tan(30)*#1} )
+ -- (0,{#2 - tan(30)*#1} )
+ -- cycle;
}
\newcommand{\rightTriangle}[2]{
-(#1,#2)
--- (\the\paperwidth,{#2 + tan(30)*(\the\paperwidth-#1)} )
--- (\the\paperwidth,{#2 - tan(30)*(\the\paperwidth-#1)} )
--- cycle;
+ (#1,#2)
+ -- (\the\paperwidth,{#2 + tan(30)*(\the\paperwidth-#1)} )
+ -- (\the\paperwidth,{#2 - tan(30)*(\the\paperwidth-#1)} )
+ -- cycle;
}
\newcommand{\topTriangle}[2]{
-(#1,#2)
--- ({#1 - tan(60)*#2},0)
--- ({#1 + tan(60)*#2},0)
--- cycle;
+ (#1,#2)
+ -- ({#1 - tan(60)*#2},0)
+ -- ({#1 + tan(60)*#2},0)
+ -- cycle;
}
\newcommand{\leftColorTriangle}[3]{
-\path[fill=#3]
-\leftTriangle{#1}{#2}
+ \path[fill=#3]
+ \leftTriangle{#1}{#2}
}
\newcommand{\rightColorTriangle}[3]{
-\path[fill=#3]
-\rightTriangle{#1}{#2}
+ \path[fill=#3]
+ \rightTriangle{#1}{#2}
}
\newcommand{\topColorTriangle}[3]{
-\path[fill=#3]
-\topTriangle{#1}{#2}
+ \path[fill=#3]
+ \topTriangle{#1}{#2}
}
\defbeamertemplate{background}{blank}{}
\defbeamertemplate{background}{smallcornertriangle}{
-\begin{tikzpicture}[blend group=multiply]
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
\defbeamertemplate{background}{cyberbottom}{
-\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},
-{(0.02\paperwidth,0.53\paperheight)/1},
-{(-0.04\paperwidth,0.38\paperheight)/2},
-{(0.08\paperwidth,0.40\paperheight)/3},
-{(0.052\paperwidth,0.21\paperheight)/5},
-{(0.24\paperwidth,0.26\paperheight)/6},
-{(-0.08\paperwidth,-0.06\paperheight)/7},
-{(0.12\paperwidth,0.07\paperheight)/8},
-{(0.2\paperwidth,0.-0.08\paperheight)/9},
-{(0.38\paperwidth,0.06\paperheight)/10},
-{(0.56\paperwidth,-0.08\paperheight)/11}}
-\node[cyberVertex] (\name) at \pos {};
-\foreach \pos/\name in {
-{(-0.05\paperwidth,0.75\paperheight)/0},
-{(0.02\paperwidth,0.53\paperheight)/1},
-{(-0.04\paperwidth,0.38\paperheight)/2},
-{(0.08\paperwidth,0.40\paperheight)/3},
-{(0.052\paperwidth,0.21\paperheight)/5},
-{(0.24\paperwidth,0.26\paperheight)/6},
-{(-0.08\paperwidth,-0.06\paperheight)/7},
-{(0.12\paperwidth,0.07\paperheight)/8},
-{(0.2\paperwidth,0.-0.08\paperheight)/9},
-{(0.38\paperwidth,0.06\paperheight)/10},
-{(0.56\paperwidth,-0.08\paperheight)/11}}
-\node[cyberVertex2] (\name_2) at \pos {};
-\foreach \source/ \dest in
-{0/1,1/2,1/3,2/3,2/5,3/5,3/6,5/6,5/7,7/8,5/8,8/6,8/9,6/9,9/10,10/6,10/11}
-\path[cyberEdge] (\source) -- (\dest);
-\end{tikzpicture}
+ \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},
+ {(0.02\paperwidth,0.53\paperheight)/1},
+ {(-0.04\paperwidth,0.38\paperheight)/2},
+ {(0.08\paperwidth,0.40\paperheight)/3},
+ {(0.052\paperwidth,0.21\paperheight)/5},
+ {(0.24\paperwidth,0.26\paperheight)/6},
+ {(-0.08\paperwidth,-0.06\paperheight)/7},
+ {(0.12\paperwidth,0.07\paperheight)/8},
+ {(0.2\paperwidth,0.-0.08\paperheight)/9},
+ {(0.38\paperwidth,0.06\paperheight)/10},
+ {(0.56\paperwidth,-0.08\paperheight)/11}}
+ \node[cyberVertex] (\name) at \pos {};
+ \foreach \pos/\name in {
+ {(-0.05\paperwidth,0.75\paperheight)/0},
+ {(0.02\paperwidth,0.53\paperheight)/1},
+ {(-0.04\paperwidth,0.38\paperheight)/2},
+ {(0.08\paperwidth,0.40\paperheight)/3},
+ {(0.052\paperwidth,0.21\paperheight)/5},
+ {(0.24\paperwidth,0.26\paperheight)/6},
+ {(-0.08\paperwidth,-0.06\paperheight)/7},
+ {(0.12\paperwidth,0.07\paperheight)/8},
+ {(0.2\paperwidth,0.-0.08\paperheight)/9},
+ {(0.38\paperwidth,0.06\paperheight)/10},
+ {(0.56\paperwidth,-0.08\paperheight)/11}}
+ \node[cyberVertex2] (\name_2) at \pos {};
+ \foreach \source/ \dest in
+ {0/1,1/2,1/3,2/3,2/5,3/5,3/6,5/6,5/7,7/8,5/8,8/6,8/9,6/9,9/10,10/6,10/11}
+ \path[cyberEdge] (\source) -- (\dest);
+ \end{tikzpicture}
}
\defbeamertemplate{background}{titlebigimage}{
-\begin{tikzpicture}
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\begin{scope}[blend group=multiply]
-\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};
-\node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
-\fi
-\end{scope}
-\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}};
-\fi
-\end{tikzpicture}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \begin{scope}[blend group=multiply]
+ \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};
+ \node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
+ \fi
+ \end{scope}
+ \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}};
+ \fi
+ \end{tikzpicture}
}
\defbeamertemplate{background}{titlesmallimage}{
-\begin{tikzpicture}[blend group=multiply]
-\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}};
-\fi
-\ifx\inserttitlegraphic\@empty
-\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};
-\fi
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \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}};
+ \fi
+ \ifx\inserttitlegraphic\@empty
+ \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};
+ \fi
+ \end{tikzpicture}
}
\defbeamertemplate{background}{bottomtrianglescolor}{
-\begin{tikzpicture}[blend group=multiply]
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\leftColorTriangle{0.62\paperwidth}{0}{tTheme}
-\rightColorTriangle{0.38\paperwidth}{0}{tSec}
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tSec}
+ \end{tikzpicture}
}
\defbeamertemplate{background}{bottomtrianglesbw}{
-\begin{tikzpicture}[blend group=multiply]
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\leftColorTriangle{0.62\paperwidth}{0}{tTheme}
-\rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
\defbeamertemplate{background}{bigtriangles}{
-\begin{tikzpicture}[blend group=multiply]
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
-\rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
+ \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
+ \end{tikzpicture}
}
\defbeamertemplate{background}{lefttriangles}{
-\begin{tikzpicture}[blend group=multiply]
-\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-\leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
-\leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
-\end{tikzpicture}
+ \begin{tikzpicture}[blend group=multiply]
+ \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
+ \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
+ \leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
+ \end{tikzpicture}
}
\setbeamertemplate{background}[\slidestyle]
\newcommand{\titleframe}{
-\setbeamertemplate{title page}[\titlestyle]
-\setbeamertemplate{background}[\titlestyle]
-\frame[plain,noframenumbering]{\titlepage}
-\setbeamertemplate{background}[\slidestyle]
+ \setbeamertemplate{title page}[\titlestyle]
+ \setbeamertemplate{background}[\titlestyle]
+ \frame[plain,noframenumbering]{\titlepage}
+ \setbeamertemplate{background}[\slidestyle]
}
\newcommand{\sectionframe}{
-\setbeamertemplate{section page}[\sectionstyle]
-\setbeamertemplate{background}[\sectionstyle]
-\frame[plain,noframenumbering]{\sectionpage}
-\setbeamertemplate{background}[\slidestyle]
+ \setbeamertemplate{section page}[\sectionstyle]
+ \setbeamertemplate{background}[\sectionstyle]
+ \frame[plain,noframenumbering]{\sectionpage}
+ \setbeamertemplate{background}[\slidestyle]
}
\newcommand{\trigon at disablesectionpage}{
-\AtBeginSection{
+ \AtBeginSection{
+ % intentionally empty
+ }
}
-}
\newcommand{\trigon at enablesectionpage}{
-\AtBeginSection{
-\sectionframe
+ \AtBeginSection{
+ \sectionframe
+ }
}
-}
\defbeamertemplate{title page}{titlebigimage}
{
-\vskip140pt
-\begin{flushright}
-\begin{minipage}[t][][c]{0.5\textwidth}%
-\centering
-\usebeamerfont{title}\usebeamercolor[fg]{title}
-\inserttitle\par
-\end{minipage}
-\ifx \insertsubtitle\@empty
-\else
-\vskip15pt
-\begin{minipage}[t][][c]{0.5\textwidth}%
-\centering
-\usebeamerfont{subtitle}\insertsubtitle\par%
-\end{minipage}
-\fi
-\vskip15pt
-\begin{minipage}[t][][c]{0.5\textwidth}%
-\centering
-\usebeamerfont{author}\insertauthor%
-\vskip10pt
-\usebeamerfont{date}\insertdate%
-\end{minipage}
+ \vskip135pt
+ \begin{flushright}
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{title}\usebeamercolor[fg]{title}
+ \inserttitle\par
+ \end{minipage}
+ \ifx \insertsubtitle\@empty
+ \else
+ \vskip15pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{minipage}
+ \fi
+ \vskip13pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{author}\insertauthor%
+ \vskip5pt
+ \usebeamerfont{date}\insertdate%
+ \end{minipage}
\end{flushright}
\vfill
}
\defbeamertemplate{title page}{titlesmallimage}
{
-\vskip140pt%
-\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{title page header}
-\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle\par%
-\end{beamercolorbox}%
-\ifx \insertsubtitle\@empty
+ \vskip140pt%
+ \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{title page header}
+ \usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle\par%
+ \end{beamercolorbox}%
+ \ifx \insertsubtitle\@empty
\else
-\vskip8pt
-\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{subtitle page header}
-\usebeamerfont{subtitle}\insertsubtitle\par%
-\end{beamercolorbox}%
+ \vskip8pt
+ \begin{beamercolorbox}[wd=\textwidth,sep=4pt]{subtitle page header}
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{beamercolorbox}%
\fi
\vskip10pt
\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{author}
-\usebeamerfont{author}\insertauthor%
+ \usebeamerfont{author}\insertauthor%
\end{beamercolorbox}
\vskip2pt%
\begin{beamercolorbox}[wd=\textwidth,sep=4pt]{date}
-\usebeamerfont{date}\insertdate%
+ \usebeamerfont{date}\insertdate%
\end{beamercolorbox}
\vfill
}
\defbeamertemplate{title page}{bottomtrianglescolor}
{
-\vskip0pt
-\begin{center}
-\begin{minipage}[t][][t]{\textwidth}
-\centering%
-\ifx\logbig\@empty \else
-\includegraphics[height=0.15\textheight]{\logbig}
-\fi
-\end{minipage}
-\vskip15pt
-\begin{minipage}[t][][c]{\textwidth}%
-\centering
-\usebeamerfont{title}\usebeamercolor[fg]{title}
-\inserttitle\par
-\end{minipage}
-\ifx \insertsubtitle\@empty
-\else
-\vskip15pt
-\begin{minipage}[t][][c]{\textwidth}%
-\centering
-\usebeamerfont{subtitle}\insertsubtitle\par%
-\end{minipage}
-\fi
-\vskip20pt
-\begin{minipage}[t][][c]{0.5\textwidth}%
-\centering
-\usebeamerfont{author}\insertauthor\\[0.3cm]%
-\usebeamerfont{date}\insertdate
-\end{minipage}
+ \vskip0pt
+ \begin{center}
+ \begin{minipage}[t][][t]{\textwidth}
+ \centering%
+ \ifx\logbig\@empty \else
+ \includegraphics[height=0.15\textheight]{\logbig}
+ \fi
+ \end{minipage}
+ \vskip15pt
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{title}\usebeamercolor[fg]{title}
+ \inserttitle\par
+ \end{minipage}
+ \ifx \insertsubtitle\@empty
+ \else
+ \vskip15pt
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{subtitle}\insertsubtitle\par%
+ \end{minipage}
+ \fi
+ \vskip20pt
+ \begin{minipage}[t][][c]{0.5\textwidth}%
+ \centering
+ \usebeamerfont{author}\insertauthor\\[0.3cm]%
+ \usebeamerfont{date}\insertdate
+ \end{minipage}
\end{center}
\vfill
}
\defbeamertemplate{section page}{bottomtrianglescolor}
{
-\vskip40pt
-\begin{center}
-\begin{minipage}[t][][c]{\textwidth}%
-\centering
-\usebeamerfont{section title}\usebeamercolor[fg]{title}
-\insertsectionhead\par
-\end{minipage}
-\end{center}
-\vfill
+ \vskip40pt
+ \begin{center}
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{minipage}
+ \end{center}
+ \vfill
}
\defbeamertemplate{section page}{bottomtrianglesbw}
{
-\vskip40pt
-\begin{center}
-\begin{minipage}[t][][c]{\textwidth}%
-\centering
-\usebeamerfont{section title}\usebeamercolor[fg]{title}
-\insertsectionhead\par
-\end{minipage}
-\end{center}
-\vfill
+ \vskip40pt
+ \begin{center}
+ \begin{minipage}[t][][c]{\textwidth}%
+ \centering
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{minipage}
+ \end{center}
+ \vfill
}
\defbeamertemplate{section page}{bigtriangles}
{
-\vskip200pt
-\begin{flushright}
-\begin{minipage}[t]{0.62\textwidth}%7
-\usebeamerfont{section title}\usebeamercolor[fg]{title}
-\raggedleft
-\insertsectionhead\par
-\end{minipage}
-\end{flushright}
-\vfill
+ \vskip200pt
+ \begin{flushright}
+ \begin{minipage}[t]{0.62\textwidth}%7
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \raggedleft
+ \insertsectionhead\par
+ \end{minipage}
+ \end{flushright}
+ \vfill
}
\defbeamertemplate{section page}{lefttriangles}
{
-\vskip25pt
-\begin{beamercolorbox}[wd=\textwidth,leftskip=100pt,sep=4pt]{section page header}
-\usebeamerfont{section title}\usebeamercolor[fg]{title}
-\insertsectionhead\par
-\end{beamercolorbox}%
-\vfill
+ \vskip25pt
+ \begin{beamercolorbox}[wd=\textwidth,leftskip=100pt,sep=4pt]{section page header}
+ \usebeamerfont{section title}\usebeamercolor[fg]{title}
+ \insertsectionhead\par
+ \end{beamercolorbox}%
+ \vfill
}
+\newlength{\trigon at blocksep}
+\newlength{\trigon at blockadjust}
+\setlength{\trigon at blocksep}{0.75ex}
+\setlength{\trigon at blockadjust}{0.25ex}
+\providecommand{\trigon at strut}{%
+ \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
+}
+\newcommand{\trigon at block}[1]{
+ \par\vskip\medskipamount%
+ \setlength{\parskip}{0pt}
+ \ifbeamercolorempty[bg]{block title#1}{%
+ \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{%
+ \ifbeamercolorempty[bg]{block title}{%
+ \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}%
+ }%
+ {%
+ \begin{beamercolorbox}[
+ sep=\dimexpr\trigon at blocksep-\trigon at blockadjust\relax,
+ leftskip=\trigon at blockadjust,
+ rightskip=\dimexpr\trigon at blockadjust plus 4em\relax
+ ]{block title#1}%
+ }}%
+ \usebeamerfont*{block title#1}%
+ \trigon at strut%
+ \insertblocktitle%
+ \trigon at strut%
+ \end{beamercolorbox}%
+ \nointerlineskip%
+ \ifbeamercolorempty[bg]{block body#1}{%
+ \begin{beamercolorbox}[vmode]{block body#1}}{
+ \ifbeamercolorempty[bg]{block body}{%
+ \begin{beamercolorbox}[vmode]{block body#1}%
+ }{%
+ \begin{beamercolorbox}[sep=\trigon at blocksep, vmode]{block body#1}%
+ \vspace{-\trigon at parskip}
+ }}%
+ \usebeamerfont{block body#1}%
+ \setlength{\parskip}{\trigon at parskip}%
+}
+\setbeamertemplate{block begin}{\trigon at block{}}
+\setbeamertemplate{block alerted begin}{\trigon at block{ alerted}}
+\setbeamertemplate{block example begin}{\trigon at block{ example}}
+\setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}}
\setbeamertemplate{caption label separator}{: }
\setbeamertemplate{caption}[numbered]
+\newlength{\trigon at parskip}
+\setlength{\trigon at parskip}{0.5em}
+\setlength{\parskip}{\trigon at parskip}
+\linespread{1.15}
\setbeamersize{text margin left=.05\paperwidth, text margin right=.05\paperwidth}
\trigon at inner@setdefaults
\ProcessPgfPackageOptions{/trigon/inner}
Modified: trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerouterthemetrigon.sty 2021-11-10 21:18:14 UTC (rev 61020)
@@ -18,7 +18,7 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/)
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2021/09/06 v0.6.0 Trigon outer theme]
+\ProvidesPackage{beamerouterthemetrigon}[2021/11/10 v0.6.2 Trigon outer theme]
\RequirePackage{pgfopts}
\def\logsmall{}
\newcommand\smalllogo[1]{
@@ -26,10 +26,10 @@
}
\pgfkeys{
/trigon/outer/numbering/.cd,
- .is choice,
- none/.code=\setbeamertemplate{frame numbering}[none],
- counter/.code=\setbeamertemplate{frame numbering}[counter],
- fraction/.code=\setbeamertemplate{frame numbering}[fraction]
+ .is choice,
+ none/.code=\setbeamertemplate{frame numbering}[none],
+ counter/.code=\setbeamertemplate{frame numbering}[counter],
+ fraction/.code=\setbeamertemplate{frame numbering}[fraction]
}
\newcommand{\trigon at outer@setdefaults}{
\pgfkeys{/trigon/outer/.cd,
@@ -40,21 +40,21 @@
{
\vspace{-1pt}
\begin{beamercolorbox}[wd=\paperwidth,leftskip=0.05\paperwidth]{frametitle}
- \vskip.4cm
- \ifx\insertframesubtitle\@empty%
+ \vskip.4cm
+ \ifx\insertframesubtitle\@empty%
{\usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle}%
- \else%
+ \else%
{\usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle}\\[-.25cm]
{\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}%
- \fi
- \vskip.3cm
+ \fi
+ \vskip.3cm
\end{beamercolorbox}
}
\defbeamertemplate{headline}{none}{}
\defbeamertemplate*{headline}{logo}{
-\ifx\logsmall\@empty\else
- \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt}
-\fi
+ \ifx\logsmall\@empty\else
+ \hfill\includegraphics[width=20pt]{\logsmall}\hspace{20pt}\vspace{-40pt}
+ \fi
}
\setbeamertemplate{navigation symbols}{}
@@ -81,8 +81,8 @@
\apptocmd{\appendix}{%
\pgfkeys{%
/trigon/outer/.cd,
- numbering=none}
- }{}{}
+ numbering=none}
+ }{}{}
}
\trigon at outer@setdefaults
\ProcessPgfPackageOptions{/trigon/outer}
Modified: trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty 2021-11-10 21:17:55 UTC (rev 61019)
+++ trunk/Master/texmf-dist/tex/latex/beamertheme-trigon/beamerthemetrigon.sty 2021-11-10 21:18:14 UTC (rev 61020)
@@ -18,7 +18,7 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/)
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2021/09/06 v0.6.0 Trigon Beamer theme]
+\ProvidesPackage{beamerthemetrigon}[2021/11/10 v0.6.2 Trigon Beamer theme]
\RequirePackage{pgfopts}
\RequirePackage{tikz}
\pgfkeys{/trigon/.cd,
@@ -31,38 +31,38 @@
}
\pgfkeys{
/trigon/titleformat plain/.cd,
- .is choice,
- regular/.code={%
- \let\trigon at plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon at plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon at plaintitleformat\MakeLowercase%
- \setbeamerfont{standout}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon at plaintitleformat\MakeUppercase%
- \setbeamerfont{standout}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon at plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon at plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon at plaintitleformat\MakeLowercase%
+ \setbeamerfont{standout}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat plain=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon at plaintitleformat\MakeUppercase%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat plain=allcaps can lead to problems%
+ }
+ },
}
\pgfkeys{
/trigon/titleformat/.code=\pgfkeysalso{
- font/titleformat title=#1,
- font/titleformat subtitle=#1,
- font/titleformat section=#1,
- font/titleformat frame=#1,
- titleformat plain=#1,
- }
+ font/titleformat title=#1,
+ font/titleformat subtitle=#1,
+ font/titleformat section=#1,
+ font/titleformat frame=#1,
+ titleformat plain=#1,
+ }
}
\newif\if at trigon@usesourcefonts
\pgfkeys{/trigon/.cd,
More information about the tex-live-commits
mailing list.