Fix Blocks

README.md

@@ -2,7 +2,7 @@
 The kinda awesome beamer theme!
 
 ## Using the theme
-First of all you will need the [smile](https://github.com/LukasPietzschmann/smile) package. If that's available, just copy and paste `beamerthemeawesome.sty` into your project, add `\usetheme{awesome}` into your main file and you're good to go :)
+First of all you will need the [smile](https://codeberg.org/LukasPietzschmann/smile) package. If that's available, just copy and paste `beamerthemeawesome.sty` into your project, add `\usetheme{awesome}` into your main file and you're good to go :)
 
 ## Options
 This theme provides some settings you can tweak:
@@ -10,7 +10,7 @@ This theme provides some settings you can tweak:
 - Extra slides: For each section and subsection an extra slide containing the title can be inserted. This is controlled by passing `secslide` or/and `subsecslide`. The absence of `secslide` indicates that you don't want an extra slide for every section. Analog for `subsecslide`.
 - Automatic toc: A table of contents is automatically inserted with the `\maketitle` command (After the title slide). If you want to disable this behavior, you have to set the `notoc` option.
 - Section numbers in frame title: Each frage contains the current section (and subsection) number in its title. To disable this, you have to pass the `nonumbersinframetitle` option. If you disable section numbers in the title, and you use use the `wide` environment inside a frame, it can look weird when the title is shifted to the right, but the content is not. To cope with this, you can pass the `wide` option to the frame. This will also shift the title to the left.
-- Others: Every option that is not recognized by awesome-beamer will be passed to [smile](https://github.com/LukasPietzschmann/smile).
+- Others: Every option that is not recognized by awesome-beamer will be passed to [smile](https://codeberg.org/LukasPietzschmann/smile).
 
 If you wanna set one (or more) of those values, you have to pass it to `\usetheme`. The usage of different options can be seen in the examples below (just click on the 'Repo' link).
 
@@ -21,6 +21,8 @@ If you're using latexmk you don't have to do this manually as latexmk can figure
 
 ## Example slides
 I already prepared many presentations using this style. Here are some examples:
+- [Zigtoberfest Talk](https://raw.githubusercontent.com/LukasPietzschmann/zigtoberfest-talk/build/talk.pdf) ([Repo](https://github.com/LukasPietzschmann/zigtoberfest-talk))
+- [Haskell's lenses](https://raw.githubusercontent.com/LukasPietzschmann/haskell-lenses/build/slides/talk.pdf) ([Repo](https://github.com/LukasPietzschmann/haskell-lenses))
 - [Hydrogen is an energy carrier](https://raw.githubusercontent.com/LukasPietzschmann/hydrogen-energy/build/talk.pdf) ([Repo](https://github.com/LukasPietzschmann/hydrogen-energy))
 - [SIMD intrinsics](https://github.com/LukasPietzschmann/SIMD-Intrinsics/files/12775327/talk.pdf) ([Repo](https://github.com/LukasPietzschmann/SIMD-Intrinsics))
 - [Building a dataflow graph for java](https://github.com/LukasPietzschmann/java-dataflow-graph/files/13249805/main.pdf) ([Repo](https://github.com/LukasPietzschmann/java-dataflow-graph))

beamerthemeawesome.sty

@@ -1,4 +1,4 @@
-\ProvidesPackage{awesome-beamer-theme}[]
+\ProvidesPackage{beamerthemeawesome}[]
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8,9 +8,8 @@
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=awesome,prefix=awesome@}
 
-\newif\ifawesome@english@
+\DeclareBoolOption{english}
-\DeclareVoidOption{english}{\awesome@english@true}
+\DeclareComplementaryOption{german}{english}
-\DeclareVoidOption{german}{\awesome@english@false}
 
 \DeclareBoolOption{notoc}
 \DeclareBoolOption{secslide}
@@ -21,7 +20,7 @@
 
 \ProcessKeyvalOptions*
 
-\ifawesome@english@\RequirePackage[english]{babel}\else\RequirePackage[ngerman]{babel}\fi
+\ifawesome@english\RequirePackage[english]{babel}\else\RequirePackage[ngerman]{babel}\fi
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64,12 +63,12 @@
 
 
 \def\maketitle{
-	\begin{frame}[noframenumbering,plain]
+	\begin{frame}[c,noframenumbering,plain]
 		\titlepage
 	\end{frame}
 	\ifawesome@notoc\else
 		\begin{frame}{Agenda}
-			\tableofcontents
+			\tableofcontents[hidesubsections]
 		\end{frame}
 	\fi
 }
@@ -83,8 +82,6 @@
 	\fi%
 }
 
-\BeforeBeginEnvironment{tabular}{\def\arraystretch{1.1}}
-
 \providebool{wideframe}
 \define@key{beamerframe}{wide}[true]{
 	\booltrue{wideframe}
@@ -118,12 +115,10 @@
 			\stepcounter{framesinsubsection}%
 		\fi%
 	\fi%
-	\ifnum\theframesinsection=0\setcounter{framesinsection}{1}\fi%
-	\ifnum\theframesinsubsection=0\setcounter{framesinsubsection}{1}\fi%
 }
 
-\BeforeBeginEnvironment{frame}{\stepframe}
+% \BeforeBeginEnvironment{frame}{\stepframe}
-\pretocmd\againframe{\stepframe}{}{}
+% \pretocmd\againframe{\stepframe}{}{}
 
 \def\refreshcountsinaux{%
 	\immediate\write\@auxout{\global\noexpand\@namedef{s@totalsubsectionframes-\arabic{section}-\arabic{subsection}}{\theframesinsubsection}}%
@@ -179,7 +174,9 @@
 
 \setbeamercolor{alerted text}{fg=accent}
 
+\setbeamercolor{title}{fg=black}
 \setbeamercolor{subtitle}{fg=darkgray}
+
 \setbeamercolor{frametitle}{fg=black}
 \setbeamercolor{framesubtitle}{fg=darkgray}
 
@@ -203,59 +200,24 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\setbeamerfont{title}{
+\setbeamerfont{title}{size=\LARGE,shape=\bfseries\scshape}
-	size=\LARGE,
+\setbeamerfont{subtitle}{size=\large,shape=\normalfont}
-	shape=\bfseries\scshape
-}
 
-\setbeamerfont{subtitle}{
+\setbeamerfont{author}{size=\normalsize,shape=\normalfont}
-	size=\large,
+\setbeamerfont{details}{size=\footnotesize,shape=\normalfont}
-	shape=\normalfont
-}
 
-\setbeamerfont{author}{
+\setbeamerfont{footline}{size=\tiny,shape=\normalfont}
-	size=\normalsize,
-	shape=\normalfont
-}
 
-\setbeamerfont{details}{
+\setbeamerfont{footnote}{size=\tiny,shape=\normalfont}
-	size=\footnotesize,
-	shape=\normalfont
-}
 
-\setbeamerfont{footline}{
+\setbeamerfont{frametitle}{size=\LARGE,shape=\bfseries\scshape}
-	size=\tiny,
-	shape=\normalfont
-}
 
-\setbeamerfont{footnote}{
+\setbeamerfont{framesubtitle}{size=\normalsize,shape=\normalfont}
-	size=\tiny,
-	shape=\normalfont
-}
 
-\setbeamerfont{frametitle}{
+\setbeamerfont{block title}{size=\normalfont,shape=\strut}
-	size=\LARGE,
+\setbeamerfont{blockdef}{size=\large,shape=\bfseries}
-	shape=\bfseries\scshape
-}
 
-\setbeamerfont{framesubtitle}{
+\setbeamerfont{description item}{shape=\bfseries}
-	size=\normalsize,
-	shape=\normalfont
-}
-
-\setbeamerfont{block title}{
-	size=\normalfont,
-	shape=\strut
-}
-
-\setbeamerfont{blockdef}{
-	size=\large,
-	shape=\bfseries
-}
-
-\setbeamerfont{description item}{
-	shape=\bfseries
-}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -270,6 +232,12 @@
 \setbeamersize{text margin left=\awesome@textmargin}
 \setbeamersize{text margin right=\awesome@textmargin}
 
+\setbeamertemplate{sidebar left}{
+	\vfill
+	\hbox to \awesome@sidebarwidth{\hss\hspace*{2mm}\includegraphics[width=2.5cm]{\imagepath/images/logos/logo.png}\hss}
+	\vskip2mm
+}
+
 \setbeamertemplate{caption}{\insertcaption}
 \setbeamertemplate{blocks}[rounded][shadow=false]
 \setbeamertemplate{itemize item}[circle]
@@ -319,7 +287,7 @@
 	\begin{beamercolorbox}{frametitle}%
 		\insertframetitle%
 	\end{beamercolorbox}
-	\ifx\insertframesubtitle\empty\else%
+	\ifx\usebeamercolor{subtitle}\insertframesubtitle\empty\else%
 	\begin{beamercolorbox}{framesubtitle}%
 		\ifawesome@nonumbersinframetitle\ifbool{wideframe}{\hspace{-\awesome@sidebarwidth}}{}\fi\usebeamerfont{subtitle}\insertframesubtitle%
 	\end{beamercolorbox}\fi%
@@ -330,27 +298,27 @@
 \newtcolorbox{beamerbox}[3][]{boxrule=\smile@linewidth,
 IfBlankTF={#3}{toprule=2mm}{title=#3},colback=#2!5!white,colframe=#2!75!black,left=0em,
 lefttitle=4mm, arc=\smile@rounding, enhanced, segmentation engine=path,
-segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewidth},#1}
+segmentation style={lcr, solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewidth},#1}
 
 \renewenvironment{definition}[1][\empty]{%
 	\begin{beamerbox}{gray}{#1}%
 }{\end{beamerbox}}
 
-\renewenvironment{block}[1][]{%
+\renewenvironment{block}[1]{%
 	\begin{beamerbox}{accent}{#1}%
 }{\end{beamerbox}}
 
-\renewenvironment{examples}[1][]{%
+\renewenvironment{examples}[1]{%
 	\begin{beamerbox}{green}{#1}%
 }{\end{beamerbox}}
 
-\renewenvironment{alertblock}[1][]{%
+\renewenvironment{alertblock}[1]{%
 	\begin{beamerbox}{red}{#1}%
 }{\end{beamerbox}}
 
 \newenvironment<>{modal}[1][]{%
 	\def\titlename{#1}%
-	\onlyenv#2%
+	\visibleenv#2%
 	\begin{tikzpicture}[o,node distance=0pt]%
 		\fill[modal background] (current page.south west) rectangle (current page.north east);%
 		\node[modal box] at (current page) (MODALCONTENT) \bgroup%
@@ -358,7 +326,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 		\egroup;%
 		\if\expandafter\isempty\expandafter{\titlename}\else\node[modal title] at (MODALCONTENT.north) {\titlename};\fi
 	\end{tikzpicture}%
-	\endonlyenv%
+	\endvisibleenv%
 }
 
 \ensureinfocommand{title}
@@ -377,7 +345,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 
 \tikzfading[
 	name=title page picture fading,
-	left color=transparent!0,
+	left color=transparent!50,
 	right color=transparent!100,
 ]
 
@@ -390,49 +358,45 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 \setbeamertemplate{title page}{\begin{wide}
 	\def\titlecontent{\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle}%
 	\def\subtitlecontent{\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle}%
+
 	\settowidth\titlewidth\titlecontent%
 	\settowidth\subtitlewidth\subtitlecontent%
+
 	\setlength\maxwidth{\ifdim\titlewidth>\subtitlewidth\titlewidth\else\subtitlewidth\fi}%
 	\thispagestyle{navigation@titlepage}%
 	\begin{minipage}{\lhswidth}
 		\raggedright%
-		\titlecontent\\
+    \hspace*{2mm}\includegraphics[height=6em]{\imagepath/images/logos/logo.png}
-		\subtitlecontent\\
+		% \leavevmode\titlecontent\\
+		% \leavevmode\subtitlecontent\\
 		\textcolor{accent}{\rule{\ifdim\maxwidth<\lhswidth\maxwidth\else\lhswidth\fi}{\smile@linewidth}}\\[2em]
 		\usebeamerfont{author}\usebeamercolor[fg]{author}%
 		\insertauthor\\
 		\usebeamerfont{details}\usebeamercolor[fg]{details}%
 		\insertemail\\[2em]
 		\usebeamerfont{details}\usebeamercolor[fg]{details}%
-		\insertinstitute\\
+		\insertinstitute\\[2em]
-		\insertuni\\[2em]
 		\insertdate
 	\end{minipage}
 
 	\ifdefined\@background
-		\begin{tikzpicture}[remember picture, overlay]
+		\begin{tikzpicture}[o]
 			\clip (current page.south east)
 				-- (current page.north east)
 				-- ++(-5.1, 0)
 				-- ++(-3, -\paperheight)
 				-- cycle;
 
-			\node[
+			\node[anchor=south east,inner sep=0,outer sep=0] at (current page.south east) {
-				anchor=south east,
-				inner sep=0,
-				outer sep=0
-			] at (current page.south east) {
 				\includegraphics[height=\paperheight]{\@background}
 			};
 
-			\fill[
+			\fill[accent,path fading=title page picture fading,fading angle=-15]
-				black, path fading=title page picture fading,
+				(current page.south east) rectangle ++(-10, \dimexpr\paperheight+1cm);
-				fading angle=-15
-			]
-			(current page.south east)
-			rectangle
-			++(-10, \dimexpr\paperheight+1cm);
 		\end{tikzpicture}
+		\tikz[o]\draw[accent,lcr,line width=2*\smile@linewidth]
+			([shift={(-5.1,0)}]current page.north east)
+			-- ++(-3,-\paperheight);
 	\fi
 \end{wide}}
 
@@ -463,7 +427,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 
 \newcounter{pagenumbertolinkto}
 \setbeamertemplate{footline}{%
-	\setfooter{\insertshortauthor}{%
+	\setfooter{}{%
 		\hyperlinkdocumentstart{\insertshorttitle}\hspace{.7em}\awesome@smalldot\hspace{.7em}\insertsection%
 		\ifx\insertsubsection\empty%
 			\hspace{.4em}%
@@ -491,7 +455,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 				}%
 			\fi%
 		\fi%
-	}{\ifawesome@english@ Page\else Seite\fi~\insertframenumber~/~\inserttotalframenumber}%
+	}{\ifawesome@english Page\else Seite\fi~\insertframenumber~/~\inserttotalframenumber}%
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -505,7 +469,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 	\setbeamertemplate{footline}{%
 		\setfooter{\insertshortauthor}%
 		{\hyperlinkdocumentstart{\insertshorttitle}}%
-		{\ifawesome@english@ Section\else Kapitel\fi~\thesection\ifx\insertsubsection\empty\else.\thesubsection\fi}%
+		{\ifawesome@english Section\else Kapitel\fi~\thesection\ifx\insertsubsection\empty\else.\thesubsection\fi}%
 	}%
 	\@nameuse{ps@navigation}%
 }
@@ -519,6 +483,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 
 % Kinda hacky, but AtBeginEnvironment does not work with beamer tex.stackexchange.com/a/436338/286979
 \pretocmd\beamer@checkframetitle{%
+	\stepframe%
 	\transfade[duration=0.1]%
 	\ifbeamer@isfragile%
 		\label{page:\insertframenumber}%
@@ -531,7 +496,7 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 		\begin{wide}\centering%
 		\usebeamerfont{title}%
 		\usebeamercolor[fg]{section number projected}%
-		\scalebox{1.3}{ \raisebox{-1pt}{\insertsectionnumber}}.~%
+		% \scalebox{1.3}{ \raisebox{-1pt}{\insertsectionnumber}}.~%
 		\usebeamercolor[fg]{title}%
 		\insertsectionhead%
 		\end{wide}%
@@ -543,9 +508,9 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 		\begin{wide}\centering%
 		\usebeamerfont{title}%
 		\usebeamercolor[fg]{section number projected}%
-		\scalebox{1.3}{\raisebox{-1pt}{\insertsectionnumber}}.%
+		% \scalebox{1.3}{\raisebox{-1pt}{\insertsectionnumber}}.%
 		\usebeamercolor[fg]{subsection number projected}%
-		\textsubscript{\insertsubsectionnumber}~%
+		% \textsubscript{\insertsubsectionnumber}~%
 		\usebeamercolor[fg]{title}%
 		\insertsubsectionhead%
 		\end{wide}%
@@ -553,10 +518,17 @@ segmentation style={solid, shorten >=1mm,shorten <=1mm, line width=\smile@linewi
 \fi}
 
 \AtEndDocument{
+  \begingroup
+  \setbeamertemplate{sidebar left}{}
+  \logo{}
 	{\setbeamercolor{background canvas}{bg=accent}
 	\begin{frame}[b,noframenumbering]\thispagestyle{navigation@titlepage}%
 		\begin{wide}\color{white}%
+      \huge\textbf\inserttitle \\
+      \LARGE\insertsubtitle \\
+      \vskip2em
 			\Large\textbf{\insertauthor}\vskip0.5em\scriptsize\insertlocation,~\insertdate\hfill\insertemail%
 		\end{wide}%
 	\end{frame}}
+  \endgroup
 }