tuda-ci (10sep19)

git-svn-id: svn://tug.org/texlive/trunk@52075 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 131 insertions, 80 deletions

diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
index 4c1ac581a7a..a3c33bb09da 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 1.01 (2019/08/05),
+%% This is file `beamercolorthemeTUDa.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamercolorthemeTUDa}
 [\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
index bc14a0c3baf..fbdf3382fa9 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 1.01 (2019/08/05),
+%% This is file `beamerfontthemeTUDa.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerfontthemeTUDa}
  [\filedate\space\fileversion]    
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
index 1272fbf677c..356dfd89225 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 1.01 (2019/08/05),
+%% This is file `beamerinnerthemeTUDa.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerinnerthemeTUDa}
  [\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
index c28a7bdc61b..e78cae9cb68 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 1.01 (2019/08/05),
+%% This is file `beamerouterthemeTUDa.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerouterthemeTUDa}
  [\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
index 713cec52133..f0a1cd3a8e3 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 1.01 (2019/08/05),
+%% This is file `beamerthemeTUDa.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerthemeTUDa}
  [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
index 54779870323..09d6c0bde9e 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 1.01 (2019/08/05),
+%% This is file `tudabeamer.cls' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{tudabeamer}
  [\filedate\space\fileversion\space]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
index 246fda108fe..ec0cb53a4c2 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 1.01 (2019/08/05),
+%% This is file `tudacolors.def' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \ProvidesFile{tudacolors.def}
 [\filedate\space\fileversion\space Color definitions for tuda-ci]
 
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
index 4672c39364f..fd546e094d7 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 1.01 (2019/08/05),
+%% This is file `tudacolors.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
index 14f80ab8aed..b935d95705c 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 1.01 (2019/08/05),
+%% This is file `tudafonts.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tudafonts}
  [\filedate\space\fileversion\space 
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
index 43bcd28693a..1cc25ffd167 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 1.01 (2019/08/05),
+%% This is file `tudaletter.cls' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaletter}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
index 87b8bd2b4b8..13213823027 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 1.01 (2019/08/05),
+%% This is file `tudaposter.cls' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
index ae21ac783dc..2cbc051fe51 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 1.01 (2019/08/05),
+%% This is file `tudapub.cls' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudapub}
@@ -58,6 +58,9 @@
 	The~KOMA-Script~option~titlepage~is~forced~to~"firstiscover".
 }
 
+\bool_new:N \g_TUDa_geometry_bool
+\bool_new:N \g_TUDa_custommargins_bool
+
 \keys_define:nn {TUDa/pub} {
 	%twoside -> geometry + class
 	class .choice:,
@@ -75,7 +78,19 @@
 	marginpar .tl_gset:N = \g_TUDa_marginpar_tl,
 	marginpar .default:n = auto,
 	marginpar .initial:n = auto,
-	custommargins .bool_gset:N = \g_TUDa_custommargins_bool,
+	custommargins .choice:,
+	custommargins / true .code:n ={
+		\bool_gset_true:N \g_TUDa_custommargins_bool
+		\bool_gset_false:N \g_TUDa_geometry_bool
+	},
+	custommargins / false .code:n ={
+		\bool_gset_false:N \g_TUDa_custommargins_bool
+		\bool_gset_true:N \g_TUDa_geometry_bool
+	},
+	custommargins / geometry .code:n = {
+		\bool_gset_true:N \g_TUDa_custommargins_bool
+		\bool_gset_true:N \g_TUDa_geometry_bool
+	},
 	custommargins .initial:n = false,
 	custommargins .default:n = true,
 	fontsize .code:n = \prop_gput:Nnn \g_TUDa_clsopts_prop {fontsize} {#1},
@@ -310,11 +325,10 @@
 
 %%%%%Anfang Randeinstellungen Geometry
 
-\bool_if:NTF  \g_TUDa_custommargins_bool {
-	\KOMAoptions{headinclude, footinclude}
-	\let\TUDa_disable_marginpar:\relax
-	\let\TUDa_restore_typearea:\relax
-}{
+%Has to be loaded here due to headwidth options
+\usepackage[draft=false]{scrlayer-scrpage}
+
+\bool_if:NTF  \g_TUDa_geometry_bool {
 	\RequirePackage[top=\g_TUDa_topMargin_dim, inner=\g_TUDa_innerMargin_dim, outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, bottom=\g_TUDa_bottomMargin_dim, columnsep= \g_TUDa_columnSep_dim, includehead, includefoot,includemp, nomarginpar, headheight=\g_TUDa_headheight_dim
 	]{geometry}
 
@@ -323,20 +337,45 @@
 	\geometry{includemp, marginpar=\g_TUDa_marginpar_dim, marginparsep=\g_TUDa_columnSep_dim}
 	\KOMAoptions{mpinclude}
 	\savegeometry{TUDa@marginpar}
+
 	\bool_if:NTF  \g_TUDa_marginpar_bool {
 		\loadgeometry{TUDa@marginpar}
-		\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@marginpar}
 	}  {
 		\loadgeometry{TUDa@nomarginpar}
-		\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@nomarginpar}
 	}
 
+	\bool_if:NTF \g_TUDa_custommargins_bool {
+		\AtBeginDocument{\savegeometry{TUDa@default}} 
+		\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@default}
+	}{
+		\bool_if:NTF  \g_TUDa_marginpar_bool {
+			\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@marginpar}
+		}  {
+			\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@nomarginpar}
+		}
+	}
 
 	\dim_gset:Nn \g_TUDa_headwidth_dim 			  {\paperwidth-\g_TUDa_innerMargin_dim-\g_TUDa_outerMargin_dim-\Gm@bindingoffset}
 	
 	\cs_set:Nn \TUDa_disable_marginpar: {\loadgeometry{TUDa@nomarginpar}}
 	\cs_set:Nn \TUDa_restore_typearea: {\loadgeometry{\c_TUDa_default_geometry_tl}}
 
+}{
+\bool_if:NTF \g_TUDa_geometry_bool {
+	\RequirePackage[top=\g_TUDa_topMargin_dim, inner=\g_TUDa_innerMargin_dim, outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, bottom=\g_TUDa_bottomMargin_dim, columnsep= \g_TUDa_columnSep_dim, includehead, includefoot,includemp, nomarginpar, headheight=\g_TUDa_headheight_dim
+	]{geometry}
+	
+	
+	\savegeometry{TUDa@nomarginpar}
+	\cs_set:Nn \TUDa_disable_marginpar: {\loadgeometry{TUDa@nomarginpar}}
+}{
+	\KOMAoptions{headinclude, footinclude, headwidth=text,footwidth=text}
+	\let\TUDa_disable_marginpar:\relax
+	\def\TUDa_restore_typearea:{
+		\KOMAoptions{headinclude, footinclude, headwidth=text,footwidth=text}\recalctypearea
+	}
+}
+%maybe enforce marginar?=false in that case 
 }
 
 
@@ -344,15 +383,15 @@
 %%%%%%%%
 %Ende Randeinstellungen klassisch
 
-\usepackage[draft=false]{scrlayer-scrpage}
+
 
 
 \newcommand*{\institution}[1]{
 	\def\TUDa@institution{#1}
 }
 
-\gdef\datename{Datum}
-\gdef\dateseparator{:~}
+\gdef\TUDa@datename{Datum}
+\gdef\TUDa@dateseparator{:~}
 
 
 
@@ -388,12 +427,12 @@
 \newpairofpagestyles[scrheadings]{TUDa.headings}{
 	\KOMAoptions{headsepline, headlines=1.25, footlines=1.25}
 	\setkomafont{pagehead}{}
+	\chead{}
 	\ohead{\headmark}
 }
 
 \newpairofpagestyles{TUDa}{
-	\KOMAoptions{
-		plainfootsepline}
+	\KOMAoptions{plainfootsepline}
 	
 	\bool_if:NTF \g_TUDa_marginpar_bool 
 		{
@@ -420,10 +459,17 @@
 	\fi
 	\ModifyLayer[
 		background,
-		contents={\smash{\TUDa@headline}}
+		mode=picture,
+		contents={
+			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
+				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+			}
+			\smash{\TUDa@headline}
+		}
 	]{TUDa.head.above.line}	
 	\ModifyLayer[
 		background,
+		mode=picture,
 		contents={\smash{\TUDa@headline}}
 	]{plain.TUDa.head.above.line}
 	\bool_if:NT \g_TUDa_headline_bool {
@@ -744,7 +790,7 @@
 	%paper=a5
 	{6} {
 		\cs_set:Nn \TUDa_title_fontsize: {{22pt}{28pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{11pt}{12pt}}
+		\cs_set:Nn \TUDa_titleinfo_fontsize: {{10pt}{11.5pt}}
 		\cs_set:Nn \TUDa_titlethanks_fontsize: {{10pt}{11.5pt}}
 	}
 	%paper=a6
@@ -834,7 +880,6 @@
 contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 ]{title.TUDa.background}
 
-
 \DeclareNewLayer[
 	mode=picture,
 	align=tl,
@@ -842,12 +887,17 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	voffset=\coverpagetopmargin,
 	width=\paperwidth-\coverpageleftmargin-\coverpagerightmargin,
 	contents={
-		\box_if_exist:NF \TUDa@title_headline_box
-		{\TUDa@makeheadrule[color=identbarcolor, width=\layerwidth]{TUDa@title_headline}}
+%		\box_if_exist:NF \TUDa@title_headline_box
+%		{}
+		\dim_compare:nF {\box_wd:N \TUDa@title_headline_box=\layerwidth} {
+			\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@title_headline}
+		}
 		\putUL{\TUDa@title_headline}
 	}
 ]{title.TUDa.rule}
 
+\TUDa@makeheadrule[color=identbarcolor, width=\textwidth]{TUDa@title_headline}
+
 \cs_new:Nn \TUDa_Setup_Title_box: {
 	\hbox_gset:Nn \g_TUDa_title_info_box
 	{
@@ -865,9 +915,9 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 \if_bool:N \g_TUDa@pdfa_bool
 
 	\msg_new:nnn {TUDaPub} {prefer-lualatex} {
-	You use pdfa-mode in #1.
-	This can lead to incompatiblities especially with older compiler versions.
-	You should prefer compiling using lualatex.
+	You~use~pdfa-mode~in~#1.\\
+	This~can~lead~to~incompatiblities~especially~with~older~compiler~versions.\\
+	You~should~prefer~using~lualatex.
 	}
 
 
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
index bf32793b4b4..b1c0971024f 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 1.01 (2019/08/05),
+%% This is file `tudarules.sty' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
@@ -87,7 +87,7 @@
 	mode / TikZ  .code:n = \bool_gset_true:N \g_TUDa_rule_TikZmode_bool,
 }
 
-\NewDocumentCommand{\TUDa@makeheadrule}{om}{
+\NewDocumentCommand{\TUDa@makeheadrule}{som}{
 	\keys_set:nn {TUDa/rules} {
 		%TODO maybe package options for default
 		width=\textwidth,
@@ -96,17 +96,17 @@
 		mode= \g_TUDarules_default_mode_tl,
 		color=  \g_TUDarules_default_color_tl
 	}
-	\IfNoValueF {#1} {\keys_set:nn {TUDa/rules}{#1}}
-	\box_new:c {#2_box}
+	\IfNoValueF {#2} {\keys_set:nn {TUDa/rules}{#2}}
+	\box_if_exist:cF {#3_box} {\box_new:c {#3_box}}
 	\bool_if:NTF \g_TUDa_rule_TikZmode_bool {
-		\hbox_gset:cn {#2_box} {
+		\hbox_gset:cn {#3_box} {
 			\begin{tikzpicture}
 				\fill[\l_TUDa_headrule_color_tl](0,\c_TUDa_rulesep_dim)rectangle++(\l_TUDa_headrule_width_dim,\c_TUDa_largerule_dim);
 				\fill(0,0)rectangle(\l_TUDa_headrule_width_dim,-\c_TUDa_smallrule_dim);
 			\end{tikzpicture}
 		}
 	}{
-		\hbox_gset:cn {#2_box} {
+		\hbox_gset:cn {#3_box} {
 			\parbox[t]{\l_TUDa_headrule_width_dim}{
 				\setlength{\baselineskip}{\z@}		
 				\null\par\nointerlineskip
@@ -116,7 +116,8 @@
 			}
 		}
 	}
-	\cs_new:cpn {#2} {\box_use:c {#2_box}}
+	\IfBooleanTF {#1}
+		\cs_set:cpn \cs_new:cpn {#3} {\box_use:c {#3_box}}
 }
 
 \NewDocumentCommand{\TUDa@makefootrule}{om}{
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
index ff21accfad1..96895ebafbe 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 1.01 (2019/08/05),
+%% This is file `tudasciposter.cls' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
index 887d08d003f..ad6d337fa38 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 1.01 (2019/08/05),
+%% This is file `tudathesis.cfg' version 1.10 (2019/09/09),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.01}
-\def\filedate{2019/08/05}
+\def\fileversion{1.10}
+\def\filedate{2019/09/09}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudathesis.cfg}
 {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)}
@@ -204,7 +204,7 @@
  	 {\msg_info:nnn {tudapub/tudathesis} {dr-field-only} {birthplace}}
 }
 
-\publishers{Darmstadt~ --~ D~17}
+\publishers{Darmstadt\bool_if:NT \g_TUDa_dr_bool {~ --~ D~17}}
 
 \seq_new:N \g_TUDa_reviewer_seq
 \newcommand*{\reviewer}[1]{
@@ -245,14 +245,14 @@
 \newcommand*{\TUDa@thesis@dates}[1][,~]{
 	\bool_set_false:N \l_tmpa_bool
 	\tl_if_empty:NF \@date {
-		\datename\tl_if_empty:NF \datename {\dateseparator}\TUDa@submissiondate
+		\TUDa@datename\tl_if_empty:NF \TUDa@datename {\TUDa@dateseparator}\TUDa@submissiondate
 		\bool_set_true:N  \l_tmpa_bool
 	}
 	\tl_if_empty:NF \TUDa@submissiondate {
-		\bool_if:NTF \l_tmpa_bool {#1} {\bool_set_true:N  \l_tmpa_bool}\TUDa@submissiondatename\dateseparator\TUDa@submissiondate
+		\bool_if:NTF \l_tmpa_bool {#1} {\bool_set_true:N  \l_tmpa_bool}\TUDa@submissiondatename\TUDa@dateseparator\TUDa@submissiondate
 	}
 	\tl_if_empty:NF \TUDa@examdate {
-		\bool_if:NTF \l_tmpa_bool {#1} {\bool_set_true:N  \l_tmpa_bool}\TUDa@examdatename\dateseparator\TUDa@examdate
+		\bool_if:NTF \l_tmpa_bool {#1} {\bool_set_true:N  \l_tmpa_bool}\TUDa@examdatename\TUDa@dateseparator\TUDa@examdate
 	}
 }
 
@@ -521,12 +521,12 @@ Ich versichere hiermit, dass die vorliegende Dissertation selbstständig und nur
 Die Arbeit hat bisher noch nicht zu Prüfungszwecken gedient.
 \bigskip
 }{
-\section*{Erklärung zur Abschlussarbeit\\gemäß \S{}23~Abs.~7~APB der TU~Darmstadt}
-Hiermit versichere ich, , die vorliegende \TUDa@thesisType{} ohne Hilfe Dritter und nur mit den angegebenen Quellen und Hilfsmitteln angefertigt zu haben. Alle Stellen, die  Quellen entnommen wurden, sind als solche kenntlich gemacht worden. Diese Arbeit hat in gleicher oder ähnlicher Form noch keiner Prüfungsbehörde vorgelegen.
+\section*{Erklärung zur Abschlussarbeit\\gemäß \S{}22~Abs.~7 und \S{}23~Abs.~7~APB der TU~Darmstadt}
+Hiermit versichere ich, #1, die vorliegende \TUDa@thesisType{} ohne Hilfe Dritter und nur mit den angegebenen Quellen und Hilfsmitteln angefertigt zu haben. Alle Stellen, die Quellen entnommen wurden, sind als solche kenntlich gemacht worden. Diese Arbeit hat in gleicher oder ähnlicher Form noch keiner Prüfungsbehörde vorgelegen.
 \par
-Mir ist bekannt, dass im Fall eines Plagiats (\S{}38 Abs. 2 APB) ein Täuschungsversuch vorliegt, der dazu führt, dass die Arbeit mit 5,0 bewertet und damit ein Prüfungsversuch verbraucht wird. Abschlussarbeiten dürfen nur einmal wiederholt werden.
+Mir ist bekannt, dass im Fall eines Plagiats (\S{}38~Abs.~2~APB) ein Täuschungsversuch vorliegt, der dazu führt, dass die Arbeit mit 5,0 bewertet und damit ein Prüfungsversuch verbraucht wird. Abschlussarbeiten dürfen nur einmal wiederholt werden.
 \par
-Bei der abgegebenen Thesis stimmen die schriftliche und die zur Archivierung eingereichte elektronische Fassung überein.
+Bei der abgegebenen Thesis stimmen die schriftliche und die zur Archivierung eingereichte elektronische Fassung gemäß \S{}23~Abs.~7~APB überein.
 \par
 Bei einer Thesis des Fachbereichs Architektur entspricht die eingereichte elektronische Fassung dem vorgestellten Modell und den vorgelegten Plänen.
 }