summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/beamertheme-trigon
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-10 21:18:14 +0000
committerKarl Berry <karl@freefriends.org>2021-11-10 21:18:14 +0000
commit0fa96dfaeccecfef0e70e06b5dee5fa4f9c47481 (patch)
tree1aea2691333fe3f6e814bebc6b88f610cd106447 /Master/texmf-dist/source/latex/beamertheme-trigon
parente1892041babddae7e1be712ccfe1e0d057b44e66 (diff)
beamertheme-trigon (10nov21)
git-svn-id: svn://tug.org/texlive/trunk@61020 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/beamertheme-trigon')
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/Makefile127
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx51
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx313
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx713
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx74
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx90
-rw-r--r--Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx46
7 files changed, 825 insertions, 589 deletions
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile b/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile
new file mode 100644
index 00000000000..10bb7d6173e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/Makefile
@@ -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@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)
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx
index 15e5a94897b..d5da8918f17 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamercolorthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2021/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}
+%
% \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@colors@dark,
- light/.code=\trigon@colors@light
+ .is choice,
+ dark/.code=\trigon@colors@dark,
+ light/.code=\trigon@colors@light
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{headingcolor}
-% Select the color to use for all headings (title, section, frame, etc.).
+% 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@block@transparent,
- fill/.code=\trigon@block@fill
+ .is choice,
+ transparent/.code=\trigon@block@transparent,
+ fill/.code=\trigon@block@fill
}
%
% \begin{macro}{\trigon@color@setdefaults}
-% Sets default values for color theme options.
+% Sets default values for color theme options.
% \begin{macrocode}
\newcommand{\trigon@color@setdefaults}{
\pgfkeys{/trigon/color/.cd,
- background=light,
- block=fill,
- headingcolor=default,
- textcolor=default
+ background=light,
+ block=fill,
+ headingcolor=default,
+ textcolor=default
}
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx
index 74e5ee3965a..790af1b4f94 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerfontthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2021/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@titleformat\@empty%
- \setbeamerfont{title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon@titleformat\@empty%
- \setbeamerfont{title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon@titleformat\lowercase%
- \setbeamerfont{title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon@titleformat\uppercase%
- \setbeamerfont{title}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat title=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon@titleformat\@empty%
+ \setbeamerfont{title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon@titleformat\@empty%
+ \setbeamerfont{title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon@titleformat\lowercase%
+ \setbeamerfont{title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat title=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon@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@subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon@subtitleformat\@empty%
- \setbeamerfont{subtitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon@subtitleformat\lowercase%
- \setbeamerfont{subtitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon@subtitleformat\uppercase%
- \setbeamerfont{subtitle}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat subtitle=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon@subtitleformat\lowercase%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon@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@sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon@sectiontitleformat\@empty%
- \setbeamerfont{section title}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon@sectiontitleformat\MakeLowercase%
- \setbeamerfont{section title}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat section=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon@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@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon@sectiontitleformat\MakeLowercase%
+ \setbeamerfont{section title}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat section=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon@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@frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon@frametitleformat\@empty%
- \setbeamerfont{frametitle}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon@frametitleformat\MakeLowercase%
- \setbeamerfont{frametitle}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon@frametitleformat\MakeUppercase%
- \setbeamerfont{frametitle}{shape=\normalfont}
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat frame=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon@frametitleformat\MakeLowercase%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat frame=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon@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@font@setdefaults}
-% Sets default values for font theme options.
+% Sets default values for font theme options.
% \begin{macrocode}
\newcommand{\trigon@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@title}%
- {\def\inserttitle{#2}}%
- {\def\inserttitle{\trigon@titleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
+{\def\inserttitle{#2}}%
+{\def\inserttitle{\trigon@titleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching title failed}\@ehc}
\patchcmd{\beamer@subtitle}%
- {\def\insertsubtitle{#2}}%
- {\def\insertsubtitle{\trigon@subtitleformat{#2}}}%
- {}%
- {\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
+{\def\insertsubtitle{#2}}%
+{\def\insertsubtitle{\trigon@subtitleformat{#2}}}%
+{}%
+{\PackageError{beamerfontthemetrigon}{Patching subtitle failed}\@ehc}
\patchcmd{\sectionentry}
- {\def\insertsectionhead{#2}}
- {\def\insertsectionhead{\trigon@sectiontitleformat{#2}}}
- {}
- {\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
+{\def\insertsectionhead{#2}}
+{\def\insertsectionhead{\trigon@sectiontitleformat{#2}}}
+{}
+{\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc}
\@tempswafalse
\patchcmd{\beamer@section}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
- {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
- \noexpand\trigon@sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+\noexpand\trigon@sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer@section}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
- {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{%
- \trigon@sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{%
+\trigon@sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer@section}
- {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
- {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
- \noexpand\trigon@sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
+{\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+\noexpand\trigon@sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if@tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
\@tempswafalse
\patchcmd{\beamer@subsection}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
- {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
- \noexpand\trigon@sectiontitleformat{\unexpanded{#1}}}}}
- {\@tempswatrue}
- {}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
+{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+\noexpand\trigon@sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer@subsection}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
- {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{%
- \trigon@sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+{\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{%
+\trigon@sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\patchcmd{\beamer@subsection}
- {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
- {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
- \noexpand\trigon@sectiontitleformat{#1}}}}
- {\@tempswatrue}
- {}
+{\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
+{\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+\noexpand\trigon@sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
\if@tempswa\else
\PackageError{beamerfontthemetrigon}{Patching section title failed}\@ehc
\fi
@@ -273,24 +269,23 @@
%
% \begin{macrocode}
\patchcmd{\beamer@@frametitle}
- {{%
- \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+{{%
+ \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer@frametitle{#2}%
\gdef\beamer@shortframetitle{#1}%
- }}
- {{%
- \gdef\insertframetitle{{\trigon@frametitleformat{#2}\ifnum%
- \beamer@autobreakcount>0\relax{}\space%
- \usebeamertemplate*{frametitle continuation}\fi}}%
+}}
+{{%
+ \gdef\insertframetitle{{\trigon@frametitleformat{#2}\ifnum%
+ \beamer@autobreakcount>0\relax{}\space%
+ \usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer@frametitle{#2}%
\gdef\beamer@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}
%
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx
index 60344f6d4b1..614cfb38549 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerinnerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2021/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,95 +44,93 @@
\usetikzlibrary{calc,3d}
% \end{macrocode}
%
-%
% \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@disablesectionpage,
- simple/.code=\trigon@enablesectionpage
+ /trigon/inner/sectionpage/.cd,
+ .is choice,
+ none/.code=\trigon@disablesectionpage,
+ simple/.code=\trigon@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}
%
%
% \begin{macro}{\trigon@inner@setdefaults}
-% Sets default values for the inner theme options.
+% Sets default values for the inner theme options.
% \begin{macrocode}
\newcommand{\trigon@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,166 +208,165 @@
% We then define the different backgrounds choices.
%
% \begin{macro}{blank}
-% Blank slide background.
+% Blank slide background.
% \begin{macrocode}
\defbeamertemplate{background}{blank}{}
% \end{macrocode}
% \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@disablesectionpage}{
- \AtBeginSection{
- % intentionally empty
- }
+ \AtBeginSection{
+ % intentionally empty
+ }
}
\newcommand{\trigon@enablesectionpage}{
- \AtBeginSection{
- \sectionframe
- }
+ \AtBeginSection{
+ \sectionframe
+ }
}
% \end{macrocode}
% \end{macro}
@@ -424,177 +420,285 @@
% 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@block| to define all three templates.
+%
+% \begin{macrocode}
+\newlength{\trigon@blocksep}
+\newlength{\trigon@blockadjust}
+\setlength{\trigon@blocksep}{0.75ex}
+\setlength{\trigon@blockadjust}{0.25ex}
+\providecommand{\trigon@strut}{%
+ \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
+}
+\newcommand{\trigon@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@blockskip|. However, we have to visually compensate for
+% the |\trigon@strut| added to the block title (see below) by
+% subtracting |\trigon@blockadjust| from the top and bottom padding.
+%
+% \begin{macrocode}
+ {%
+ \begin{beamercolorbox}[
+ sep=\dimexpr\trigon@blocksep-\trigon@blockadjust\relax,
+ leftskip=\trigon@blockadjust,
+ rightskip=\dimexpr\trigon@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@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@strut%
+ \insertblocktitle%
+ \trigon@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@blocksep, vmode]{block body#1}%
+ \vspace{-\trigon@parskip}
+ }}%
+ \usebeamerfont{block body#1}%
+ \setlength{\parskip}{\trigon@parskip}%
+}
+% \end{macrocode}
+%
+% This concludes the auxiliary macro |\trigon@block|. Finally,
+% we define the block beamer templates using this macro.
+%
+% \begin{macrocode}
+\setbeamertemplate{block begin}{\trigon@block{}}
+\setbeamertemplate{block alerted begin}{\trigon@block{ alerted}}
+\setbeamertemplate{block example begin}{\trigon@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}
%
@@ -603,8 +707,17 @@
\setbeamertemplate{caption}[numbered]
% \end{macrocode}
%
+% \subsubsection{Text and spacing settings}
+%
+% \begin{macrocode}
+\newlength{\trigon@parskip}
+\setlength{\trigon@parskip}{0.5em}
+\setlength{\parskip}{\trigon@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}
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx
index 41ab019fc55..d33c019bcc4 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerouterthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2021/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@outer@setdefaults}
-% Sets default values for the outer theme options.
-% \begin{macrocode}
+% Sets default values for the outer theme options.
+% \begin{macrocode}
\newcommand{\trigon@outer@setdefaults}{
\pgfkeys{/trigon/outer/.cd,
numbering=counter
}
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
-%
% \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}
+%
% \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}
+%
% 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}
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx
index b12e1dc7e8b..0f097e81acc 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/beamerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2021/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@plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\normalfont}%
- },
- smallcaps/.code={%
- \let\trigon@plaintitleformat\@empty%
- \setbeamerfont{standout}{shape=\scshape}%
- },
- allsmallcaps/.code={%
- \let\trigon@plaintitleformat\MakeLowercase%
- \setbeamerfont{standout}{shape=\scshape}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allsmallcaps can lead to problems%
- }
- },
- allcaps/.code={%
- \let\trigon@plaintitleformat\MakeUppercase%
- \setbeamerfont{standout}{shape=\normalfont}%
- \PackageWarning{beamerthemetrigon}{%
- Be aware that titleformat plain=allcaps can lead to problems%
- }
- },
+ .is choice,
+ regular/.code={%
+ \let\trigon@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\trigon@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\trigon@plaintitleformat\MakeLowercase%
+ \setbeamerfont{standout}{shape=\scshape}%
+ \PackageWarning{beamerthemetrigon}{%
+ Be aware that titleformat plain=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\trigon@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@trigon@usesourcefonts
\pgfkeys{/trigon/.cd,
usesourcefonts/.is if=@trigon@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@trigon@usesourcefonts%
diff --git a/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx b/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx
index f7d6503a2d9..7e1dce7af99 100644
--- a/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx
+++ b/Master/texmf-dist/source/latex/beamertheme-trigon/trigontheme.dtx
@@ -59,7 +59,7 @@
aboveskip=1em,
belowskip=1em,
morekeywords={usetheme,institute,maketitle,@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 @@ options for advanced users:
\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 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
}
\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 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
\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 @@ aesthetic point of view, but their use of |\MakeLowercase| and
|\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})