From 378b2ba55f417b42b93d9edb06dd4d007872f8b9 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Fri, 8 Nov 2019 03:00:45 +0000
Subject: CTAN sync 201911080300

---
 .../contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty   | 136 ++++++++++++++-------
 1 file changed, 93 insertions(+), 43 deletions(-)

(limited to 'macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty')

diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index 1838dfd305..b2c16c0ebf 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamerinnerthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,42 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/10/15),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -27,18 +57,25 @@
 %% ============================================================================
 %%
 \def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\filedate{2019/10/15}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerinnerthemeTUDa}
  [\filedate\space\fileversion]
 
+\RequirePackage{l3keys2e}
+
 \mode<presentation>
-%TODO wihtout outertheme
 
 \RequirePackage{trimclip}
 
-\ExplSyntaxOn
 
+\ExplSyntaxOn
+\keys_define:nn {TUDa/beamer/inner} {
+	authorontitle .bool_gset:N = \g_TUDa_authorontitle_bool,
+	authorontitle .initial:n = false,
+	authorontitle .default:n = true
+}
+\ProcessKeysOptions{TUDa/beamer/inner}
 
 \box_new:N \l_TUDa_titlegraphic_box
 
@@ -74,39 +111,63 @@
 	\nointerlineskip
 	\vspace{\dim_eval:n {-\c_TUDa_largerule_dim}}
 	\hbox_set:Nn \l_TUDa_titlehead_box {
+	\parbox{\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent}{%
 	\begin{beamercolorbox}[
-		wd=\TUDa@beamer@linewidth,
-%		sep=.5\ht\TUDa@logobox,
+		wd=\linewidth,
 		sep=\TUDa@beamer@logosep,
 	]{title}
 	\raggedright
-%	\hspace*{\fill}\smash{\raisebox{-\height}{\usebox\TUDa@logobox}}
 	\usebeamerfont{title}
 	\skip_horizontal:n {1ex}
 	\strut\parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-2ex\relax}{
 		\inserttitle
 		\par
 	}
-%\hfill%
 	\hspace{\fill}\raisebox{\dimexpr-\height+\ht\strutbox\relax}{\usebox\TUDa@logobox}
-%	\smash{\raisebox{-\height}{\usebox\TUDa@logobox}}
 	\ifx\insertsubtitle\@empty
 	\else
 	\par\vspace{\c_TUDa_largerule_dim}
 	\skip_horizontal:n {1ex}\parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-2ex\relax}{
 		\usebeamerfont{subtitle}\insertsubtitle
 	}
-%	\skip_vertical:n {-.25\ht\TUDa@logobox}
 	\fi
 	\end{beamercolorbox}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% bool if authorontrile
+\bool_if:NT \g_TUDa_authorontitle_bool {
+\par\nointerlineskip
+\begin{beamercolorbox}[
+	wd=\linewidth,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
+\end{beamercolorbox}
+\par\nointerlineskip
+	\begin{beamercolorbox}[
+	wd=\linewidth,
+	sep=\c_TUDa_largerule_dim,
+	]{title}
+	\raggedright
+	\skip_horizontal:n {1ex}
+	\parbox[t]{\dimexpr\linewidth-2ex\relax}{
+		\ifx\insertauthor\@empty
+		\else
+		\usebeamercolor[fg]{author}\usebeamerfont{author}\insertauthor\par
+		\fi
+		\ifx\insertauthor\@empty
+		\else
+		\usebeamercolor[fg]{institute}\usebeamerfont{institute}\insertinstitute
+		\fi
+	}
+\end{beamercolorbox}
+}
+	}
 	}
 	\box_use:N \l_TUDa_titlehead_box
-\nointerlineskip\begin{beamercolorbox}[wd=\linewidth,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
+\nointerlineskip\begin{beamercolorbox}[
+	wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
 	\end{beamercolorbox}
-	\dim_set:Nn \l_TUDa_titlegraphic_ht_dim {\textheight-\box_ht:N\l_TUDa_titlehead_box
+	\dim_set:Nn \l_TUDa_titlegraphic_ht_dim {\textheight-\box_ht:N\l_TUDa_titlehead_box-\box_dp:N \l_TUDa_titlehead_box
 	+\c_TUDa_largerule_dim-.5\c_TUDa_rulesep_dim-\c_TUDa_smallrule_dim}
 	\let\height\l_TUDa_titlegraphic_ht_dim
-	\dim_set:Nn \l_TUDa_titlegraphic_wd_dim{\linewidth}
+	\dim_set:Nn \l_TUDa_titlegraphic_wd_dim{\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent}
 	\let\width\l_TUDa_titlegraphic_wd_dim
 	\nointerlineskip
 	\begin{beamercolorbox}[wd=\width,
@@ -123,10 +184,12 @@
 \defbeamertemplate*{block begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=.5pt]{block title}%TODO
+	\begin{beamercolorbox}[ wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,sep=.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi]{block title}
 	\ifx\insertblocktitle\@empty
 	\else
-	\begin{beamercolorbox}[colsep=.75ex, wd=\dimexpr\linewidth-1pt\relax]{block title}
+	\begin{beamercolorbox}[colsep=.75ex,
+		 wd=\dimexpr\linewidth-1pt\relax]{block title}
 		\usebeamerfont*{block title}\insertblocktitle%
 	\end{beamercolorbox}%
 	\ifbeamercolorempty[bg]{block title}
@@ -145,7 +208,11 @@
 \defbeamertemplate*{block alerted begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=1.5pt]{block frame alerted}
+	\begin{beamercolorbox}[
+		wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,
+		sep=1.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi,
+	]{block frame alerted}
 	\ifx\insertblocktitle\@empty
 	\else
 	\begin{beamercolorbox}[wd={\dimexpr\linewidth-3pt},colsep=.75ex]{block title alerted}
@@ -165,7 +232,11 @@
 \defbeamertemplate*{block example begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=1.5pt]{block frame example}
+	\begin{beamercolorbox}[
+		wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,
+		sep=1.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi,
+		]{block frame example}
 	\ifx\insertblocktitle\@empty
 	\else
 	\begin{beamercolorbox}[wd={\dimexpr\linewidth-3pt},colsep=.75ex]{block title example}
@@ -181,31 +252,10 @@
 	{\end{beamercolorbox}\end{beamercolorbox}\vskip\smallskipamount}
 
 %Itemize Items
-\defbeamertemplate*{itemize item}{TUDa}{\usebeamerfont*{itemize item}\raise1.25pt\hbox{\donotcoloroutermaths$\bullet$}}
-\defbeamertemplate*{itemize subitem}{TUDa}{\usebeamerfont*{itemize item}\raise1.5pt\hbox{\tiny\donotcoloroutermaths$\bullet$}}
+\defbeamertemplate*{itemize item}{TUDa}{\usebeamerfont*{itemize item}\raise\dimexpr.4\ht\strutbox-.4ex\hbox{\rule{.8ex}{.8ex}}}
+\defbeamertemplate*{itemize subitem}{TUDa}{\usebeamerfont*{itemize item}\setlength{\fboxsep}{\z@}\setlength{\fboxrule}{1pt}\raise\dimexpr.4\ht\strutbox-.2ex-\fboxrule\hbox{\fbox{\color{bg}\rule{.4ex}{.4ex}}}}
 \defbeamertemplate*{itemize subsubitem}{TUDa}{\usebeamerfont*{itemize subitem}\hbox{--}}
 
-%List spacing
-\setlength\labelwidth{.75em}
-\setlength\leftmargini{\dimexpr\labelwidth+\labelsep}
-\setlength\leftmarginii{\dimexpr\labelwidth+\labelsep}
-\setlength\leftmarginiii{\dimexpr\labelwidth+\labelsep}
-
-\def\@listi{\leftmargin\leftmargini
-	\topsep \z@ \@plus2\p@ \@minus2.5\p@
-	\parsep 0\p@
-	\itemsep3\p@ \@plus2\p@ \@minus3\p@}
-\let\@listI\@listi
-\def\@listii{\leftmargin\leftmarginii
-	\topsep    \z@ \@plus1\p@ \@minus2\p@
-	\parsep    0\p@   \@plus\p@
-	\itemsep   \parsep}
-\def\@listiii{\leftmargin\leftmarginiii
-	\topsep    \z@ \@plus1\p@ \@minus2\p@
-	\parsep    0\p@   \@plus\p@
-	\itemsep   \parsep}
-
-
 \mode<all>
 
 \endinput
-- 
cgit v1.2.3

