tudscr (18jun20)

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

30 files changed, 840 insertions, 311 deletions

diff --git a/Master/texmf-dist/doc/latex/tudscr/README.md b/Master/texmf-dist/doc/latex/tudscr/README.md
index c0c90ecafaa..d991ccbf716 100644
--- a/Master/texmf-dist/doc/latex/tudscr/README.md
+++ b/Master/texmf-dist/doc/latex/tudscr/README.md
@@ -4,7 +4,7 @@
 
  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 
- tudscr 2020/01/14 v2.06f
+ tudscr 2020/06/18 v2.06g
 
 ----------------------------------------------------------------------------
 
@@ -53,6 +53,9 @@ Das Bundle beinhaltet:
 Versionen
 ---------
 
+**v2.06g** (2020/06/18)
++ Bugfix für Änderung des Satzspiegels im Dokument
+
 **v2.06f** (2020/01/14)
 + Anpassungen für Paket `scrbase v3.28`
 
@@ -251,6 +254,9 @@ The bundle offers:
 Versions
 --------
 
+**v2.06g** (2020/06/18)
++ bug fix when changing type area within document
+
 **v2.06f** (2020/01/14)
 + adaptions for package `scrbase v3.28`
 
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
index c185ea1696c..d35a4aa30f6 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
index 25869aaf2bc..6bf0c53f000 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
index 82ac3b089d1..da1c9046af3 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
index 09fe12442b3..67f888eb076 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
index 364aea0e734..d8dca341902 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
index f9f8d8dc7a1..9821b329c08 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
index 0dc90c5597a..2e9a84f445b 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
@@ -29,7 +29,7 @@
   \endgroup%
 }
 \faculty{\cdurl}
-\date{14.01.2020}
+\date{2020-06-18}
 \author{%
   Falk Hanisch%
   \expandafter\emailaddress\expandafter{\tudscrmail}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
index 0c1c3f1f6ba..0d5e1e0b25e 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{2247}
+% \CheckSum{2307}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -52,7 +52,7 @@
 % \fi%
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-area.dtx}[2019/07/19 v2.06c TUD-Script\space%
+\ProvidesFile{tudscr-area.dtx}[2020/06/18 v2.06g TUD-Script\space%
   (type or page area)%
 ]
 %
@@ -291,6 +291,12 @@
 % \changes{v2.05}{2015/11/29}{neu}^^A
 % \begin{macro}{\tud@cdgeometry@assignlayout}
 % \changes{v2.06}{2018/08/13}{neu}^^A
+% \begin{macro}{\tud@cdgeometry@resetlayout}
+% \changes{v2.06g}{2020/06/18}{neu, Bugfix für Änderung des Papierformates}^^A
+% \begin{macro}{\tud@cdgeometry@papersize@store}
+% \changes{v2.06g}{2020/06/18}{neu}^^A
+% \begin{macro}{\tud@cdgeometry@papersize@last}
+% \changes{v2.06g}{2020/06/18}{neu}^^A
 % \begin{length}{\tud@len@layoutwidth}
 % \changes{v2.05}{2016/04/03}{neu}^^A
 % \begin{length}{\tud@len@layoutheight}
@@ -317,18 +323,6 @@
 \newlength\tud@len@layoutheight
 \newlength\tud@len@layouthoffset
 \newlength\tud@len@layoutvoffset
-%    \end{macrocode}
-% Mit \cs{tud@cdgeometry@assignlayout} wird die Layoutgröße, welche ggf. mit 
-% dem Paket \pkg{geometry} angegeben wurde, entsprechend gesetzt.
-%    \begin{macrocode}
-\newcommand*\tud@cdgeometry@assignlayout{%
-  \ifdim\tud@len@layoutwidth<\p@\relax%
-    \setlength\tud@len@layoutwidth{\paperwidth}%
-  \fi%
-  \ifdim\tud@len@layoutheight<\p@\relax%
-    \setlength\tud@len@layoutheight{\paperheight}%
-  \fi%
-}
 \newcommand*\tud@cdgeometry@set{%
   \tud@cdgeometry@assignlayout%
   \tud@if@v@lower{2.05}{%
@@ -526,12 +520,57 @@
     \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}%
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
+  \tud@cdgeometry@papersize@store%
+}
+%    \end{macrocode}
+% Mit \cs{tud@cdgeometry@assignlayout} wird die Layoutgröße, welche ggf. mit 
+% dem Paket \pkg{geometry} angegeben wurde, entsprechend gesetzt.
+%    \begin{macrocode}
+\newcommand*\tud@cdgeometry@assignlayout{%
+  \ifdim\tud@len@layoutwidth<\p@\relax%
+    \setlength\tud@len@layoutwidth{\paperwidth}%
+  \fi%
+  \ifdim\tud@len@layoutheight<\p@\relax%
+    \setlength\tud@len@layoutheight{\paperheight}%
+  \fi%
+}
+%    \end{macrocode}
+% Das Verarbeiten des Parameters \prm{layout} von \pkg{geometry} ist etwas 
+% komplizierter. Normalerweise werden dessen Einstellungen bei einer einfachen
+% Änderung des Satzspiegels beibehalten. Bei einer Änderung des Papierformates 
+% sind die damit gemachten Einstellungen nur bedingt weiterhin nutzbar. Die
+% Offset-Werte bleiben in diesem Fall erhalten, das Layoutformat allerdings 
+% wird zurückgesetzt. Das aktuelle Papierformat wird nach der Prüfung auf eine 
+% Änderung in \cs{tud@cdgeometry@papersize@last} gesichert.
+%    \begin{macrocode}
+\newcommand*\tud@cdgeometry@papersize@last{}
+\newcommand*\tud@cdgeometry@papersize@store{%
+  \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}%
+}
+\newcommand*\tud@cdgeometry@resetlayout{%
+  \begingroup%
+    \edef\tud@res@a{\the\paperheight:\the\paperwidth}%
+    \def\tud@res@b{%
+      \endgroup%
+      \tud@cdgeometry@papersize@store%
+    }%
+    \ifx\tud@res@a\tud@cdgeometry@papersize@last\else%
+      \appto\tud@res@b{%
+        \setlength\tud@len@layoutwidth{\z@}%
+        \setlength\tud@len@layoutheight{\z@}%
+        \tud@x@geometry@fixmargins%
+      }%
+    \fi%
+  \tud@res@b%
 }
 %    \end{macrocode}
 % \end{length}^^A \tud@len@layoutvoffset
 % \end{length}^^A \tud@len@layouthoffset
 % \end{length}^^A \tud@len@layoutheight
 % \end{length}^^A \tud@len@layoutwidth
+% \end{macro}^^A \tud@cdgeometry@papersize@last
+% \end{macro}^^A \tud@cdgeometry@papersize@store
+% \end{macro}^^A \tud@cdgeometry@resetlayout
 % \end{macro}^^A \tud@cdgeometry@assignlayout
 % \end{macro}^^A \if@tud@cdgeometry@adjust
 % \end{macro}^^A \tud@cdgeometry@set
@@ -630,11 +669,11 @@
 % erfolgte, wird auf das Laden verzichtet (\cs{if@tud@cdgeometry@reset}).
 %    \begin{macrocode}
     \if@atdocument%
-      \if@tud@cdgeometry@reset\else%
+      \if@tud@cdgeometry@reset\else% false
         \ifcase\tud@cdgeometry@num\relax%
           \tud@loadgeometry{current@typearea}%
           \@tud@x@geometry@fixmarginstrue%
-        \or%
+        \or% custom
           \tud@loadgeometry{current@custom}%
           \@tud@x@geometry@fixmarginstrue%
         \fi%
@@ -913,6 +952,7 @@
 % der einzelnen Seitenstile umzusetzen. Dabei werden auch etwaige Optionen von
 % \KOMAScript{} beachtet. Hierfür werden die originalen Befehle \cs{geometry}
 % und \cs{newgeometry} angepasst, weshalb diese vorher gesichert werden.
+% \ToDo{erweiterte Möglichkeiten von \cs{newgeometry} dokumentieren}[v2.07]
 %    \begin{macrocode}
   \newif\if@tud@x@geometry@enabled%
   \@tud@x@geometry@enabledtrue%
@@ -955,7 +995,11 @@
     \if@tud@x@geometry@enabled%
       \if@atdocument%
         \@tud@x@geometry@fixmarginstrue%
-        \tud@cdgeometry@reset{custom}%
+        \ifcase\tud@cdgeometry@num\relax% false
+          \tud@cdgeometry@reset{typearea}%
+        \or% custom
+          \tud@cdgeometry@reset{custom}%
+        \fi%
         \tud@cdgeometry@process%
       \fi%
     \fi%
@@ -987,6 +1031,7 @@
 % \end{macro}^^A \geometry
 % \begin{macro}{\tud@x@geometry@user}
 % \changes{v2.05}{2016/03/06}{neu}^^A
+% \changes{v2.06g}{2020/06/18}{Bugfix für Änderung des Papierformates}^^A
 % \begin{parameter}{paper}
 % \begin{parameter}{papername}
 % \begin{parameter}{paperwidth}
@@ -1023,9 +1068,15 @@
     \let\tud@x@geometry@layout\@empty%
     \let\tud@x@geometry@parameter\@empty%
     \TUD@parameter@set{geometry}{#1}%
+%    \end{macrocode}
+% Bei einer Änderung des Papierformates wird das Layoutformat zurückgesetzt.
+%    \begin{macrocode}
+    \tud@x@geometry@area@set{paper}%
+    \tud@cdgeometry@resetlayout%
     \ifx\tud@x@geometry@layout\@empty\else%
       \begingroup%
         \tud@x@geometry@area@set{layout}%
+        \tud@cdgeometry@assignlayout%
         \edef\tud@res@a{%
           \endgroup%
             \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}%
@@ -1033,17 +1084,36 @@
         }%
       \tud@res@a%
     \fi%
-    \tud@x@geometry@area@set{paper}%
     \ifstr{#2}{newgeometry}{%
       \eappto\Gm@restore@org{%
         \noexpand\paperwidth=\the\paperwidth\relax%
         \noexpand\paperheight=\the\paperheight\relax%
       }%
-      \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto\tud@x@geometry@parameter{\tud@res@a,}%
-      \def\tud@res@a{\tud@cs@use{newgeometry}}%
-      \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
-      \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+%    \end{macrocode}
+% Wird der Befehl verwendet, wenn eigentlich \pkg{typearea} aktiv ist, so 
+% werden lediglich die Einstellungen zu \prm{paper} und \prm{layout} beachtet. 
+% Dies wird über die gepatchte Version von \cs{typearea} realisert. Siehe dazu 
+% \cs{tud@x@typearea@before} und \cs{tud@x@typearea@after} für Details.
+%    \begin{macrocode}
+      \ifcase\tud@cdgeometry@num\relax%
+        \typearea[current]{current}%
+        \ifx\tud@x@geometry@parameter\@empty\else%
+          \ClassWarning{\TUD@Class@Name}{%
+            It isn't possible to use \string\newgeometry with any\MessageBreak%
+            key except `paper' or `layout' when package `typearea'\MessageBreak%
+            is used with`cdgeometry=typearea'%
+          }%
+        \fi%
+%    \end{macrocode}
+% Die Abarbeitung der gegebenen Parameter wird mit \cs{tud@cdgeometry@process}
+% innerhalb von \cs{Gm@changelayout} realisiert. Letzteres Makro wird wiederum 
+% von der originalen Definition von \cs{newgeometry} aufgerufen.
+%    \begin{macrocode}
+      \else%
+        \def\tud@res@a{\tud@cs@use{newgeometry}}%
+        \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
+        \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \fi%
     }{%
       \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}%
     }%
@@ -1052,7 +1122,7 @@
 % Das folgende Konstrukt ist aus der Idee entstanden, die Parameter \val{paper} 
 % sowie \val{layout} des Paketes \pkg{geometry} auf die passenden Optionen von 
 % \KOMAScript{} abbilden zu können und insbesondere Schnittmarken für alle 
-% Seitenstile bereitzustellen. %
+% Seitenstile bereitzustellen.%
 % \ToDo{%
 %   Leider ist aus der dem Versuch, eine halbwegs einheitliche Schnittstelle 
 %   zwischen den Paketen \pkg{typearea} und \pkg{geometry} zu schaffen, ein
@@ -1101,8 +1171,12 @@
       }%
       \@tempa#1,,\@nil%
     }%
-    \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}%
-    \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}%
+    \TUD@parameter@def{layoutwidth}{%
+      \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}%
+    }%
+    \TUD@parameter@def{layoutheight}{%
+      \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}%
+    }%
     \TUD@parameter@def{layoutoffset}{%
       \def\@tempa##1,##2,##3\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -1202,25 +1276,27 @@
     \fi%
   }%
 %    \end{macrocode}
-% Der Befehl \cs{tud@x@geometry@area@set} bewerkstelligt die Abarbeitung der 
-% zuvor gesammelten Schlüssel.
+% Der Befehl \cs{tud@x@geometry@area@set} bewerkstelligt die sequentielle 
+% Abarbeitung der zuvor gesammelten Schlüssel.
 %    \begin{macrocode}
   \newcommand*\tud@x@geometry@area@set[1]{%
     \letcs{\@tempa}{tud@x@geometry@#1}%
     \ifdefvoid{\@tempa}{}{%
       \def\@tempb##1:##2:##3\@nil{%
-        \begingroup%
-          \IfArgIsEmpty{##2}{%
-            \def\@tempb{\KOMAoption{paper}{##1}}%
-          }{%
-            \if@landscape%
-              \def\@tempb{\KOMAoption{paper}{##2:##1}}%
-            \else%
-              \def\@tempb{\KOMAoption{paper}{##1:##2}}%
-            \fi%
-          }%
-          \edef\@tempb{\endgroup\expandonce\@tempb}%
-        \@tempb%
+        \IfArgIsEmpty{##2}{%
+          \KOMAoption{paper}{##1}%
+        }{%
+%    \end{macrocode}
+% \KOMAScript{} stellt sich ziemlich clever an und setzt das Papierformat in 
+% dieser Notation immer korrekt im Quer- oder Hochformat, unabhängig von der 
+% Reihenfolge der angegebenen Längen. Für den Parameter \prm{layout} ist dies 
+% jedoch unerwünscht, weshalb der verantwortliche Befehl deaktiviert wird.
+% \emph{Dies geschieht hier direkt und nicht in einer Gruppe,} weil der Aufruf 
+% von \cs{tud@x@geometry@area@set}|{layout}| lokal erfolgt.
+%    \begin{macrocode}
+          \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}%
+          \KOMAoption{paper}{##1:##2}%
+        }%
       }%
       \def\@tempc##1{\@tempb##1::\@nil}%
       \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}%
@@ -1258,12 +1334,12 @@
     \ifGm@pass%
       \let#1\@empty%
     \else%
-      \tud@cdgeometry@assignlayout%
       \begingroup%
 %    \end{macrocode}
 % Das Setzen des Layouts erfolgt nur, wenn die dazugehörigen Längen \emph{nicht}
 % denen des Papierbogens entsprechen.
 %    \begin{macrocode}
+        \tud@cdgeometry@assignlayout%
         \@tud@res@swafalse%
         \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi%
         \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi%
@@ -2081,6 +2157,7 @@
 % \begin{macro}{\typearea}
 % \begin{macro}{\areaset}
 % \begin{macro}{\storereareas}
+% \changes{v2.06g}{2020/06/18}{Sichern der Längen für \prm{layout}}^^A
 % \begin{macro}{\tud@x@typearea@before}
 % \changes{v2.06}{2018/08/13}{neu}^^A
 % \begin{macro}{\tud@x@typearea@after}
@@ -2094,6 +2171,7 @@
 % der Präambel werden in \cs{tud@x@typearea@init} gesichert.
 %    \begin{macrocode}
 \newcommand*\tud@x@typearea@before{%
+  \tud@cdgeometry@resetlayout%
   \tud@skip@store{paperheight}%
   \tud@skip@store{paperwidth}%
   \begingroup%
@@ -2148,9 +2226,14 @@
   \begingroup
     \tud@x@geometry@fixmargins%
     \tud@cs@use{storeareas}{#1}%
+    \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}%
     \edef\tud@res@a{%
       \endgroup%
       \etex@unexpanded{\def#1}{%
+        \tud@res@b{\tud@len@layoutwidth}%
+        \tud@res@b{\tud@len@layoutheight}%
+        \tud@res@b{\tud@len@layouthoffset}%
+        \tud@res@b{\tud@len@layoutvoffset}%
         \expandonce#1%
         \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}%
       }%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
index 41589561942..018ed3461cb 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{1453}
+% \CheckSum{1454}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-comp.dtx}[2020/01/14 v2.06f TUD-Script\space%
+\ProvidesFile{tudscr-comp.dtx}[2020/06/18 v2.06g TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -383,6 +383,8 @@
 % \changes{v2.06e}{2019/10/23}{neu}^^A
 % \begin{macro}{\tud@v@2.06f}
 % \changes{v2.06f}{2020/01/14}{neu}^^A
+% \begin{macro}{\tud@v@2.06g}
+% \changes{v2.06g}{2020/06/18}{neu}^^A
 % \begin{macro}{\tud@v@last}
 % \changes{v2.02}{2014/08/22}{neu}^^A
 % \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -425,9 +427,11 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 %    \end{macrocode}
 % \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06g
 % \end{macro}^^A \tud@v@2.06f
 % \end{macro}^^A \tud@v@2.06e
 % \end{macro}^^A \tud@v@2.06d
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
index c0fb49b8038..1d68079436a 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{3124}
+% \CheckSum{3183}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -52,7 +52,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 % \fi
 %
-\ProvidesFile{tudscr-fonts.dtx}[2020/01/14 v2.06f TUD-Script\space%
+\ProvidesFile{tudscr-fonts.dtx}[2020/06/18 v2.06g TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -1283,6 +1283,7 @@
 % Danach erfolgt die Definition der Schriften des \CDs. 
 %    \begin{macrocode}
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1323,6 +1324,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1449,6 +1451,122 @@
 % \end{macro}^^A \tud@cdfont@md
 % \end{macro}^^A \tud@cdfont@@set
 % \end{macro}^^A \tud@cdfont@set
+% \begin{macro}{\tud@cdfont@declare@symb}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@cdfont@symb@list}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@DeclareTextSymbol}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% Mit \cs{tud@cdfont@declare@symb} können Glyhen respektive einzelne Zeichen 
+% definiert werden, welche über das Makro \cs{tud@cdfont@symbols@set} nur zum 
+% Einsatz kommen, wenn \opt{cdfont=true} aktiviert wurde. Damit können gezielt 
+% Symbole in verschiedenen Kodierungen aus unterscihedlichen Schriftfamilien 
+% definiert werden.
+%    \begin{macrocode}
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+%    \end{macrocode}
+% Die an \cs{tud@cdfont@declare@symb} übergebenen Bezeichner für Auswahlbefehle
+% erhalten \cs{tud@cdfont@symbol@\dots} als Präfix. Da so der ursprüngliche 
+% Befehlsname verändert wird, würde dieser Befehlsname auch verwendet werden, 
+% wenn dieser in einem fragilen Kontext genutzt wird (siehe \cs{@changed@cmd}).
+% Deshalb wird im Anschluss der neue Befehl selbst robust definiert, damit 
+% eine spätere Expansion nach der Zuweisung mit \cs{tud@cs@letltx} nicht in 
+% \cs{tud@cdfont@symbol@\meta{symbol}} resultiert sondern in jedem Fall 
+% \cs{\meta{symbol}} erhalen bleibt.
+%    \begin{macrocode}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@DeclareTextSymbol
+% \end{macro}^^A \tud@cdfont@symb@list
+% \end{macro}^^A \tud@cdfont@declare@symb
+% \begin{macro}{\tud@cdfont@symbols@set}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@cdfont@symbols@toks}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@cdfont@symbols@set@cmd}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@cdfont@symbols@reset}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% Mit diesen Befehlen wird im zwischen Symbolen für die Schriften des \CDs, 
+% welche mit \cs{tud@cdfont@declare@symb} deklariert wurden, und den normalen 
+% gewechselt werden. 
+%    \begin{macrocode}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+%    \end{macrocode}
+% Die Sicherung der alten Definitionen erfolgt nur einmalig. Die Liste der 
+% Symbole wird durchlaufen und die erfolgten Definitionen werden umgesetzt.
+%    \begin{macrocode}
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+%    \end{macrocode}
+% Wird das Tokenregister abgerufen, soll es anschließend auch wieder geleert 
+% werden.
+%    \begin{macrocode}
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+%    \end{macrocode}
+% Das Vorgehen zur Wiederherstellung im Token \cs{tud@cdfont@symbols@toks}
+% definiert.
+%    \begin{macrocode}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+%    \end{macrocode}
+% Für das Zurücksetzen muss lediglich das Tokenregister aufgerufen werden.
+%    \begin{macrocode}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+%    \end{macrocode}
+% \end{macro}^^A \tud@cdfont@symbols@reset
+% \end{macro}^^A \tud@cdfont@symbols@set@cmd
+% \end{macro}^^A \tud@cdfont@symbols@toks
+% \end{macro}^^A \tud@cdfont@symbols@set
+% \begin{macro}{\tud@cdfont@declare@textsymb}
+% \changes{v2.07}{2020/01/22}{neu}^^A
+% \begin{macro}{\tud@cdmath@symbol@textleftarrow}
+% \begin{macro}{\tud@cdmath@symbol@textrightarrow}
+% \begin{macro}{\tud@cdmath@symbol@textuparrow}
+% \begin{macro}{\tud@cdmath@symbol@textdownarrow}
+% \begin{macro}{\tud@cdmath@symbol@textlangle}
+% \begin{macro}{\tud@cdmath@symbol@textrangle}
+% Die Definition der Textsymbole für die \val{TS1}-Kodierung.
+%    \begin{macrocode}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@cdmath@symbol@textrangle
+% \end{macro}^^A \tud@cdmath@symbol@textlangle
+% \end{macro}^^A \tud@cdmath@symbol@textdownarrow
+% \end{macro}^^A \tud@cdmath@symbol@textuparrow
+% \end{macro}^^A \tud@cdmath@symbol@textrightarrow
+% \end{macro}^^A \tud@cdmath@symbol@textleftarrow
+% \end{macro}^^A \tud@cdfont@declare@textsymb
 % \begin{macro}{\tud@font@skip@set}
 % \changes{v2.04}{2015/02/17}{neu}^^A
 % \begin{macro}{\tud@font@skip@@set}
@@ -1607,17 +1725,10 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+%    \end{macrocode}
+% Nun folgen noch einzeln definierte Symbole.
+%    \begin{macrocode}
+      \tud@cdfont@declare@textsymb%
     \fi%
 %    \end{macrocode}
 % Es werden mehrere Schalter zur expliziten Auswahl für die Schriftschnitte
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
index d137660867c..103eeee1320 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
@@ -609,7 +609,7 @@
 \tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}%
 \tud@localization@german{\confirmationtext}{%
   Hiermit versichere ich, dass ich die vorliegende Arbeit 
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe. 
   Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel 
   und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{} 
@@ -630,7 +630,7 @@
 \tud@localization@german{\blockingname}{Sperrvermerk}%
 \tud@localization@german{\blockingtext}{%
   Diese Arbeit 
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   enth\"alt vertrauliche Informationen\ifx\@company\@empty\else
   , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen, 
   Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~-- 
@@ -832,8 +832,8 @@
 \tud@localization@english{\confirmationname}{Statement of authorship}%
 \tud@localization@english{\confirmationtext}{%
   I hereby certify that I have authored this 
-  \ifx\@@thesis\@empty thesis\else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   independently and without undue assistance from third 
   parties. No other than the resources and references 
   indicated in this thesis have been used. I have marked 
@@ -854,7 +854,7 @@
 \tud@localization@english{\blockingname}{Restriction note}%
 \tud@localization@english{\blockingtext}{%
   This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   contains confidential data\ifx\@company\@empty\else
   , disclosed by \emph{\@company}\fi. Publications, duplications 
   and inspections---even in part---are prohibited without explicit 
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
index f7bef28b006..eacc89deaf5 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
@@ -128,7 +128,7 @@
 %<*!(package|class)>
   \fi
 %</!(package|class)>
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 %    \end{macrocode}
 % \end{macro}^^A \TUDScriptVersionNumber
diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index 32ec1d496bf..d45f6088194 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -73,7 +73,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{fix-tudscrfonts}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package for font fixes
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index 4049d5095c8..b2e5d8cfb46 100644
--- a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
@@ -8,7 +8,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-mathswap.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathswap}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (swap mathematical separators)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
index 7af26425dfa..cd8352a8ae4 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -488,11 +488,11 @@
       \tud@locked@num@set{tud@cdgeometry@num}{1}%
     \fi%
     \if@atdocument%
-      \if@tud@cdgeometry@reset\else%
+      \if@tud@cdgeometry@reset\else% false
         \ifcase\tud@cdgeometry@num\relax%
           \tud@loadgeometry{current@typearea}%
           \@tud@x@geometry@fixmarginstrue%
-        \or%
+        \or% custom
           \tud@loadgeometry{current@custom}%
           \@tud@x@geometry@fixmarginstrue%
         \fi%
@@ -1182,6 +1182,7 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1759,6 +1760,7 @@
     \renewcommand*\seriesdefault{\mddefault}%
     \renewcommand*\shapedefault{\updefault}%
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1795,6 +1797,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1872,6 +1875,46 @@
     \fi%
   }%
 \fi
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
 \newcommand*\tud@font@skip@set{%
   \if@tud@relspacing%
     \tud@skip@store{smallskipamount}%
@@ -1939,17 +1982,7 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+      \tud@cdfont@declare@textsymb%
     \fi%
     \newrobustcmd*\cdfontln{\usefont{\encodingdefault}{\tud@cdfont@fam}{l}{n}}
     \newrobustcmd*\cdfontrn{\usefont{\encodingdefault}{\tud@cdfont@fam}{m}{n}}
@@ -3681,7 +3714,7 @@
 \tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}%
 \tud@localization@german{\confirmationtext}{%
   Hiermit versichere ich, dass ich die vorliegende Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe.
   Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel
   und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{}
@@ -3702,7 +3735,7 @@
 \tud@localization@german{\blockingname}{Sperrvermerk}%
 \tud@localization@german{\blockingtext}{%
   Diese Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   enth\"alt vertrauliche Informationen\ifx\@company\@empty\else
   , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen,
   Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~--
@@ -3788,8 +3821,8 @@
 \tud@localization@english{\confirmationname}{Statement of authorship}%
 \tud@localization@english{\confirmationtext}{%
   I hereby certify that I have authored this
-  \ifx\@@thesis\@empty thesis\else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   independently and without undue assistance from third
   parties. No other than the resources and references
   indicated in this thesis have been used. I have marked
@@ -3810,7 +3843,7 @@
 \tud@localization@english{\blockingname}{Restriction note}%
 \tud@localization@english{\blockingtext}{%
   This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   contains confidential data\ifx\@company\@empty\else
   , disclosed by \emph{\@company}\fi. Publications, duplications
   and inspections---even in part---are prohibited without explicit
@@ -3887,14 +3920,6 @@
 \newlength\tud@len@layoutheight
 \newlength\tud@len@layouthoffset
 \newlength\tud@len@layoutvoffset
-\newcommand*\tud@cdgeometry@assignlayout{%
-  \ifdim\tud@len@layoutwidth<\p@\relax%
-    \setlength\tud@len@layoutwidth{\paperwidth}%
-  \fi%
-  \ifdim\tud@len@layoutheight<\p@\relax%
-    \setlength\tud@len@layoutheight{\paperheight}%
-  \fi%
-}
 \newcommand*\tud@cdgeometry@set{%
   \tud@cdgeometry@assignlayout%
   \tud@if@v@lower{2.05}{%
@@ -4053,6 +4078,35 @@
     \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}%
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
+  \tud@cdgeometry@papersize@store%
+}
+\newcommand*\tud@cdgeometry@assignlayout{%
+  \ifdim\tud@len@layoutwidth<\p@\relax%
+    \setlength\tud@len@layoutwidth{\paperwidth}%
+  \fi%
+  \ifdim\tud@len@layoutheight<\p@\relax%
+    \setlength\tud@len@layoutheight{\paperheight}%
+  \fi%
+}
+\newcommand*\tud@cdgeometry@papersize@last{}
+\newcommand*\tud@cdgeometry@papersize@store{%
+  \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}%
+}
+\newcommand*\tud@cdgeometry@resetlayout{%
+  \begingroup%
+    \edef\tud@res@a{\the\paperheight:\the\paperwidth}%
+    \def\tud@res@b{%
+      \endgroup%
+      \tud@cdgeometry@papersize@store%
+    }%
+    \ifx\tud@res@a\tud@cdgeometry@papersize@last\else%
+      \appto\tud@res@b{%
+        \setlength\tud@len@layoutwidth{\z@}%
+        \setlength\tud@len@layoutheight{\z@}%
+        \tud@x@geometry@fixmargins%
+      }%
+    \fi%
+  \tud@res@b%
 }
 \newcommand*\tud@cdgeometry@process{%
   \tud@cdgeometry@@process%
@@ -4233,7 +4287,11 @@
     \if@tud@x@geometry@enabled%
       \if@atdocument%
         \@tud@x@geometry@fixmarginstrue%
-        \tud@cdgeometry@reset{custom}%
+        \ifcase\tud@cdgeometry@num\relax% false
+          \tud@cdgeometry@reset{typearea}%
+        \or% custom
+          \tud@cdgeometry@reset{custom}%
+        \fi%
         \tud@cdgeometry@process%
       \fi%
     \fi%
@@ -4256,9 +4314,12 @@
     \let\tud@x@geometry@layout\@empty%
     \let\tud@x@geometry@parameter\@empty%
     \TUD@parameter@set{geometry}{#1}%
+    \tud@x@geometry@area@set{paper}%
+    \tud@cdgeometry@resetlayout%
     \ifx\tud@x@geometry@layout\@empty\else%
       \begingroup%
         \tud@x@geometry@area@set{layout}%
+        \tud@cdgeometry@assignlayout%
         \edef\tud@res@a{%
           \endgroup%
             \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}%
@@ -4266,17 +4327,25 @@
         }%
       \tud@res@a%
     \fi%
-    \tud@x@geometry@area@set{paper}%
     \ifstr{#2}{newgeometry}{%
       \eappto\Gm@restore@org{%
         \noexpand\paperwidth=\the\paperwidth\relax%
         \noexpand\paperheight=\the\paperheight\relax%
       }%
-      \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto\tud@x@geometry@parameter{\tud@res@a,}%
-      \def\tud@res@a{\tud@cs@use{newgeometry}}%
-      \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
-      \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \ifcase\tud@cdgeometry@num\relax%
+        \typearea[current]{current}%
+        \ifx\tud@x@geometry@parameter\@empty\else%
+          \ClassWarning{\TUD@Class@Name}{%
+            It isn't possible to use \string\newgeometry with any\MessageBreak%
+            key except `paper' or `layout' when package `typearea'\MessageBreak%
+            is used with`cdgeometry=typearea'%
+          }%
+        \fi%
+      \else%
+        \def\tud@res@a{\tud@cs@use{newgeometry}}%
+        \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
+        \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \fi%
     }{%
       \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}%
     }%
@@ -4321,8 +4390,12 @@
       }%
       \@tempa#1,,\@nil%
     }%
-    \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}%
-    \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}%
+    \TUD@parameter@def{layoutwidth}{%
+      \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}%
+    }%
+    \TUD@parameter@def{layoutheight}{%
+      \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}%
+    }%
     \TUD@parameter@def{layoutoffset}{%
       \def\@tempa##1,##2,##3\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -4417,18 +4490,12 @@
     \letcs{\@tempa}{tud@x@geometry@#1}%
     \ifdefvoid{\@tempa}{}{%
       \def\@tempb##1:##2:##3\@nil{%
-        \begingroup%
-          \IfArgIsEmpty{##2}{%
-            \def\@tempb{\KOMAoption{paper}{##1}}%
-          }{%
-            \if@landscape%
-              \def\@tempb{\KOMAoption{paper}{##2:##1}}%
-            \else%
-              \def\@tempb{\KOMAoption{paper}{##1:##2}}%
-            \fi%
-          }%
-          \edef\@tempb{\endgroup\expandonce\@tempb}%
-        \@tempb%
+        \IfArgIsEmpty{##2}{%
+          \KOMAoption{paper}{##1}%
+        }{%
+          \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}%
+          \KOMAoption{paper}{##1:##2}%
+        }%
       }%
       \def\@tempc##1{\@tempb##1::\@nil}%
       \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}%
@@ -4438,8 +4505,8 @@
     \ifGm@pass%
       \let#1\@empty%
     \else%
-      \tud@cdgeometry@assignlayout%
       \begingroup%
+        \tud@cdgeometry@assignlayout%
         \@tud@res@swafalse%
         \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi%
         \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi%
@@ -4925,6 +4992,7 @@
   }
 }
 \newcommand*\tud@x@typearea@before{%
+  \tud@cdgeometry@resetlayout%
   \tud@skip@store{paperheight}%
   \tud@skip@store{paperwidth}%
   \begingroup%
@@ -4971,9 +5039,14 @@
   \begingroup
     \tud@x@geometry@fixmargins%
     \tud@cs@use{storeareas}{#1}%
+    \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}%
     \edef\tud@res@a{%
       \endgroup%
       \etex@unexpanded{\def#1}{%
+        \tud@res@b{\tud@len@layoutwidth}%
+        \tud@res@b{\tud@len@layoutheight}%
+        \tud@res@b{\tud@len@layouthoffset}%
+        \tud@res@b{\tud@len@layoutvoffset}%
         \expandonce#1%
         \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}%
       }%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index d5c34331b31..1dc8c4b0971 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-base.dtx
 \ProvidesPackage{tudscrbase}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (basics for the bundle)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 57e9282f9a6..1e0c8838f03 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -488,11 +488,11 @@
       \tud@locked@num@set{tud@cdgeometry@num}{1}%
     \fi%
     \if@atdocument%
-      \if@tud@cdgeometry@reset\else%
+      \if@tud@cdgeometry@reset\else% false
         \ifcase\tud@cdgeometry@num\relax%
           \tud@loadgeometry{current@typearea}%
           \@tud@x@geometry@fixmarginstrue%
-        \or%
+        \or% custom
           \tud@loadgeometry{current@custom}%
           \@tud@x@geometry@fixmarginstrue%
         \fi%
@@ -1250,6 +1250,7 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1838,6 +1839,7 @@
     \renewcommand*\seriesdefault{\mddefault}%
     \renewcommand*\shapedefault{\updefault}%
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1874,6 +1876,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1951,6 +1954,46 @@
     \fi%
   }%
 \fi
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
 \newcommand*\tud@font@skip@set{%
   \if@tud@relspacing%
     \tud@skip@store{smallskipamount}%
@@ -2018,17 +2061,7 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+      \tud@cdfont@declare@textsymb%
     \fi%
     \newrobustcmd*\cdfontln{\usefont{\encodingdefault}{\tud@cdfont@fam}{l}{n}}
     \newrobustcmd*\cdfontrn{\usefont{\encodingdefault}{\tud@cdfont@fam}{m}{n}}
@@ -3762,7 +3795,7 @@
 \tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}%
 \tud@localization@german{\confirmationtext}{%
   Hiermit versichere ich, dass ich die vorliegende Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe.
   Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel
   und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{}
@@ -3783,7 +3816,7 @@
 \tud@localization@german{\blockingname}{Sperrvermerk}%
 \tud@localization@german{\blockingtext}{%
   Diese Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   enth\"alt vertrauliche Informationen\ifx\@company\@empty\else
   , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen,
   Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~--
@@ -3870,8 +3903,8 @@
 \tud@localization@english{\confirmationname}{Statement of authorship}%
 \tud@localization@english{\confirmationtext}{%
   I hereby certify that I have authored this
-  \ifx\@@thesis\@empty thesis\else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   independently and without undue assistance from third
   parties. No other than the resources and references
   indicated in this thesis have been used. I have marked
@@ -3892,7 +3925,7 @@
 \tud@localization@english{\blockingname}{Restriction note}%
 \tud@localization@english{\blockingtext}{%
   This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   contains confidential data\ifx\@company\@empty\else
   , disclosed by \emph{\@company}\fi. Publications, duplications
   and inspections---even in part---are prohibited without explicit
@@ -3969,14 +4002,6 @@
 \newlength\tud@len@layoutheight
 \newlength\tud@len@layouthoffset
 \newlength\tud@len@layoutvoffset
-\newcommand*\tud@cdgeometry@assignlayout{%
-  \ifdim\tud@len@layoutwidth<\p@\relax%
-    \setlength\tud@len@layoutwidth{\paperwidth}%
-  \fi%
-  \ifdim\tud@len@layoutheight<\p@\relax%
-    \setlength\tud@len@layoutheight{\paperheight}%
-  \fi%
-}
 \newcommand*\tud@cdgeometry@set{%
   \tud@cdgeometry@assignlayout%
   \tud@if@v@lower{2.05}{%
@@ -4135,6 +4160,35 @@
     \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}%
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
+  \tud@cdgeometry@papersize@store%
+}
+\newcommand*\tud@cdgeometry@assignlayout{%
+  \ifdim\tud@len@layoutwidth<\p@\relax%
+    \setlength\tud@len@layoutwidth{\paperwidth}%
+  \fi%
+  \ifdim\tud@len@layoutheight<\p@\relax%
+    \setlength\tud@len@layoutheight{\paperheight}%
+  \fi%
+}
+\newcommand*\tud@cdgeometry@papersize@last{}
+\newcommand*\tud@cdgeometry@papersize@store{%
+  \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}%
+}
+\newcommand*\tud@cdgeometry@resetlayout{%
+  \begingroup%
+    \edef\tud@res@a{\the\paperheight:\the\paperwidth}%
+    \def\tud@res@b{%
+      \endgroup%
+      \tud@cdgeometry@papersize@store%
+    }%
+    \ifx\tud@res@a\tud@cdgeometry@papersize@last\else%
+      \appto\tud@res@b{%
+        \setlength\tud@len@layoutwidth{\z@}%
+        \setlength\tud@len@layoutheight{\z@}%
+        \tud@x@geometry@fixmargins%
+      }%
+    \fi%
+  \tud@res@b%
 }
 \newcommand*\tud@cdgeometry@process{%
   \tud@cdgeometry@@process%
@@ -4315,7 +4369,11 @@
     \if@tud@x@geometry@enabled%
       \if@atdocument%
         \@tud@x@geometry@fixmarginstrue%
-        \tud@cdgeometry@reset{custom}%
+        \ifcase\tud@cdgeometry@num\relax% false
+          \tud@cdgeometry@reset{typearea}%
+        \or% custom
+          \tud@cdgeometry@reset{custom}%
+        \fi%
         \tud@cdgeometry@process%
       \fi%
     \fi%
@@ -4338,9 +4396,12 @@
     \let\tud@x@geometry@layout\@empty%
     \let\tud@x@geometry@parameter\@empty%
     \TUD@parameter@set{geometry}{#1}%
+    \tud@x@geometry@area@set{paper}%
+    \tud@cdgeometry@resetlayout%
     \ifx\tud@x@geometry@layout\@empty\else%
       \begingroup%
         \tud@x@geometry@area@set{layout}%
+        \tud@cdgeometry@assignlayout%
         \edef\tud@res@a{%
           \endgroup%
             \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}%
@@ -4348,17 +4409,25 @@
         }%
       \tud@res@a%
     \fi%
-    \tud@x@geometry@area@set{paper}%
     \ifstr{#2}{newgeometry}{%
       \eappto\Gm@restore@org{%
         \noexpand\paperwidth=\the\paperwidth\relax%
         \noexpand\paperheight=\the\paperheight\relax%
       }%
-      \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto\tud@x@geometry@parameter{\tud@res@a,}%
-      \def\tud@res@a{\tud@cs@use{newgeometry}}%
-      \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
-      \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \ifcase\tud@cdgeometry@num\relax%
+        \typearea[current]{current}%
+        \ifx\tud@x@geometry@parameter\@empty\else%
+          \ClassWarning{\TUD@Class@Name}{%
+            It isn't possible to use \string\newgeometry with any\MessageBreak%
+            key except `paper' or `layout' when package `typearea'\MessageBreak%
+            is used with`cdgeometry=typearea'%
+          }%
+        \fi%
+      \else%
+        \def\tud@res@a{\tud@cs@use{newgeometry}}%
+        \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
+        \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \fi%
     }{%
       \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}%
     }%
@@ -4403,8 +4472,12 @@
       }%
       \@tempa#1,,\@nil%
     }%
-    \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}%
-    \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}%
+    \TUD@parameter@def{layoutwidth}{%
+      \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}%
+    }%
+    \TUD@parameter@def{layoutheight}{%
+      \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}%
+    }%
     \TUD@parameter@def{layoutoffset}{%
       \def\@tempa##1,##2,##3\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -4499,18 +4572,12 @@
     \letcs{\@tempa}{tud@x@geometry@#1}%
     \ifdefvoid{\@tempa}{}{%
       \def\@tempb##1:##2:##3\@nil{%
-        \begingroup%
-          \IfArgIsEmpty{##2}{%
-            \def\@tempb{\KOMAoption{paper}{##1}}%
-          }{%
-            \if@landscape%
-              \def\@tempb{\KOMAoption{paper}{##2:##1}}%
-            \else%
-              \def\@tempb{\KOMAoption{paper}{##1:##2}}%
-            \fi%
-          }%
-          \edef\@tempb{\endgroup\expandonce\@tempb}%
-        \@tempb%
+        \IfArgIsEmpty{##2}{%
+          \KOMAoption{paper}{##1}%
+        }{%
+          \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}%
+          \KOMAoption{paper}{##1:##2}%
+        }%
       }%
       \def\@tempc##1{\@tempb##1::\@nil}%
       \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}%
@@ -4520,8 +4587,8 @@
     \ifGm@pass%
       \let#1\@empty%
     \else%
-      \tud@cdgeometry@assignlayout%
       \begingroup%
+        \tud@cdgeometry@assignlayout%
         \@tud@res@swafalse%
         \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi%
         \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi%
@@ -5007,6 +5074,7 @@
   }
 }
 \newcommand*\tud@x@typearea@before{%
+  \tud@cdgeometry@resetlayout%
   \tud@skip@store{paperheight}%
   \tud@skip@store{paperwidth}%
   \begingroup%
@@ -5053,9 +5121,14 @@
   \begingroup
     \tud@x@geometry@fixmargins%
     \tud@cs@use{storeareas}{#1}%
+    \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}%
     \edef\tud@res@a{%
       \endgroup%
       \etex@unexpanded{\def#1}{%
+        \tud@res@b{\tud@len@layoutwidth}%
+        \tud@res@b{\tud@len@layoutheight}%
+        \tud@res@b{\tud@len@layouthoffset}%
+        \tud@res@b{\tud@len@layoutvoffset}%
         \expandonce#1%
         \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}%
       }%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index ea92734d633..d1b1b814fde 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-color.dtx
 \ProvidesPackage{tudscrcolor}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (corporate design colors)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
index 08d10163bea..6080af4f415 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
@@ -12,7 +12,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-book}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
index 659fc959f03..d0e95dc8232 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
@@ -12,7 +12,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-poster}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
index ceed0cccd76..3a2bbf41c73 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -77,7 +77,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
index 869dcbb6ba0..bac5c0b533f 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,13 +57,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 869015737f1..993aa77bf86 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -17,7 +17,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -60,7 +60,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -76,7 +76,7 @@
 }{}
 %%% From File: tudscr-fonts.dtx
 \ProvidesPackage{tudscrfonts}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (corporate design fonts)%
 ]
@@ -504,6 +504,7 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -993,6 +994,7 @@
     \renewcommand*\seriesdefault{\mddefault}%
     \renewcommand*\shapedefault{\updefault}%
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1029,6 +1031,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1104,6 +1107,46 @@
     \fi%
   }%
 \fi
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
 \newcommand*\tud@font@skip@set{%
   \if@tud@relspacing%
     \tud@skip@store{smallskipamount}%
@@ -1171,17 +1214,7 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+      \tud@cdfont@declare@textsymb%
     \fi%
     \newrobustcmd*\cdfontln{\usefont{\encodingdefault}{\tud@cdfont@fam}{l}{n}}
     \newrobustcmd*\cdfontrn{\usefont{\encodingdefault}{\tud@cdfont@fam}{m}{n}}
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index 7930f7e7817..96055c0cbf8 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
@@ -16,7 +16,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -59,13 +59,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index e17b8fe4fa4..8edb58e730c 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -488,11 +488,11 @@
       \tud@locked@num@set{tud@cdgeometry@num}{1}%
     \fi%
     \if@atdocument%
-      \if@tud@cdgeometry@reset\else%
+      \if@tud@cdgeometry@reset\else% false
         \ifcase\tud@cdgeometry@num\relax%
           \tud@loadgeometry{current@typearea}%
           \@tud@x@geometry@fixmarginstrue%
-        \or%
+        \or% custom
           \tud@loadgeometry{current@custom}%
           \@tud@x@geometry@fixmarginstrue%
         \fi%
@@ -1088,6 +1088,7 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1665,6 +1666,7 @@
     \renewcommand*\seriesdefault{\mddefault}%
     \renewcommand*\shapedefault{\updefault}%
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1701,6 +1703,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1778,6 +1781,46 @@
     \fi%
   }%
 \fi
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
 \newcommand*\tud@font@skip@set{%
   \if@tud@relspacing%
     \tud@skip@store{smallskipamount}%
@@ -1845,17 +1888,7 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+      \tud@cdfont@declare@textsymb%
     \fi%
     \newrobustcmd*\cdfontln{\usefont{\encodingdefault}{\tud@cdfont@fam}{l}{n}}
     \newrobustcmd*\cdfontrn{\usefont{\encodingdefault}{\tud@cdfont@fam}{m}{n}}
@@ -3562,14 +3595,6 @@
 \newlength\tud@len@layoutheight
 \newlength\tud@len@layouthoffset
 \newlength\tud@len@layoutvoffset
-\newcommand*\tud@cdgeometry@assignlayout{%
-  \ifdim\tud@len@layoutwidth<\p@\relax%
-    \setlength\tud@len@layoutwidth{\paperwidth}%
-  \fi%
-  \ifdim\tud@len@layoutheight<\p@\relax%
-    \setlength\tud@len@layoutheight{\paperheight}%
-  \fi%
-}
 \newcommand*\tud@cdgeometry@set{%
   \tud@cdgeometry@assignlayout%
   \tud@if@v@lower{2.05}{%
@@ -3728,6 +3753,35 @@
     \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}%
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
+  \tud@cdgeometry@papersize@store%
+}
+\newcommand*\tud@cdgeometry@assignlayout{%
+  \ifdim\tud@len@layoutwidth<\p@\relax%
+    \setlength\tud@len@layoutwidth{\paperwidth}%
+  \fi%
+  \ifdim\tud@len@layoutheight<\p@\relax%
+    \setlength\tud@len@layoutheight{\paperheight}%
+  \fi%
+}
+\newcommand*\tud@cdgeometry@papersize@last{}
+\newcommand*\tud@cdgeometry@papersize@store{%
+  \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}%
+}
+\newcommand*\tud@cdgeometry@resetlayout{%
+  \begingroup%
+    \edef\tud@res@a{\the\paperheight:\the\paperwidth}%
+    \def\tud@res@b{%
+      \endgroup%
+      \tud@cdgeometry@papersize@store%
+    }%
+    \ifx\tud@res@a\tud@cdgeometry@papersize@last\else%
+      \appto\tud@res@b{%
+        \setlength\tud@len@layoutwidth{\z@}%
+        \setlength\tud@len@layoutheight{\z@}%
+        \tud@x@geometry@fixmargins%
+      }%
+    \fi%
+  \tud@res@b%
 }
 \newcommand*\tud@cdgeometry@process{%
   \tud@cdgeometry@@process%
@@ -3908,7 +3962,11 @@
     \if@tud@x@geometry@enabled%
       \if@atdocument%
         \@tud@x@geometry@fixmarginstrue%
-        \tud@cdgeometry@reset{custom}%
+        \ifcase\tud@cdgeometry@num\relax% false
+          \tud@cdgeometry@reset{typearea}%
+        \or% custom
+          \tud@cdgeometry@reset{custom}%
+        \fi%
         \tud@cdgeometry@process%
       \fi%
     \fi%
@@ -3931,9 +3989,12 @@
     \let\tud@x@geometry@layout\@empty%
     \let\tud@x@geometry@parameter\@empty%
     \TUD@parameter@set{geometry}{#1}%
+    \tud@x@geometry@area@set{paper}%
+    \tud@cdgeometry@resetlayout%
     \ifx\tud@x@geometry@layout\@empty\else%
       \begingroup%
         \tud@x@geometry@area@set{layout}%
+        \tud@cdgeometry@assignlayout%
         \edef\tud@res@a{%
           \endgroup%
             \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}%
@@ -3941,17 +4002,25 @@
         }%
       \tud@res@a%
     \fi%
-    \tud@x@geometry@area@set{paper}%
     \ifstr{#2}{newgeometry}{%
       \eappto\Gm@restore@org{%
         \noexpand\paperwidth=\the\paperwidth\relax%
         \noexpand\paperheight=\the\paperheight\relax%
       }%
-      \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto\tud@x@geometry@parameter{\tud@res@a,}%
-      \def\tud@res@a{\tud@cs@use{newgeometry}}%
-      \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
-      \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \ifcase\tud@cdgeometry@num\relax%
+        \typearea[current]{current}%
+        \ifx\tud@x@geometry@parameter\@empty\else%
+          \ClassWarning{\TUD@Class@Name}{%
+            It isn't possible to use \string\newgeometry with any\MessageBreak%
+            key except `paper' or `layout' when package `typearea'\MessageBreak%
+            is used with`cdgeometry=typearea'%
+          }%
+        \fi%
+      \else%
+        \def\tud@res@a{\tud@cs@use{newgeometry}}%
+        \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
+        \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \fi%
     }{%
       \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}%
     }%
@@ -3996,8 +4065,12 @@
       }%
       \@tempa#1,,\@nil%
     }%
-    \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}%
-    \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}%
+    \TUD@parameter@def{layoutwidth}{%
+      \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}%
+    }%
+    \TUD@parameter@def{layoutheight}{%
+      \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}%
+    }%
     \TUD@parameter@def{layoutoffset}{%
       \def\@tempa##1,##2,##3\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -4092,18 +4165,12 @@
     \letcs{\@tempa}{tud@x@geometry@#1}%
     \ifdefvoid{\@tempa}{}{%
       \def\@tempb##1:##2:##3\@nil{%
-        \begingroup%
-          \IfArgIsEmpty{##2}{%
-            \def\@tempb{\KOMAoption{paper}{##1}}%
-          }{%
-            \if@landscape%
-              \def\@tempb{\KOMAoption{paper}{##2:##1}}%
-            \else%
-              \def\@tempb{\KOMAoption{paper}{##1:##2}}%
-            \fi%
-          }%
-          \edef\@tempb{\endgroup\expandonce\@tempb}%
-        \@tempb%
+        \IfArgIsEmpty{##2}{%
+          \KOMAoption{paper}{##1}%
+        }{%
+          \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}%
+          \KOMAoption{paper}{##1:##2}%
+        }%
       }%
       \def\@tempc##1{\@tempb##1::\@nil}%
       \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}%
@@ -4113,8 +4180,8 @@
     \ifGm@pass%
       \let#1\@empty%
     \else%
-      \tud@cdgeometry@assignlayout%
       \begingroup%
+        \tud@cdgeometry@assignlayout%
         \@tud@res@swafalse%
         \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi%
         \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi%
@@ -4595,6 +4662,7 @@
   }
 }
 \newcommand*\tud@x@typearea@before{%
+  \tud@cdgeometry@resetlayout%
   \tud@skip@store{paperheight}%
   \tud@skip@store{paperwidth}%
   \begingroup%
@@ -4641,9 +4709,14 @@
   \begingroup
     \tud@x@geometry@fixmargins%
     \tud@cs@use{storeareas}{#1}%
+    \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}%
     \edef\tud@res@a{%
       \endgroup%
       \etex@unexpanded{\def#1}{%
+        \tud@res@b{\tud@len@layoutwidth}%
+        \tud@res@b{\tud@len@layoutheight}%
+        \tud@res@b{\tud@len@layouthoffset}%
+        \tud@res@b{\tud@len@layoutvoffset}%
         \expandonce#1%
         \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}%
       }%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index a5c55473dab..01b0f9cfe93 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -488,11 +488,11 @@
       \tud@locked@num@set{tud@cdgeometry@num}{1}%
     \fi%
     \if@atdocument%
-      \if@tud@cdgeometry@reset\else%
+      \if@tud@cdgeometry@reset\else% false
         \ifcase\tud@cdgeometry@num\relax%
           \tud@loadgeometry{current@typearea}%
           \@tud@x@geometry@fixmarginstrue%
-        \or%
+        \or% custom
           \tud@loadgeometry{current@custom}%
           \@tud@x@geometry@fixmarginstrue%
         \fi%
@@ -1254,6 +1254,7 @@
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
 \csdef{tud@v@2.06f}{4}
+\csdef{tud@v@2.06g}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1842,6 +1843,7 @@
     \renewcommand*\seriesdefault{\mddefault}%
     \renewcommand*\shapedefault{\updefault}%
     \tud@cdfont@set%
+    \tud@cdfont@symbols@set%
     \tud@ttfont@set%
     \if@tud@x@mweights@enabled%
       \edef\bfseries@rm{\tud@cdfont@bf}%
@@ -1878,6 +1880,7 @@
       \tud@cs@restore{sffamily}%
       \tud@cs@restore{ttfamily}%
     \fi%
+    \tud@cdfont@symbols@reset%
   \fi%
   \if@tud@x@mweights@enabled%
     \edef\rmdef@ult{\rmdefault}%
@@ -1955,6 +1958,46 @@
     \fi%
   }%
 \fi
+\newcommand*\tud@cdfont@symb@list{}
+\newcommand*\tud@cdfont@declare@symb[4]{%
+  \listeadd\tud@cdfont@symb@list{#1}%
+  \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}%
+}
+\newcommand*\tud@DeclareTextSymbol[4]{%
+  \begingroup%
+    \edef\tud@res@a{%
+      \endgroup%
+      \noexpand\DeclareTextCommand%
+        {\csname tud@cdfont@symbol@#1\endcsname}{#2}%
+        {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}%
+      \noexpand\DeclareTextCommandDefault%
+        {\csname tud@cdfont@symbol@#1\endcsname}%
+        {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}%
+    }%
+  \tud@res@a%
+  \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname%
+}
+\newtoks\tud@cdfont@symbols@toks
+\newcommand*\tud@cdfont@symbols@set{%
+  \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{%
+    \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list%
+    \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}%
+  }{}%
+}
+\newcommand*\tud@cdfont@symbols@set@cmd[1]{%
+  \tud@cs@store{#1}%
+  \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}%
+  \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}%
+}
+\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks}
+\newcommand*\tud@cdfont@declare@textsymb{%
+  \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}%
+  \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}%
+  \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}%
+  \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}%
+  \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}%
+  \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}%
+}
 \newcommand*\tud@font@skip@set{%
   \if@tud@relspacing%
     \tud@skip@store{smallskipamount}%
@@ -2022,17 +2065,7 @@
             {OMS/iwona/\tud@res@a/n}%
         }%
       }{}%
-      \AtBeginDocument{%
-        \ifcsundef{textrightarrow}{}{%
-          \tud@cs@store{textrightarrow}%
-          \renewrobustcmd*{\textrightarrow}{%
-            \begingroup%
-              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
-              \tud@cs@use{textrightarrow}%
-            \endgroup%
-          }%
-        }%
-      }%
+      \tud@cdfont@declare@textsymb%
     \fi%
     \newrobustcmd*\cdfontln{\usefont{\encodingdefault}{\tud@cdfont@fam}{l}{n}}
     \newrobustcmd*\cdfontrn{\usefont{\encodingdefault}{\tud@cdfont@fam}{m}{n}}
@@ -3764,7 +3797,7 @@
 \tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}%
 \tud@localization@german{\confirmationtext}{%
   Hiermit versichere ich, dass ich die vorliegende Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe.
   Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel
   und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{}
@@ -3785,7 +3818,7 @@
 \tud@localization@german{\blockingname}{Sperrvermerk}%
 \tud@localization@german{\blockingtext}{%
   Diese Arbeit
-  \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
   enth\"alt vertrauliche Informationen\ifx\@company\@empty\else
   , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen,
   Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~--
@@ -3871,8 +3904,8 @@
 \tud@localization@english{\confirmationname}{Statement of authorship}%
 \tud@localization@english{\confirmationtext}{%
   I hereby certify that I have authored this
-  \ifx\@@thesis\@empty thesis\else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   independently and without undue assistance from third
   parties. No other than the resources and references
   indicated in this thesis have been used. I have marked
@@ -3893,7 +3926,7 @@
 \tud@localization@english{\blockingname}{Restriction note}%
 \tud@localization@english{\blockingtext}{%
   This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
-  \ifx\@@title\@empty\else entitled \emph{\@@title} \fi
+  \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
   contains confidential data\ifx\@company\@empty\else
   , disclosed by \emph{\@company}\fi. Publications, duplications
   and inspections---even in part---are prohibited without explicit
@@ -3970,14 +4003,6 @@
 \newlength\tud@len@layoutheight
 \newlength\tud@len@layouthoffset
 \newlength\tud@len@layoutvoffset
-\newcommand*\tud@cdgeometry@assignlayout{%
-  \ifdim\tud@len@layoutwidth<\p@\relax%
-    \setlength\tud@len@layoutwidth{\paperwidth}%
-  \fi%
-  \ifdim\tud@len@layoutheight<\p@\relax%
-    \setlength\tud@len@layoutheight{\paperheight}%
-  \fi%
-}
 \newcommand*\tud@cdgeometry@set{%
   \tud@cdgeometry@assignlayout%
   \tud@if@v@lower{2.05}{%
@@ -4136,6 +4161,35 @@
     \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}%
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
+  \tud@cdgeometry@papersize@store%
+}
+\newcommand*\tud@cdgeometry@assignlayout{%
+  \ifdim\tud@len@layoutwidth<\p@\relax%
+    \setlength\tud@len@layoutwidth{\paperwidth}%
+  \fi%
+  \ifdim\tud@len@layoutheight<\p@\relax%
+    \setlength\tud@len@layoutheight{\paperheight}%
+  \fi%
+}
+\newcommand*\tud@cdgeometry@papersize@last{}
+\newcommand*\tud@cdgeometry@papersize@store{%
+  \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}%
+}
+\newcommand*\tud@cdgeometry@resetlayout{%
+  \begingroup%
+    \edef\tud@res@a{\the\paperheight:\the\paperwidth}%
+    \def\tud@res@b{%
+      \endgroup%
+      \tud@cdgeometry@papersize@store%
+    }%
+    \ifx\tud@res@a\tud@cdgeometry@papersize@last\else%
+      \appto\tud@res@b{%
+        \setlength\tud@len@layoutwidth{\z@}%
+        \setlength\tud@len@layoutheight{\z@}%
+        \tud@x@geometry@fixmargins%
+      }%
+    \fi%
+  \tud@res@b%
 }
 \newcommand*\tud@cdgeometry@process{%
   \tud@cdgeometry@@process%
@@ -4316,7 +4370,11 @@
     \if@tud@x@geometry@enabled%
       \if@atdocument%
         \@tud@x@geometry@fixmarginstrue%
-        \tud@cdgeometry@reset{custom}%
+        \ifcase\tud@cdgeometry@num\relax% false
+          \tud@cdgeometry@reset{typearea}%
+        \or% custom
+          \tud@cdgeometry@reset{custom}%
+        \fi%
         \tud@cdgeometry@process%
       \fi%
     \fi%
@@ -4339,9 +4397,12 @@
     \let\tud@x@geometry@layout\@empty%
     \let\tud@x@geometry@parameter\@empty%
     \TUD@parameter@set{geometry}{#1}%
+    \tud@x@geometry@area@set{paper}%
+    \tud@cdgeometry@resetlayout%
     \ifx\tud@x@geometry@layout\@empty\else%
       \begingroup%
         \tud@x@geometry@area@set{layout}%
+        \tud@cdgeometry@assignlayout%
         \edef\tud@res@a{%
           \endgroup%
             \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}%
@@ -4349,17 +4410,25 @@
         }%
       \tud@res@a%
     \fi%
-    \tud@x@geometry@area@set{paper}%
     \ifstr{#2}{newgeometry}{%
       \eappto\Gm@restore@org{%
         \noexpand\paperwidth=\the\paperwidth\relax%
         \noexpand\paperheight=\the\paperheight\relax%
       }%
-      \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto\tud@x@geometry@parameter{\tud@res@a,}%
-      \def\tud@res@a{\tud@cs@use{newgeometry}}%
-      \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
-      \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \ifcase\tud@cdgeometry@num\relax%
+        \typearea[current]{current}%
+        \ifx\tud@x@geometry@parameter\@empty\else%
+          \ClassWarning{\TUD@Class@Name}{%
+            It isn't possible to use \string\newgeometry with any\MessageBreak%
+            key except `paper' or `layout' when package `typearea'\MessageBreak%
+            is used with`cdgeometry=typearea'%
+          }%
+        \fi%
+      \else%
+        \def\tud@res@a{\tud@cs@use{newgeometry}}%
+        \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}%
+        \edef\tud@x@geometry@init{\tud@x@geometry@parameter}%
+      \fi%
     }{%
       \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}%
     }%
@@ -4404,8 +4473,12 @@
       }%
       \@tempa#1,,\@nil%
     }%
-    \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}%
-    \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}%
+    \TUD@parameter@def{layoutwidth}{%
+      \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}%
+    }%
+    \TUD@parameter@def{layoutheight}{%
+      \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}%
+    }%
     \TUD@parameter@def{layoutoffset}{%
       \def\@tempa##1,##2,##3\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -4500,18 +4573,12 @@
     \letcs{\@tempa}{tud@x@geometry@#1}%
     \ifdefvoid{\@tempa}{}{%
       \def\@tempb##1:##2:##3\@nil{%
-        \begingroup%
-          \IfArgIsEmpty{##2}{%
-            \def\@tempb{\KOMAoption{paper}{##1}}%
-          }{%
-            \if@landscape%
-              \def\@tempb{\KOMAoption{paper}{##2:##1}}%
-            \else%
-              \def\@tempb{\KOMAoption{paper}{##1:##2}}%
-            \fi%
-          }%
-          \edef\@tempb{\endgroup\expandonce\@tempb}%
-        \@tempb%
+        \IfArgIsEmpty{##2}{%
+          \KOMAoption{paper}{##1}%
+        }{%
+          \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}%
+          \KOMAoption{paper}{##1:##2}%
+        }%
       }%
       \def\@tempc##1{\@tempb##1::\@nil}%
       \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}%
@@ -4521,8 +4588,8 @@
     \ifGm@pass%
       \let#1\@empty%
     \else%
-      \tud@cdgeometry@assignlayout%
       \begingroup%
+        \tud@cdgeometry@assignlayout%
         \@tud@res@swafalse%
         \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi%
         \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi%
@@ -5008,6 +5075,7 @@
   }
 }
 \newcommand*\tud@x@typearea@before{%
+  \tud@cdgeometry@resetlayout%
   \tud@skip@store{paperheight}%
   \tud@skip@store{paperwidth}%
   \begingroup%
@@ -5054,9 +5122,14 @@
   \begingroup
     \tud@x@geometry@fixmargins%
     \tud@cs@use{storeareas}{#1}%
+    \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}%
     \edef\tud@res@a{%
       \endgroup%
       \etex@unexpanded{\def#1}{%
+        \tud@res@b{\tud@len@layoutwidth}%
+        \tud@res@b{\tud@len@layoutheight}%
+        \tud@res@b{\tud@len@layouthoffset}%
+        \tud@res@b{\tud@len@layoutvoffset}%
         \expandonce#1%
         \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}%
       }%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index 652fbbc7bea..972bb431130 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
@@ -11,7 +11,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -54,7 +54,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -79,7 +79,7 @@
 }{}
 %%% From File: tudscr-supervisor.dtx
 \ProvidesPackage{tudscrsupervisor}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (commands for supervisors)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
index abbc74eb6cd..ee42b956829 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
+  \TUD@Version@Check{2020/06/18 v2.06g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -82,7 +82,7 @@
 }{}
 %%% From File: tudscr-manual.dtx
 \ProvidesPackage{tudscrtutorial}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (internal tutorials)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
index d803229fe99..6f4a1589408 100644
--- a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
@@ -8,7 +8,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/01/14 v2.06f TUD-Script
+%%   2020/06/18 v2.06g TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-twocolfix.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{twocolfix}[%
-  2020/01/14 v2.06f TUD-Script
+  2020/06/18 v2.06g TUD-Script
   package
   (twocolumn layout bugfix)%
 ]