summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tuda-ci/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-12-18 03:01:19 +0000
committerNorbert Preining <norbert@preining.info>2019-12-18 03:01:19 +0000
commit6d3d0706f9b7085f8bc6efa81398dbfe551272db (patch)
tree46f604191e8b84eb8f939a14f2bfc5fd795dddd9 /macros/latex/contrib/tuda-ci/tex
parent6cbf49c3ed1a2881b7fccbc67eccb5532d196b74 (diff)
CTAN sync 201912180301
Diffstat (limited to 'macros/latex/contrib/tuda-ci/tex')
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudabeamer.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.def6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaexercise.cls128
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudafonts.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaletter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaposter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudapub.cls32
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudarules.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasciposter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudathesis.cfg29
25 files changed, 162 insertions, 159 deletions
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index a29d8748f4..55054148d6 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 2.03a (2019/11/29),
+%% This is file `beamercolorthemeTUDa.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamercolorthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
index 6a1874321a..33d4350606 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 2.03a (2019/11/29),
+%% This is file `beamerfontthemeTUDa.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerfontthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index f32a28aa68..069b46f5f3 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 2.03a (2019/11/29),
+%% This is file `beamerinnerthemeTUDa.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/10/15),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index c408dca5ba..77e071887d 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 2.03a (2019/11/29),
+%% This is file `beamerouterthemeTUDa.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerouterthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
index 68c179c8c9..8ca8592d79 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 2.03a (2019/11/29),
+%% This is file `beamerthemeTUDa.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthemeTUDa}
[\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
index a87a6376c8..4a66760752 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a0paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{125pt}{165pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
index 74788591b6..c5359a30c5 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a1paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{86pt}{120pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
index 0d7210d0e3..687b3fc81e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a2paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{65pt}{82pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
index 20e2ba4198..3afd4fd66d 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a3paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a3paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{47pt}{61pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
index 877a320766..b3e482826e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a4paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a4paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{36pt}{47pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
index 6bedf0a550..58acd4f5f7 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 2.03a (2019/11/29),
+%% This is file `tuda-a5paper.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a5paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{22pt}{28pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
index b6ffdfa90e..e8aae6a334 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 2.03a (2019/11/29),
+%% This is file `tuda-pgfplots.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
% Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
% The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
\ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
index 84bd6218b3..7a0c06a276 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 2.03a (2019/11/29),
+%% This is file `tudabeamer.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{tudabeamer}
[\filedate\space\fileversion\space]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index 728f9a6f1e..5870e18e96 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 2.03a (2019/11/29),
+%% This is file `tudacolors.def' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\ProvidesFile{tudacolors.def}
[\filedate\space\fileversion\space Color definitions for tuda-ci]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
index 560e9fb0b7..85f5950dfa 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 2.03a (2019/11/29),
+%% This is file `tudacolors.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index 953a1309fb..c6f3f5d977 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 2.03a (2019/11/29),
+%% This is file `tudaexercise.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,11 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
-%%
-\def\fileversion{1.01}
-\def\filedate{2019/09/09}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaexercise}
@@ -57,10 +54,32 @@
\bool_new:N \g_TUDa_geometry_bool
\bool_new:N \g_TUDa_custommargins_bool
+\bool_new:N \l_TUDa_ex_solution_bool
+
+\RequirePackage{environ}
+
+\def\solution{\TUDa_ex_solutionheader:}
+\def\endsolution{}
+
+\cs_new:Nn \TUDa_setup_solution: {
+ \bool_if:NTF \l_TUDa_ex_solution_bool {
+ \def\solution{\TUDa_ex_solutionheader:}
+ \def\endsolution{}
+ }{
+ \RenewEnviron{solution}{
+ \if_false:
+ \BODY
+ \fi:
+ }
+ }
+}
\keys_define:nn {TUDa/exercise} {
- solution .bool_set:N = \l_TUDa_ex_solution_bool,
+ solution .code:n = {
+ \bool_set_eq:Nc \l_TUDa_ex_solution_bool {c_#1_bool}
+ \TUDa_setup_solution:
+ },
solution .initial:n = false,
solution .default:n = true,
compat .bool_gset:N = \g_TUDa_ex_compatibility_bool,
@@ -149,6 +168,7 @@
colorback .initial:n = true,
}
+\RequirePackage{tudarules}
\ProcessKeysOptions{TUDa/pub}
\prop_map_inline:Nn \g_TUDa_clsopts_prop {
@@ -166,13 +186,19 @@
\LoadClass{scrartcl}
+%Has to be loaded here due to headwidth options
+\RequirePackage[draft=false]{scrlayer-scrpage}
+\KOMAoptions {twoside = false}
+
\prop_map_inline:Nn \g_TUDa_unknown_clsopts_prop {
\cs_if_exist:cT {KV@KOMA.scrartcl.cls@#1} {
\tl_if_empty:nTF {#2}
- {\KOMAoptions{#1} }
- {\clist_map_inline:nn {#2} {\KOMAoptions{#1=##1}}}
+ {\KOMAoptions{#1}}
+ {\KOMAoption{#1}{#2}
}
}
+}
+
\renewcommand*\sectionlinesformat[4]{%
\parbox{\linewidth}{
\rule[5\g_TUDa_titlerule_dim]{\linewidth}{\g_TUDa_titlerule_dim}\par\nointerlineskip
@@ -188,9 +214,6 @@
}}
-
-
-\usepackage{tudarules}
\usepackage{tudafonts}
\dim_new:N \g_TUDa_innerMargin_dim
@@ -248,13 +271,9 @@
\dim_new:N \g_TUDa_headheight_dim
\dim_new:N \g_TUDa_headwidth_dim
-
-\dim_gset:Nn \g_TUDa_headheight_dim {1.25\baselineskip +\c_TUDa_largerule_dim +\c_TUDa_rulesep_dim +\c_TUDa_smallrule_dim}
-
+\dim_gset:Nn \g_TUDa_headheight_dim {\c_TUDa_largerule_dim +\c_TUDa_rulesep_dim +\c_TUDa_smallrule_dim}
%%%%%Anfang Randeinstellungen Geometry
-%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, headheight=\g_TUDa_headheight_dim
@@ -263,13 +282,9 @@
\KOMAoptions{headinclude, footinclude, headwidth=text,footwidth=text}
}
-
%%%%%%%%
%Ende Randeinstellungen klassisch
-
-
-
\newcommand*{\institution}[1]{
\def\TUDa@institution{#1}
}
@@ -299,9 +314,6 @@
\addtokomafont{captionlabel}{\accentfont}
\addtokomafont{caption}{\accentfont}
-\KOMAoptions{footsepline=.5\c_TUDa_smallrule_dim}
-\KOMAoptions{headsepline=.5\c_TUDa_smallrule_dim}
-
\box_new:N \g_TUDa_ex_headline_odd_box
\box_new:N \g_TUDa_ex_headline_even_box
\box_new:N \g_TUDa_ex_headline_oneside_box
@@ -358,8 +370,8 @@
\if@twoside
\dim_set:Nn \l_tmpa_dim {
\dim_max:nn
- {\box_ht:N \g_TUDa_ex_headline_odd_box}
- {\box_ht:N \g_TUDa_ex_headline_even_box}
+ {\box_ht:N \g_TUDa_ex_headline_odd_box+\box_dp:N \g_TUDa_ex_headline_odd_box}
+ {\box_ht:N \g_TUDa_ex_headline_even_box+\box_dp:N \g_TUDa_ex_headline_even_box}
}
\else
\dim_set:Nn \l_tmpa_dim {
@@ -367,11 +379,17 @@
+ \box_dp:N \g_TUDa_ex_headline_oneside_box
}
\fi
- \dim_add:Nn \l_tmpa_dim {\box_dp:N \TUDa@headline_box}
- \KOMAoptions{headinclude, headheight=\l_tmpa_dim}
- \global\setlength{\headheight}{\l_tmpa_dim}
- \clist_map_inline:nn {odd, even, oneside} {
- \ModifyLayer[contents={\raisebox{\c_TUDa_rulesep_dim}[0pt][0pt]{\box_use:c {g_TUDa_ex_headline_##1_box}}}]{TUDa.ex.head.##1}
+ \dim_compare:nT {\l_tmpa_dim > \z@}
+ {
+ \dim_add:Nn \l_tmpa_dim {\box_dp:N \TUDa@headline_box +\c_TUDa_rulesep_dim}
+ \KOMAoptions{headinclude, headheight=\l_tmpa_dim,headsepline = .5\c_TUDa_smallrule_dim}
+ \if@twoside
+ \cehead{\box_use:c {g_TUDa_ex_headline_even_box}}
+ \cohead{\box_use:c {g_TUDa_ex_headline_odd_box}}
+ \else
+ \chead{\box_use:c {g_TUDa_ex_headline_oneside_box}}
+ \fi
+ \global\setlength{\headheight}{\l_tmpa_dim}
}
}
@@ -385,29 +403,20 @@
\box_if_exist:NF \TUDa@headline_box {
\TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline}
}
+\ModifyLayer[
+ background,
+ height=\box_dp:N \TUDa@headline_box,
+ align=tl,
+ voffset=\g_TUDa_topMargin_dim,
+ contents=\raisebox{\depth}{\box_use:N \TUDa@headline_box},
+ ]{plain.TUDa.ex.head.above.line}
\ModifyLayer[
- background,
- mode=picture,
- contents={%\layercontentsmeasure
- \dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
- \TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
- }
- \box_use:N \TUDa@headline_box
- },
- addvoffset=-\box_dp:N \TUDa@headline_box
+ background,
+ height=\box_dp:N \TUDa@headline_box,
+ align=tl,
+ voffset=\g_TUDa_topMargin_dim,
+ contents=\raisebox{\depth}{\box_use:N \TUDa@headline_box},
]{TUDa.ex.head.above.line}
- \ModifyLayer[
- background,
-% mode=picture,
- contents={%\layercontentsmeasure
- \dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
- \TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
- }
- \box_use:N \TUDa@headline_box
- },
- ]{plain.TUDa.ex.head.above.line}
- \lehead{headmark}%TODO
- \lohead{headmark}%TODO
\ofoot[\pagemark]{\pagemark}
}
@@ -478,9 +487,10 @@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\vspace*{-\dim_eval:n {
\headheight
+ -\c_TUDa_largerule_dim -\c_TUDa_rulesep_dim
+\headsep
- +\topskip
- -\dp\strutbox
+ +\ht\strutbox
+ +\p@
}}
\par
\nointerlineskip
@@ -662,7 +672,7 @@ tocnumwidth=\cs_if_exist_use:NF \scr@tso@subsubsection@numwidth {2.3em},%
\cs_undefine:N \subtask
\NewDocumentEnvironment{subtask}{o}{
- \@subtask{#1}
+ \@subtask{\IfNoValueF{#1}{#1}}
}{}
%Solution mechanism
@@ -679,14 +689,6 @@ tocnumwidth=\cs_if_exist_use:NF \scr@tso@subsubsection@numwidth {2.3em},%
]{@solution}
-\def\solution{
-\bool_if:NTF \l_TUDa_ex_solution_bool \TUDa_ex_solutionheader: \iffalse
-}
-
-\def\endsolution{
- \bool_if:NF \l_TUDa_ex_solution_bool \fi
-}
-
\setkomafont{@solution}{\normalfont}
\cs_new:Nn \TUDa_ex_solutionheader: {
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 06c8548fdb..fce88b4bb7 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 2.03a (2019/11/29),
+%% This is file `tudafonts.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudafonts}
[\filedate\space\fileversion\space
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index 03e7fbfba0..133a7fcac3 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 2.03a (2019/11/29),
+%% This is file `tudaletter.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaletter}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index ad12cbdfbd..efc3c95668 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 2.03a (2019/11/29),
+%% This is file `tudalettersize10pt.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
%% This is file `tudalettersize10pt.clo' version 1.0 (2018/12/12),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
index 5c950fe40c..767e63c67e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 2.03a (2019/11/29),
+%% This is file `tudaposter.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index 4edef74333..9e1e2edda7 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 2.03a (2019/11/29),
+%% This is file `tudapub.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudapub}
@@ -189,8 +189,8 @@
\prop_map_inline:Nn \g_TUDa_unknown_clsopts_prop {
\cs_if_exist:cT {KV@KOMA.\g_TUDa_pub_class_tl.cls@#1} {
\tl_if_empty:nTF {#2}
- {\KOMAoptions{#1} }
- {\clist_map_inline:nn {#2} {\KOMAoptions{#1=##1}}}
+ {\KOMAoptions{#1}}
+ {\KOMAoption{#1}{#2}}
}
}
@@ -373,21 +373,14 @@
\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
+ \KOMAoptions{headinclude, footinclude}
+ \bool_if:NTF \g_TUDa_marginpar_bool {\KOMAoptions{headwidth=textwithmarginpar,footwidth=textwithmarginpar}}
+ {\KOMAoptions{headwidth=text,footwidth=text}}
+ \recalctypearea
}
-}
-%maybe enforce marginar?=false in that case
+ \TUDa_restore_typearea:
}
@@ -564,7 +557,10 @@
}
\renewcommand*{\@author}{
- \seq_use:Nnnn \g_TUDa_author_seq {~\authorandname{}~} {,~} {~\&~}
+ \begingroup
+ \hyphenpenalty=100000
+ \seq_use:Nnnn \g_TUDa_author_seq {~\authorandname{}~} {,~} {~\&~}
+ \endgroup
}
\msg_new:nnn {TUDaPub} {infobox-too-high} {
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index 440f4a7b1c..bbedefcde6 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 2.03a (2019/11/29),
+%% This is file `tudarules.sty' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
index 43f03fbcf8..5716718067 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 2.03a (2019/11/29),
+%% This is file `tudasciposter.cls' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index 488799be6c..16a95bef03 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 2.03a (2019/11/29),
+%% This is file `tudasize9pt.clo' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
%% This is file `tudasize9pt.clo' version 1.0 (2018/12/12),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
index 5ae8aa6b84..28292c0ecf 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 2.03a (2019/11/29),
+%% This is file `tudathesis.cfg' version 2.04 (2019/12/17),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.03a}
-\def\filedate{2019/11/29}
+\def\fileversion{2.04}
+\def\filedate{2019/12/17}
\RequirePackage{expl3}
\ProvidesExplFile{tudathesis.cfg}
{\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)}
@@ -103,11 +103,17 @@
}
}
+\cs_new:Nn \TUDa_insert_studentID:n {
+ (\TUDa@studentIDname :\nobreakspace#1)
+}
+
\TUDa_declare_caption:Nnn \TUDa@byname {von} {by}
+\TUDa_declare_caption:Nnn \TUDa@fromname {aus} {from}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in~the~\departmentname{}~ of}
\TUDa_declare_caption:Nnn \TUDa@reviewname {Gutachten}{review}
\TUDa_declare_caption:Nnnn \TUDa@examdatename {Tag~ der~ Prüfung}{Date~ of~ thesis~ defense}{Date~ of~ thesis~ defence}
\TUDa_declare_caption:Nnn \TUDa@submissiondatename {Tag~ der~ Einreichung}{Date~ of~ submission}
+\TUDa_declare_caption:Nnn \TUDa@studentIDname {Matrikelnummer} {Student\nobreakspace ID}
%Fallback content for box if not overwritten
\newcommand*\TUDa@box_department {\cs_if_exist_use:NF \departmentfullname {\TUDa@department}}
@@ -188,9 +194,14 @@
{\def\TUDa@signature{#1}}
}
+\newcommand*{\studentID}[1]{
+ \gdef\TUDa@studentID{#1}
+}
+
\gdef\TUDa@institution{}
\gdef\TUDa@institute{}
\gdef\TUDa@department{}
+\gdef\TUDa@studentID{}
\NewDocumentCommand{\department}{som}{%
\IfBooleanTF{#1}{
@@ -302,18 +313,12 @@
}
\gdef\@subject{
- \bool_if:NTF \g_TUDa_dr_bool {
- \TUDa@thesisStatus{}~
- \tl_mixed_case:n{\TUDa@thesisType}~
- \tl_if_empty:NF \TUDa@in_department {\TUDa@in_department{}~}
- \seq_if_empty:NF \g_TUDa_author_seq {\TUDa@byname{}~\@author}
- \tl_if_empty:NF \TUDa@birthplace {~aus~\TUDa@birthplace}
- } {
\cs_if_exist:NT \TUDa@thesisStatus {\TUDa@thesisStatus{}~ }
\tl_mixed_case:n{\TUDa@thesisType}~
\tl_if_empty:NF \TUDa@in_department {\TUDa@in_department{}~}
- \tl_if_empty:NF \@author {\TUDa@byname\nobreakspace\mbox{\@author}}
- }
+ \seq_if_empty:NF \g_TUDa_author_seq {\TUDa@byname\nobreakspace\@author}
+ \tl_if_empty:NF \TUDa@birthplace {\space\TUDa@fromname\space\TUDa@birthplace}
+ \tl_if_empty:NF \TUDa@studentID {\space\TUDa_insert_studentID:n {\TUDa@studentID}}
}
\uppertitleback{