tudscr (21aug19)

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

42 files changed, 914 insertions, 768 deletions

diff --git a/Master/texmf-dist/doc/latex/tudscr/LICENSE.md b/Master/texmf-dist/doc/latex/tudscr/LICENSE.md
index d4e9141f02e..52ebe386926 100644
--- a/Master/texmf-dist/doc/latex/tudscr/LICENSE.md
+++ b/Master/texmf-dist/doc/latex/tudscr/LICENSE.md
@@ -1,5 +1,5 @@
 
- TUD-Script -- Corporate Design of Technische Universität Dresden
+ TUD-Script – Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
diff --git a/Master/texmf-dist/doc/latex/tudscr/README.md b/Master/texmf-dist/doc/latex/tudscr/README.md
index 7897ee223eb..03315902772 100644
--- a/Master/texmf-dist/doc/latex/tudscr/README.md
+++ b/Master/texmf-dist/doc/latex/tudscr/README.md
@@ -1,10 +1,10 @@
 
- TUD-Script -- Corporate Design of Technische Universität Dresden
+ TUD-Script &ndash; Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 
- tudscr 2019/07/17 v2.06b
+ tudscr 2019/08/20 v2.06c
 
 ----------------------------------------------------------------------------
 
@@ -21,12 +21,10 @@ Das TUD-Script-Bundle stellt sowohl Klassen als auch Pakete bereit, um
 LaTeX-Dokumente im Corporate Design der Technischen Universität Dresden zu
 erstellen. Es basiert auf dem KOMA-Script-Bundle, welches zwingend vorhanden
 sein muss. Bei Fragen, Problemen und Anmerkungen sei entweder auf das 
-LaTeX-Forum der Technischen Universität Dresden oder das GitHub-Repository 
-*tudscr* verwiesen:
-
-https://latex.wcms-file3.tu-dresden.de/phpBB3/
-
-https://github.com/tud-cd/tudscr/issues
+[LaTeX-Forum der Technischen Universität Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+oder das 
+[GitHub-Repository *tudscr*](https://github.com/tud-cd/tudscr/issues)
+verwiesen:
 
 
 Klassen und Pakete
@@ -55,6 +53,12 @@ Das Bundle beinhaltet:
 Versionen
 ---------
 
+**v2.06c** (2019/08/20)
++ Bugfix für Paket **fix-tudscrfonts**
++ Bugfix für `\textrightarrow`
++ vertikales Layout der Ausgaben von Paket **tudscrsupervisor** verbessert
++ Verwendung von Paket **mathastext** angepasst
+
 **v2.06b** (2019/07/17)
 + Bugfix für nicht ordnungsgemäßes NFSS (New Font Selection Scheme)
 
@@ -205,12 +209,10 @@ Summary
 The TUD-Script bundle provides both classes and packages in order to create 
 LaTeX documents in the corporate design of the Technische Universität Dresden.
 It bases on the KOMA-Script bundle, which must necessarily be present.
-For questions, problems and comments, please refer to eihter the LaTeX forum 
-of the Dresden University of Technology or the GitHub repository *tudscr*:
-
-https://latex.wcms-file3.tu-dresden.de/phpBB3/
-
-https://github.com/tud-cd/tudscr/issues
+For questions, problems and comments, please refer to eihter the 
+[LaTeX forum of the Technische Universität Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+or the
+[GitHub repository *tudscr*](https://github.com/tud-cd/tudscr/issues):
 
 
 Classes and Packages
@@ -239,6 +241,12 @@ The bundle offers:
 Versions
 --------
 
+**v2.06c** (2019/08/20)
++ bug fix for package **fix-tudscrfonts**
++ bug fix for `\textrightarrow`
++ improved vertical layout of output generated by package **tudscrsupervisor**
++ revised usage of package **mathastext**
+
 **v2.06b** (2019/07/17)
 + bug fix for improper NFSS (New Font Selection Scheme)
 
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
index b4f79e1b9bd..fdd38097ce5 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 adb014ac6b7..e4da05027ab 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 a85bac9fd9a..2d884713ae2 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 a3116e4a459..ab3e71211d1 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 3a37a3e23ee..0fccae3c721 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 dd480f11eef..1f996128dc4 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 5be12081eb3..37fd56408b9 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{17.07.2019}
+\date{20.08.2019}
 \author{%
   Falk Hanisch%
   \expandafter\emailaddress\expandafter{\tudscrmail}%
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
index 231af982b49..9f9625ab7ba 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
@@ -21,7 +21,7 @@
 \begin{document}
 \date{07.11.2016}
 \author{Falk Hanisch\thanks{\noexpand\scriptsize\noexpand\mailto{\tudscrmail}}}
-\title{Ein Beitrag zum mathematischen Satz in \hologo{LaTeXe}}
+\title{Ein Beitrag zum mathematischen Satz in \hologo{LaTeX}}
 \makeatletter
 \begingroup%
   \def\and{, }%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
index b5bbf426ee7..818f3e00972 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
@@ -52,7 +52,7 @@
 % \fi%
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-area.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-area.dtx}[2019/07/19 v2.06c TUD-Script\space%
   (type or page area)%
 ]
 %
@@ -1040,7 +1040,7 @@
         \noexpand\paperheight=\the\paperheight\relax%
       }%
       \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto{\tud@x@geometry@parameter}{\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}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
index 8a1b2cbbd32..1ebe0d6f1c1 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-base.dtx}[2019/07/17 v2.06b TUD-Script\space%
+\ProvidesFile{tudscr-base.dtx}[2019/08/20 v2.06c TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -112,7 +112,8 @@
 % }[v2.??]
 % \ToDo{%
 %   Teile im Quelltext suchen, die nur einmalig durchlaufen werden müssen 
-%   (bswp. notwendige Pakete und Schriften) und über aux-Eintrag abkürzen?!
+%   (bspw. notwendige Pakete und Schriften) und über aux-Eintrag abkürzen?!
+%   siehe \cs{TUD@CheckPackage}%
 % }[v2.??]
 %^^A\BeforeClosingMainAux{%
 %^^A  \if@tud@xxx\if@filesw%
@@ -148,11 +149,12 @@
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{xpatch}[2012/10/02]
 \RequirePackage{letltxmacro}[2016/05/16]
+\RequirePackage{etexcmds}[2011/02/16]
 %    \end{macrocode}
 % Das Paket \pkg{kvsetkeys} erweitert \pkg{keyval} um die Möglichkeit, das
 % Verhalten bei der Angabe eines nicht definierten Schlüssels festzulegen.
+% \ToDo{sollte eigentlich auch mit KOMA-Option \val{@else@} gehen}[v2.07]
 %    \begin{macrocode}
-\RequirePackage{etexcmds}[2011/02/16]
 \RequirePackage{kvsetkeys}[2012/04/25]
 %    \end{macrocode}
 % Mit dem Paket \pkg{trimspaces} können eventuell vorhandene Leerzeichen aus
@@ -369,6 +371,7 @@
 % in Kleinbuchstaben geschieben.
 % \begin{macro}{\tud@lowerstring}
 % Das Makro wird mit \cs{tud@lowerstring}\marg{Zielmakro}\marg{String} benutzt.
+% \ToDo{geht das eleganter als mit \cs{expandafter}?}[v2.07]
 %    \begin{macrocode}
 \newcommand*\tud@lowerstring[2]{%
   \protected@edef#1{#2}%
@@ -426,7 +429,199 @@
 %    \end{macrocode}
 % \end{macro}^^A \tud@if@fdfileexists
 %
-% \subsection{Optionsdefinition für \TUDScript}
+% \subsubsection{Sicherung und Wiederherstellung originaler Befehle und Längen}
+%
+% \begin{macro}{\tud@cs@letltx}
+% \changes{v2.06}{2019/06/13}{\cs{LetLtxMacro} zum Sichern originärer Makros}^^A
+% \begin{macro}{\tud@cs@store}
+% \changes{v2.06}{2018/07/15}{%
+%   mit \cs{DeclareRobustCommand} definierte Befehle unterstüzt%
+% }^^A
+% \begin{macro}{\tud@cs@restore}
+% \changes{v2.06}{2018/07/15}{%
+%    stellt originäre Makros auch wieder her, wenn diese mit \cs{undef} 
+%    zwischendurch \emph{undefiniert} gesetzt wurden%
+% }^^A
+% \begin{macro}{\tud@cs@reset}
+% \begin{macro}{\tud@cs@update}
+% \changes{v2.04}{2015/03/03}{neu}^^A
+% \begin{macro}{\tud@cs@use}
+% \begin{macro}{\tud@cs@check}
+% \changes{v2.03}{2015/01/09}{neu}^^A
+% Mit diesen Befehlen wird es möglich, Originalbefehle sichern, nutzen und
+% wiederherstellen zu können. Dies wird benötigt, um zwischen den einzelnen
+% Layouts über Optionseinstellungen zu wechseln und dabei von einem definierten
+% Anfangszustand auszugehen.
+%
+% Der Befehl \cs{tud@cs@letltx} nutzt intern \cs{LetLtxMacro} aus dem Paket 
+% \pkg{letltxmacro}, um auch robust definierte Befehle korrekt zu sichern.
+%    \begin{macrocode}
+\newcommand*\tud@cs@letltx[2]{%
+  \expandafter\expandafter\expandafter\LetLtxMacro%
+  \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname%
+}
+%    \end{macrocode}
+% Mit dem Aufruf \cs{tud@cs@store}\marg{Befehlsname} wird der im Argument 
+% angegebene Befehl in einem neuem Makro \cs{@@tud@\meta{Befehlsname}}
+% gespeichert. Dieser kann danach beliebig angepasst werden. Soll der Befehl zu
+% einem späteren Zeitpunkt auf den Orginalzustand zurücksetzen, kann hierfür
+% jederzeit der Befehl \cs{tud@cs@reset}\marg{Befehlsname} verwendet werden.
+% Durch das Makro \cs{tud@cs@restore}\marg{Befehlsname} wird das mit
+% \cs{tud@cs@store} erstellte Hilfsmakro zusätzlich noch  gelöscht. Der
+% ursprüngliche Befehl kann als solcher mit \cs{tud@cs@use}\marg{Befehlsname}
+% weiterhin genutzt werden. Ein zuvor bereits gesicherter Befehl kann mit 
+% \cs{tud@cs@update}\marg{Befehlsname} auf die momentane Definition 
+% aktualisiert werden.
+%    \begin{macrocode}
+\newrobustcmd*\tud@cs@store[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{}{%
+    \tud@cs@letltx{@@tud@#1}{#1}%
+  }%
+}
+\newrobustcmd*\tud@cs@restore[1]{%
+%    \end{macrocode}
+% Sollte ein zuvor gesichertes Makro mit \cs{undef} oder \cs{csundef} 
+% zwischenzeitlich \emph{undefiniert} gesetzt worden sein, wird das originäre 
+% Makro dennoch wiederhergestellt. Hierfür wird es zu \cs{relax} gesetzt, damit
+% die Überprüfung mit \cs{tud@cs@check} keinen Fehler erzeugt.
+%    \begin{macrocode}
+  \ifcsdef{#1}{}{%
+    \ifcsdef{@@tud@#1}{%
+      \cslet{#1}{\relax}%
+    }{}%
+  }%
+%    \end{macrocode}
+% Die eigentliche Wiederherstellung.
+%    \begin{macrocode}
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{#1}{@@tud@#1}%
+    \csundef{@@tud@#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@reset[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{#1}{@@tud@#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@update[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{@@tud@#1}{#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@use[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \csuse{@@tud@#1}%
+  }{%
+    \csuse{#1}%
+  }%
+}
+%    \end{macrocode}
+% Dieses Makro dient zum Überprüfen, ob der zu sichernde beziehungsweise 
+% wiederherzustellende Befehl überhaupt definiert ist. Sollte das nicht der 
+% Fall sein, wird ein Fehler ausgegeben.
+%    \begin{macrocode}
+\newrobustcmd*\tud@cs@check[1]{%
+  \ifcsdef{#1}{}{%
+    \PackageError{tudscrbase}{%
+      `\@backslashchar#1' is not defined}{%
+      The command `\@backslashchar#1' was never defined. \MessageBreak%
+      Please contact the TUD-Script maintainer\MessageBreak%
+      via \tudscrmail. A bugfix is urgently required.%
+    }%
+  }%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@cs@check
+% \end{macro}^^A \tud@cs@use
+% \end{macro}^^A \tud@cs@update
+% \end{macro}^^A \tud@cs@reset
+% \end{macro}^^A \tud@cs@restore
+% \end{macro}^^A \tud@cs@store
+% \end{macro}^^A \tud@cs@letltx
+% \begin{macro}{\tud@skip@store}
+% \changes{v2.04}{2015/03/02}{neu}^^A
+% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
+% \begin{macro}{\tud@skip@restore}
+% \changes{v2.04}{2015/03/02}{neu}^^A
+% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
+% \begin{macro}{\tud@skip@reset}
+% \changes{v2.05}{2016/07/13}{neu}^^A
+% \begin{macro}{\tud@skip@set}
+% \changes{v2.04}{2015/05/05}{neu}^^A
+% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
+% \begin{macro}{\tud@skip@check}
+% \changes{v2.05}{2016/07/13}{neu}^^A
+% Hiermit können~-- äquivalent zum Sichern und Wiederherstellen von Befehlen~-- 
+% Längenregister abgespeichert werden.
+%    \begin{macrocode}
+\newcommand*\tud@skip@store[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{}{%
+      \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}%
+    }%
+  }%
+}
+\newcommand*\tud@skip@restore[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{%
+      \csname #1\endcsname=\csname @@tud@skip@#1\endcsname%
+      \csundef{@@tud@skip@#1}%
+    }{}%
+  }%
+}
+\newcommand*\tud@skip@reset[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{%
+      \csname#1\endcsname=\csname @@tud@skip@#1\endcsname%
+    }{}%
+  }%
+}
+\newcommand*\tud@skip@set[2]{%
+  \tud@skip@check{#1}{%
+    \expandafter\setlength\csname #1\endcsname{#2}%
+  }%
+}
+\newcommand*\tud@skip@check[1]{%
+  \begingroup%
+    \@tempswafalse%
+    \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
+    \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
+    \if@tempswa%
+      \aftergroup\@firstofone%
+    \else%
+      \aftergroup\@gobble%
+    \fi%
+  \endgroup%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@skip@check
+% \end{macro}^^A \tud@skip@set
+% \end{macro}^^A \tud@skip@reset
+% \end{macro}^^A \tud@skip@restore
+% \end{macro}^^A \tud@skip@store
+% \begin{macro}{\tud@patch@wrn}
+% \TUDScript verwendet die Möglichkeiten von \pkg{etoolbox} und \pkg{xpatch}, 
+% um mit den Makros  (\cs{[x]apptocmd}, \cs{[x]pretocmd}, \cs{[x]patchcmd}) 
+% bereits definierte Befehle anzupassen. Falls dies nicht gelingt, wird eine 
+% Warnung ausgegeben, die hier definiert wird.
+%    \begin{macrocode}
+\newcommand*\tud@patch@wrn[1]{%
+  \PackageWarning{tudscrbase}{%
+    It wasn't possible to patch `\@backslashchar#1'\MessageBreak%
+    Please contact the TUD-Script maintainer\MessageBreak%
+    via \tudscrmail. Without a bugfix an\MessageBreak%
+    erroneous output may occur%
+  }%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@patch@wrn
+%
+% \subsection{Schlüsseldefinitionen für \TUDScript}
 %
 % In Anlehnung an \KOMAScript{} werden hier Befehle zur Definition und
 % Ausführung unterschiedlicher Klassenoptionen mithilfe der Funktionen aus
@@ -448,6 +643,9 @@
 % \end{macro}^^A \TUDoptions
 % \end{macro}^^A \TUDExecuteOptions
 % \end{macro}^^A \TUDProcessOptions
+%
+% \subsubsection{Optionsdefinitionen}
+%
 % \begin{macro}{\TUD@key}
 % \begin{macro}{\TUD@key@define}
 % \changes{v2.06}{2018/07/19}{neu}^^A
@@ -664,194 +862,9 @@
 % \end{macro}^^A \tud@locked@bool@set
 % \end{macro}^^A \tud@locked@bool@preset
 % \end{macro}^^A \tud@locked@newbool
-% \begin{macro}{\tud@cs@letltx}
-% \changes{v2.06}{2019/06/13}{\cs{LetLtxMacro} zum Sichern originärer Makros}^^A
-% \begin{macro}{\tud@cs@store}
-% \changes{v2.06}{2018/07/15}{%
-%   mit \cs{DeclareRobustCommand} definierte Befehle unterstüzt%
-% }^^A
-% \begin{macro}{\tud@cs@restore}
-% \changes{v2.06}{2018/07/15}{%
-%    stellt originäre Makros auch wieder her, wenn diese mit \cs{undef} 
-%    zwischendurch \emph{undefiniert} gesetzt wurden%
-% }^^A
-% \begin{macro}{\tud@cs@reset}
-% \begin{macro}{\tud@cs@update}
-% \changes{v2.04}{2015/03/03}{neu}^^A
-% \begin{macro}{\tud@cs@use}
-% \begin{macro}{\tud@cs@check}
-% \changes{v2.03}{2015/01/09}{neu}^^A
-% Mit diesen Befehlen wird es möglich, Originalbefehle sichern, nutzen und
-% wiederherstellen zu können. Dies wird benötigt, um zwischen den einzelnen
-% Layouts über Optionseinstellungen zu wechseln und dabei von einem definierten
-% Anfangszustand auszugehen.
 %
-% Der Befehl \cs{tud@cs@letltx} nutzt intern \cs{LetLtxMacro} aus dem Paket 
-% \pkg{letltxmacro}, um auch robust definierte Befehle korrekt zu sichern.
-%    \begin{macrocode}
-\newcommand*\tud@cs@letltx[2]{%
-  \expandafter\expandafter\expandafter\LetLtxMacro%
-  \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname%
-}
-%    \end{macrocode}
-% Mit dem Aufruf \cs{tud@cs@store}\marg{Befehlsname} wird der im Argument 
-% angegebene Befehl in einem neuem Makro \cs{@@tud@\meta{Befehlsname}}
-% gespeichert. Dieser kann danach beliebig angepasst werden. Soll der Befehl zu
-% einem späteren Zeitpunkt auf den Orginalzustand zurücksetzen, kann hierfür
-% jederzeit der Befehl \cs{tud@cs@reset}\marg{Befehlsname} verwendet werden.
-% Durch das Makro \cs{tud@cs@restore}\marg{Befehlsname} wird das mit
-% \cs{tud@cs@store} erstellte Hilfsmakro zusätzlich noch  gelöscht. Der
-% ursprüngliche Befehl kann als solcher mit \cs{tud@cs@use}\marg{Befehlsname}
-% weiterhin genutzt werden. Ein zuvor bereits gesicherter Befehl kann mit 
-% \cs{tud@cs@update}\marg{Befehlsname} auf die momentane Definition 
-% aktualisiert werden.
-%    \begin{macrocode}
-\newrobustcmd*\tud@cs@store[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{}{%
-    \tud@cs@letltx{@@tud@#1}{#1}%
-  }%
-}
-\newrobustcmd*\tud@cs@restore[1]{%
-%    \end{macrocode}
-% Sollte ein zuvor gesichertes Makro mit \cs{undef} oder \cs{csundef} 
-% zwischenzeitlich \emph{undefiniert} gesetzt worden sein, wird das originäre 
-% Makro dennoch wiederhergestellt. Hierfür wird es zu \cs{relax} gesetzt, damit
-% die Überprüfung mit \cs{tud@cs@check} keinen Fehler erzeugt.
-%    \begin{macrocode}
-  \ifcsdef{#1}{}{%
-    \ifcsdef{@@tud@#1}{%
-      \cslet{#1}{\relax}%
-    }{}%
-  }%
-%    \end{macrocode}
-% Die eigentliche Wiederherstellung.
-%    \begin{macrocode}
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{#1}{@@tud@#1}%
-    \csundef{@@tud@#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@reset[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{#1}{@@tud@#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@update[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{@@tud@#1}{#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@use[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \csuse{@@tud@#1}%
-  }{%
-    \csuse{#1}%
-  }%
-}
-%    \end{macrocode}
-% Dieses Makro dient zum Überprüfen, ob der zu sichernde beziehungsweise 
-% wiederherzustellende Befehl überhaupt definiert ist. Sollte das nicht der 
-% Fall sein, wird ein Fehler ausgegeben.
-%    \begin{macrocode}
-\newrobustcmd*\tud@cs@check[1]{%
-  \ifcsdef{#1}{}{%
-    \PackageError{tudscrbase}{%
-      `\@backslashchar#1' is not defined}{%
-      The command `\@backslashchar#1' was never defined.\MessageBreak%
-      Please contact the TUD-Script maintainer\MessageBreak%
-      via \tudscrmail. A bugfix is urgently required.%
-    }%
-  }%
-}
-%    \end{macrocode}
-% \end{macro}^^A \tud@cs@check
-% \end{macro}^^A \tud@cs@use
-% \end{macro}^^A \tud@cs@update
-% \end{macro}^^A \tud@cs@reset
-% \end{macro}^^A \tud@cs@restore
-% \end{macro}^^A \tud@cs@store
-% \end{macro}^^A \tud@cs@letltx
-% \begin{macro}{\tud@skip@store}
-% \changes{v2.04}{2015/03/02}{neu}^^A
-% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
-% \begin{macro}{\tud@skip@restore}
-% \changes{v2.04}{2015/03/02}{neu}^^A
-% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
-% \begin{macro}{\tud@skip@reset}
-% \changes{v2.05}{2016/07/13}{neu}^^A
-% \begin{macro}{\tud@skip@set}
-% \changes{v2.04}{2015/05/05}{neu}^^A
-% \changes{v2.05}{2016/07/13}{Verwendung von \cs{tud@skip@check}}^^A
-% \begin{macro}{\tud@skip@check}
-% \changes{v2.05}{2016/07/13}{neu}^^A
-% Hiermit können~-- äquivalent zum Sichern und Wiederherstellen von Befehlen~-- 
-% Längenregister abgespeichert werden.
-%    \begin{macrocode}
-\newcommand*\tud@skip@store[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{}{%
-      \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}%
-    }%
-  }%
-}
-\newcommand*\tud@skip@restore[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{%
-      \csname #1\endcsname=\csname @@tud@skip@#1\endcsname%
-      \csundef{@@tud@skip@#1}%
-    }{}%
-  }%
-}
-\newcommand*\tud@skip@reset[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{%
-      \csname#1\endcsname=\csname @@tud@skip@#1\endcsname%
-    }{}%
-  }%
-}
-\newcommand*\tud@skip@set[2]{%
-  \tud@skip@check{#1}{%
-    \expandafter\setlength\csname #1\endcsname{#2}%
-  }%
-}
-\newcommand*\tud@skip@check[1]{%
-  \begingroup%
-    \@tempswafalse%
-    \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
-    \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
-    \if@tempswa%
-      \aftergroup\@firstofone%
-    \else%
-      \aftergroup\@gobble%
-    \fi%
-  \endgroup%
-}
-%    \end{macrocode}
-% \end{macro}^^A \tud@skip@check
-% \end{macro}^^A \tud@skip@set
-% \end{macro}^^A \tud@skip@reset
-% \end{macro}^^A \tud@skip@restore
-% \end{macro}^^A \tud@skip@store
-% \begin{macro}{\tud@patch@wrn}
-% Dieses Makro wird verwendet, wenn mit den Mitteln von \pkg{etoolbox} bereits
-% vorhandene Befehle angepasst werden sollen (\cs{apptocmd}, \cs{pretocmd},
-% \cs{patchcmd}) und dies nicht gelingt.
-%    \begin{macrocode}
-\newcommand*\tud@patch@wrn[1]{%
-  \PackageWarning{tudscrbase}{%
-    It wasn't possible to patch `\@backslashchar#1'\MessageBreak%
-    Please contact the TUD-Script maintainer\MessageBreak%
-    via \tudscrmail. Without a bugfix an\MessageBreak%
-    erroneous output may occur%
-  }%
-}
-%    \end{macrocode}
-% \end{macro}^^A \tud@patch@wrn
+% \subsubsection{Parameterdefinitionen}
+%
 % \begin{macro}{\TUD@parameter@family}
 % \begin{macro}{\TUD@parameter@@family}
 % \begin{macro}{\TUD@parameter@checkfamily}
@@ -866,6 +879,10 @@
 % Parameter für den Benutzer bewerkstelligen~-- ohne die Angabe der Familie 
 % nur innerhalb des zweiten Argumentes von \cs{TUD@parameter@family} verwendet
 % werden können.
+% \ToDo{%
+%  Eine Katastrophe, dringend überarbeiten; generelle Lösung mit \cs{toks@}?%
+%  KOMA-Option \val{@else@} verwenden?
+% }[v2.07]%
 %    \begin{macrocode}
 \newcommand*\TUD@parameter@@family{}
 \newcommand*\TUD@parameter@family[2]{%
@@ -998,7 +1015,8 @@
 % einfache optionale Argumente.
 % \ToDo{%
 %  Eine Katastrophe, dringend überarbeiten; generelle Lösung mit \cs{toks@}?%
-% }[v2.??]%
+%  KOMA-Option \val{@else@} verwenden?
+% }[v2.07]%
 %    \begin{macrocode}
 \newcommand*\TUD@parameter@handler@macro[3][\TUD@parameter@@family]{%
   \TUD@parameter@checkfamily{#1}{TUD@parameter@handler@macro}%
@@ -1048,8 +1066,8 @@
       \PackageError{tudscrbase}{%
         Unknown default value `\kv@value'%
       }{%
-        If `\kv@value' is a language, you haven't loaded it.\MessageBreak%
-        Otherwise, there's no handler for the given value.\MessageBreak%
+        If `\kv@value' is a language, you haven't loaded it. \MessageBreak%
+        Otherwise, there's no handler for the given value. \MessageBreak%
         You should specify a certian key (<key>=\kv@value).%
       }%
     \fi%
@@ -1276,7 +1294,6 @@
 % einem Schriftelement ein Hilfsmakro \cs{tud@komafont@\meta{Element}} 
 % zugewiesen, welches intern angepasst werden kann. Mit \cs{tud@komafont@set} 
 % werden dem angegebenen Element die gewünschten Schriftattribute zugeteilt.
-% \ToDo{nur für Klassen notwendig!}[v2.06]
 %    \begin{macrocode}
 \newcommand*\tud@komafont@set[2]{%
   \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
index 59746192562..2e93c2aa5f8 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{1469}
+% \CheckSum{1450}
 % \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}[2019/07/17 v2.06b TUD-Script\space%
+\ProvidesFile{tudscr-comp.dtx}[2019/08/20 v2.06c TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -169,7 +169,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -205,7 +205,7 @@
 \newcommand*\TUD@deprecated@lengthcs[2][]{%
   \ifdim\csuse{#2}<\maxdimen\relax%
     \ClassWarning{\TUD@Class@Name}{%
-      Using the length `\@backslashchar#2' is deprecated.\MessageBreak%
+      Using the length `\@backslashchar#2' is deprecated. \MessageBreak%
       You should use option `#2' instead%
     }%
     \csxdef{tud@dim@#2}{\the\csuse{#2}}%
@@ -249,8 +249,8 @@
 %</package&fonts>
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -285,25 +285,7 @@
 %</package>
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-%<*class>
-    \ClassError{\TUD@Class@Name}%
-%</class>
-%<*package&fonts>
-    \PackageError{tudscrfonts}%
-%</package&fonts>
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-%<*class>
-      class `\TUD@Class@Name'\space%
-%</class>
-%<*package&fonts>
-      package `tudscrfonts'\space%
-%</package&fonts>
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
 %    \end{macrocode}
 % Außerdem wird darauf geachtet, dass die mindestens benötigte Version von
 % \KOMAScript{} installiert ist. (\cs{\TUD@Version@KOMA}: \TUD@Version@KOMA). 
@@ -392,7 +374,9 @@
 % \begin{macro}{\tud@v@2.06a}
 % \changes{v2.06a}{2019/07/09}{neu}^^A
 % \begin{macro}{\tud@v@2.06b}
-% \changes{v2.06a}{2019/07/17}{neu}^^A
+% \changes{v2.06b}{2019/07/17}{neu}^^A
+% \begin{macro}{\tud@v@2.06c}
+% \changes{v2.06c}{2019/08/20}{neu}^^A
 % \begin{macro}{\tud@v@last}
 % \changes{v2.02}{2014/08/22}{neu}^^A
 % \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -431,9 +415,11 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 %    \end{macrocode}
 % \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06c
 % \end{macro}^^A \tud@v@2.06b
 % \end{macro}^^A \tud@v@2.06a
 % \end{macro}^^A \tud@v@2.06
@@ -507,7 +493,7 @@
         \PackageWarningNoLine{tudscrfonts}%
 %</package&fonts>
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -778,7 +764,7 @@
     \PackageWarningNoLine{tudscrfonts}%
 %</package&fonts>
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
@@ -795,26 +781,7 @@
 \AtEndOfPackage%
 %</package&fonts>
 {%
-  \TUD@key{fontspec}[]%
-  {%
-%<*class>
-    \ClassError{\TUD@Class@Name}%
-%</class>
-%<*package&fonts>
-    \PackageError{tudscrfonts}%
-%</package&fonts>
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-%<*class>
-      class `\TUD@Class@Name'\space%
-%</class>
-%<*package&fonts>
-      package `tudscrfonts'\space%
-%</package&fonts>
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -1238,9 +1205,7 @@
 %    \begin{macrocode}
 \newcommand*\moreauthor{\authormore}
 \newcommand*\submitdate{\date}
-\newcommand*\supervisorII[1]{%
-  \expandafter\gdef\expandafter\@supervisor\expandafter{\@supervisor\and #1}%
-}
+\newcommand*\supervisorII[1]{\g@addto@macro\@supervisor{\and #1}}
 \newcommand*\supervisedby[1]{\gdef\supervisorname{#1}}
 \newcommand*\supervisedIIby[1]{\gdef\supervisorothername{#1}}
 \newcommand*\submittedon[1]{\gdef\datetext{#1}}
@@ -2018,7 +1983,7 @@
     \tud@cs@restore{shapedefault}%
     \tud@cs@restore{normalfont}%
     #2%
-    \AfterPackage*{tudscrfonts}{%
+    \AfterPackage{tudscrfonts}{%
       \def\dinBold{\dinbn}%
       \def\dinfamily{\dinbn}%
       \AtBeginDocument{%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
index 321495edbaf..ef3754d43a9 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-doc.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-doc.dtx}[2019/07/18 v2.06c TUD-Script\space%
   (source code documentation based on scrartcl/scrdoc)%
 ]
 %
@@ -454,7 +454,7 @@
   }%
 }
 \@doxcreatedescribes{Macro}
-\AfterPackage{marginnote}{%
+\AfterPackage*{marginnote}{%
   \renewcommand*\marginpar[2][]{%
     \IfArgIsEmpty{#1}{%
       \marginnote{#2}[\marginnotevskip]%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
index 74d37b5b2d3..dbf9cb46b89 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-fields.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-fields.dtx}[2019/08/20 v2.06c TUD-Script\space%
   (input fields)%
 ]
 %
@@ -364,7 +364,7 @@
 }
 \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}}
 \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}}
-\AfterPackage*{hyperref}{%
+\AfterPackage{hyperref}{%
   \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{%
     \gdef\@emailaddress{%
       \begingroup%
@@ -783,7 +783,7 @@
     \ClassWarning{\TUD@Class@Name}{%
       `\string\date' was not given\MessageBreak%
       Since a thesis is a self-contained work, an end\MessageBreak%
-      date should be specified by the author.\MessageBreak%
+      date should be specified by the author. \MessageBreak%
       Nevertheless, today's date is used%
     }%
   }{%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
index 443c30b367d..09a225655c3 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{3083}
+% \CheckSum{3103}
 % \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}[2019/07/17 v2.06b TUD-Script\space%
+\ProvidesFile{tudscr-fonts.dtx}[2019/08/20 v2.06c TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -510,7 +510,7 @@
         \PackageWarning{tudscrfonts}%
 %</package>
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -529,7 +529,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -565,7 +565,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -579,7 +579,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -700,7 +700,7 @@
 %<*package>
 \@ifpackageloaded{bm}{%
   \PackageWarning{tudscrfonts}{%
-    Package `bm' must be loaded after `tudscrfonts'.\MessageBreak%
+    Package `bm' must be loaded after `tudscrfonts'. \MessageBreak%
     Otherwise the functionality can not be guaranteed%
   }%
 }{%
@@ -1611,7 +1611,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -3107,23 +3110,36 @@
 %    \end{macrocode}
 % Um das Umschalten der Mathematikversion mit \cs{mathversion} auch nutzen zu 
 % können, wenn \pkg{mathastext} für die Schriften des \CDs aktiv ist, wird ein 
-% Wrappermakro benötigt, welches im Bedarfsfall nachträglich \cs{MTversion@@} 
-% aufruft, was normalerweise mit \cs{MTversion*} geschieht.
+% Wrappermakro benötigt, welches im Bedarfsfall\cs{MTversion*} aufruft. Hierfür 
+% wird zunächst auf die gewünschte Mathematikversion, danach der originale 
+% Befehl \cs{mathversion} wiederhergestellt, aufgerufen und anschließend wieder 
+% auf das Wrappermakro \cs{tud@mathversion} zurückgesetzt.
 %    \begin{macrocode}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
@@ -3141,6 +3157,15 @@
 % Paket \pkg{mathastext} genutzt wird, um trotzdem einen mathematischen Satz zu 
 % ermöglichen. Dabei wird die Computer~Modern in der \val{LGR}~Kodierung 
 % zwingend benötigt.
+%
+% Für die LGR-Kodierung werden die Bundles \pkg{cbfonts} und \pkg{cbfonts-fd} 
+% benötigt. Leider lässt sich momentan nur auf letzteres testen. Für ersteres 
+% ließe sich |\font\testfont=grmn1200|\footnote{\file{ltxcheck.tex}} oder
+% \verb+\immediate\openin\pathfont="|kpsewhich grmn1200.tfm"+\ignorespaces%
+% \footnote{\url{https://tex.stackexchange.com/questions/306980/}} oder nutzen.
+% Beide Ansätze sind aber nicht vollends stimmig. Der erste funktioniert nicht, 
+% sobald der Anwender \val{-interaction-mode} selbst definiert und für den 
+% zweiten müssen zumindest eingeschränkte Schreibrechte aktiviert sein.
 %    \begin{macrocode}
   \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
index 7a9a57a02d0..4e6fe56ae79 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-layout.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-layout.dtx}[2019/07/19 v2.06c TUD-Script\space%
   (layout)%
 ]
 %
@@ -783,7 +783,7 @@
 % Mit \cs{tud@sec@fontface} wird die Schriftart für Überschriften im 
 % Layout des \CDs definiert.
 %    \begin{macrocode}
-%<package&fixfonts>\AfterPackage*{tudscrfonts}{%
+%<package&fixfonts>\AfterPackage{tudscrfonts}{%
 \newcommand*\tud@sec@fontface[1][]{\tud@sec@@fontface{#1}}%
 \newcommand*\tud@sec@@fontface[1]{%
   \sectfont#1%
@@ -1761,13 +1761,13 @@
 %    \begin{macrocode}
 \newcommand*\tud@chapter@before@hook{}
 \newcommand*\tud@chapter@after@hook{}
-\pretocmd\scr@startchapter{%
+\pretocmd{\scr@startchapter}{%
   \tud@chapter@before@hook%
 }{}{\tud@patch@wrn{scr@startchapter}}
-\apptocmd\scr@@startchapter{%
+\apptocmd{\scr@@startchapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startchapter}}
-\apptocmd\scr@@startschapter{%
+\apptocmd{\scr@@startschapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startschapter}}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
index 0c3e2ba06af..954773033b1 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-localization.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-localization.dtx}[2019/07/19 v2.06c TUD-Script\space%
   (localization)%
 ]
 %
@@ -489,7 +489,7 @@
 %
 % \begin{macro}{\tud@ifin@and}
 % \changes{v2.05}{2015/08/05}{neu}^^A
-% Dieser Befehl prüft, ob innerhalb eines Felder, welches im ersten Argument 
+% Dieser Befehl prüft, ob innerhalb eines Feldes, welches im ersten Argument 
 % angegeben werden muss, \cs{and} verwendet wurde. Ist dies der Fall, wird das
 % zweite Argument ausgeführt, andernfalls das dritte.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
index 1c6b133d34d..4df997a44b8 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-manual.dtx}[2019/07/17 v2.06b TUD-Script\space%
+\ProvidesFile{tudscr-manual.dtx}[2019/08/20 v2.06c TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -149,11 +149,9 @@
 % werden. Die Randnotizen werden auf dem linken~-- weil größeren~-- Seitenrand
 % gesetzt.
 %    \begin{macrocode}
-%<*!doc>
 \PassOptionsToPackage{quiet}{marginnote}
 \RequirePackage{marginnote}[2012/03/29]
-\reversemarginpar
-%</!doc>
+%<!doc>\reversemarginpar
 %    \end{macrocode}
 % Das Paket für intelligente Leerzeichen am Ende von Makros mit \cs{xspace}.
 %    \begin{macrocode}
@@ -269,6 +267,7 @@
 %    \end{macrocode}
 % Ist der Eintrag bereits erfolgt, wird der verbliebene Teil der Liste 
 % angehangen.
+% \ToDo{\cs{expandafter}\cs{edef}\cs{expandafter} ist quatsch, oder?}[v2.07]
 %    \begin{macrocode}
       \if@tud@list@sorted%
         \expandafter\edef\expandafter\@tempb\expandafter{\@tempb,\@tempa}%
@@ -774,7 +773,7 @@
   \PackageWarningNoLine{tudscrtutorial}%
 %</package>
   {%
-    It is strongly recommended to load package `hyperref'.\MessageBreak%
+    It is strongly recommended to load package `hyperref'. \MessageBreak%
     Nevertheless, essential commands are rudimentarily\MessageBreak%
     defined. At least the package `url' is loaded%
   }%
@@ -891,7 +890,6 @@
 % Mit diesem Makro können Hyperlinks im Fließtext erzeugt werden, welche 
 % zusätzlich noch die dazugeörige URL als Fußnote anzeigen.
 %    \begin{macrocode}
-%<doc>\RequirePackage{trimspaces}[2009/09/17]
 \newcommand*\hrfn[2]{%
   \href{#1}{\trim@spaces{#2}}%
   \footnote{%
@@ -5582,8 +5580,12 @@
 \if@tempswa%
 \begin{filecontents*}{\tud@tut@temp-standalone.tex}
 \documentclass[english,ngerman]{tudscrreprt}
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\ifpdftex{
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+}{
+  \usepackage{fontspec}
+}
 \usepackage{babel}
 \usepackage{tudscrsupervisor}
 \usepackage{isodate}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
index c96567a2d27..72beb47c8a2 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{300}
+% \CheckSum{324}
 % \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-misc.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-misc.dtx}[2019/08/20 v2.06c TUD-Script\space%
   (miscellaneous)%
 ]
 %
@@ -377,7 +377,7 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size.\MessageBreak%
+        should additionally specify an explicit font size. \MessageBreak%
         See the manual for further information%
       }%
     \fi%
@@ -391,7 +391,7 @@
 %<*option>
 % \fi
 %
-% \subsection{Sukkzessives Abarbeiten von Layoutoptionen im Dokument}
+% \subsection{Sukkzessives Abarbeiten von Optionen im Dokument}
 %
 % Werden mit \cs{TUDoptions} nach \cs{begin\{document\}} mehrere Layoutoptionen 
 % gleichzeitig angegeben, muss dafür Sorge getragen werden, dass diese in der 
@@ -615,6 +615,61 @@
 %    \end{macrocode}
 %
 % \iffalse
+%<*class&!inherit|package&fonts>
+% \fi
+%
+% \subsection{Optionen ohne späte Wahlmöglichkeit}
+%
+% Einige Optionen können nur zum Zeitpunkt des Ladens einer Klasse oder eines 
+% Paketes respektive in der Präambel gesetzt werden. Diese müssen \emph{nach}
+% \cs{TUDProcessOptions} mit \cs{TUD@key@toolate} redefiniert werden.
+%
+% \begin{macro}{\TUD@key@toolate}
+% \changes{v2.06c}{2019/08/20}{neu}^^A
+% Dieser Befehl definiert eine Fehlermeldung für Schlüssel respektive Optionen, 
+% die zu spät verwendet wurden, wobei er innerhalb der Makros \cs{AtEndOfClass},
+% \cs{AtEndOfClass}, \cs{AtEndPreamble} etc. genutzt werden sollte. Wird dieser 
+% noch im Kontext von Klasse oder Paket (\verb=\@currname.\@currext-h@@k=)
+% verwendet, wird gemeldet, dass der Schlüssel allein beim Laden der Klasse 
+% respektive des Paketes genutzt werden darf. Andernfalls wird die zwingende
+% Verwendung in der Präambel angemerkt.
+%    \begin{macrocode}
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+%<*class>
+    \noexpand\ClassError{\noexpand\TUD@Class@Name}%
+%</class>
+%<*package&fonts>
+    \noexpand\PackageError{tudscrfonts}%
+%</package&fonts>
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+%<*class>
+        class `\noexpand\TUD@Class@Name'%
+%</class>
+%<*package&fonts>
+        package `tudscrfonts'%
+%</package&fonts>
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
+%    \end{macrocode}
+% \end{macro}^^A \TUD@key@toolate
+%
+%
+% \iffalse
+%</class&!inherit|package&fonts>
 %</execute>
 %<*body>
 % \fi
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
index edd109794ef..e6cb0a94e45 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{2046}
+% \CheckSum{2044}
 % \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-pagestyle.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-pagestyle.dtx}[2019/08/20 v2.06c TUD-Script\space%
   (pagestyle)%
 ]
 %
@@ -1266,7 +1266,7 @@
       \ifdim##1<\ta@bcor\relax%
         \ClassWarning{\TUD@Class@Name}{%
           The selected page layout means that the\MessageBreak%
-          logo of TUD extends beyond the printing area.\MessageBreak%
+          logo of TUD extends beyond the printing area. \MessageBreak%
           The inner margin is smaller than BCOR\MessageBreak%
           (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak%
           Maybe you should decrease the current value\MessageBreak%
@@ -1867,7 +1867,7 @@
         \def\@tempa{##1}%
         \@tempswafalse%
       \else%
-        \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}%
+        \l@addto@macro\@tempb{,##1}%
       \fi%
     }%
     \let\@tempc\relax%
@@ -1883,9 +1883,9 @@
 % Wurden tatsächlich inidviduelle Parameter übergeben, so werden diese als 
 % letztes ausgeführt, um vorige Einstellungen überschreiben zu können.
 %    \begin{macrocode}
-    \appto\tud@footlogo@fileoptions{\@tempb}%
+    \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}%
     \protected@edef\@tempc{%
-      \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}%
+      \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}%
     }%
 %    \end{macrocode}
 % Die Logos werden~-- wie auch das \DDC-Logo im Fuß~-- individuell optisch
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
index 0d8de251f3d..7e73840d5c2 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{594}
+% \CheckSum{600}
 % \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-supervisor.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-supervisor.dtx}[2019/08/20 v2.06c TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -389,9 +389,9 @@
 %    \begin{macrocode}
 \newcommand\taskform[3][]{%
   \begin{task}[#1]%
-    \ifblank{#2}{}{\minisec{\objectivesname}#2}%
+    \ifblank{#2}{}{\minisec{\objectivesname}\smallskip#2}%
     \ifblank{#3}{}{%
-      \minisec{\focusname}%
+      \minisec{\focusname}\smallskip%
       \begin{itemize}\tud@RaggedRight%
         #3%
       \end{itemize}%
@@ -497,9 +497,9 @@
 %    \begin{macrocode}
 \newcommand\evaluationform[5][]{%
   \begin{evaluation}[#1]%
-    \ifblank{#2}{}{\minisec{\taskname}#2}%
-    \ifblank{#3}{}{\minisec{\contentname}#3}%
-    \ifblank{#4}{}{\minisec{\assessmentname}#4}%
+    \ifblank{#2}{}{\minisec{\taskname}\smallskip#2}%
+    \ifblank{#3}{}{\minisec{\contentname}\smallskip#3}%
+    \ifblank{#4}{}{\minisec{\assessmentname}\smallskip#4}%
     \ifblank{#5}{}{\def\@grade{#5}}%
   \end{evaluation}%
 }
@@ -584,7 +584,7 @@
       #2%
     }%
     \ifblank{#3}{}{%
-      \minisec{\focusname}%
+      \minisec{\focusname}\smallskip%
       \begin{itemize}\tud@RaggedRight%
       #3%
       \end{itemize}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
index d797e96b169..b6ec69ff30c 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-title.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-title.dtx}[2019/08/20 v2.06c TUD-Script\space%
   (title)%
 ]
 %
@@ -1325,7 +1325,7 @@
       `\string\makecover' together isn't supported. The\MessageBreak%
       option `titlepage=firstiscover' will be ignored. If you\MessageBreak%
       want to create an individual cover, you have to use\MessageBreak%
-      `\string\extratitle' instead of `\string\makecover'.\MessageBreak%
+      `\string\extratitle' instead of `\string\makecover'. \MessageBreak%
       See also the documentation of KOMA-Script%
     }%
     \@titlepageiscoverpagefalse%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
index fc9207026db..b6556bd7617 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{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 %    \end{macrocode}
 % \end{macro}^^A \TUDScriptVersionNumber
@@ -209,7 +209,7 @@
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
 %!TUD@Version
-    ^^J#3 (#2)%
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -222,7 +222,7 @@
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
 %!TUD@Version
-    ^^J#3 (#2)%
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
   \newcommand*\TUD@Class@Name{#1}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr.ins b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
index c1e7932c2ba..3503f12938e 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr.ins
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
@@ -247,7 +247,6 @@ The current maintainer and author of this work is Falk Hanisch.
     \from{tudscr-misc.dtx}{package,fixfonts,execute}%
     \from{tudscr-layout.dtx}{package,fixfonts,body}%
     \from{tudscr-comp.dtx}{package,fixfonts,body}%
-    \from{tudscr-misc.dtx}{package,fixfonts,body}%
   }
 }
 \generate{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index 70902c7d10b..e08a79b6ba0 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -11,11 +11,10 @@
 %% tudscr-misc.dtx  (with options: `package,fixfonts,execute')
 %% tudscr-layout.dtx  (with options: `package,fixfonts,body')
 %% tudscr-comp.dtx  (with options: `package,fixfonts,body')
-%% tudscr-misc.dtx  (with options: `package,fixfonts,body')
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -58,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -74,7 +73,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{fix-tudscrfonts}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package for font fixes
   (compatibility for old tud(scr) classes)%
 ]
@@ -105,7 +104,7 @@
 }
 \TUDProcessOptions\relax
 %%% From File: tudscr-layout.dtx
-\AfterPackage*{tudscrfonts}{%
+\AfterPackage{tudscrfonts}{%
 \newcommand*\tud@sec@fontface[1][]{\tud@sec@@fontface{#1}}%
 \newcommand*\tud@sec@@fontface[1]{%
   \sectfont#1%
@@ -234,7 +233,7 @@
     \tud@cs@restore{shapedefault}%
     \tud@cs@restore{normalfont}%
     #2%
-    \AfterPackage*{tudscrfonts}{%
+    \AfterPackage{tudscrfonts}{%
       \def\dinBold{\dinbn}%
       \def\dinfamily{\dinbn}%
       \AtBeginDocument{%
@@ -406,23 +405,6 @@
   \let\tud@x@tudfonts@prevent\relax%
 }
 \PreventPackageFromLoading[\tud@x@tudfonts@prevent]{tudfonts}
-%%% From File: tudscr-misc.dtx
-\if@tud@cdoldfont@active
-  \RequirePackage{textcase}[2004/10/07]
-  \AfterPackage*{textcase}{%
-    \robustify\NoCaseChange%
-    \newcommand*\tud@x@textcase@uclcnotmath{%
-      \@nonchangecase\hologo%
-      \def\footnote##1##{\toks@{\noexpand\footnote##1}\@footnote}%
-      \def\@footnote##1{\NoCaseChange{\the\toks@{##1}}}%
-      \def\@mkboth##1##2{\NoCaseChange{\@mkboth{##1}{##2}}}%
-    }%
-    \patchcmd{\@uclcnotmath}{\@nonchangecase\ensuremath}{%
-      \@nonchangecase\ensuremath\tud@x@textcase@uclcnotmath%
-    }{}{\tud@patch@wrn{@uclcnotmath}}%
-  }%
-\fi
-\TUD@deprecated@cs{NoCaseChange}{@firstofone}
 \endinput
 %%
 %% End of file `fix-tudscrfonts.sty'.
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index e85f3242023..ab82a257d54 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-mathswap.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathswap}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c 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 56ec33aa249..7c3dbaf5bee 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -73,14 +73,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -1066,7 +1066,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -1096,7 +1096,7 @@
 \newcommand*\TUD@deprecated@lengthcs[2][]{%
   \ifdim\csuse{#2}<\maxdimen\relax%
     \ClassWarning{\TUD@Class@Name}{%
-      Using the length `\@backslashchar#2' is deprecated.\MessageBreak%
+      Using the length `\@backslashchar#2' is deprecated. \MessageBreak%
       You should use option `#2' instead%
     }%
     \csxdef{tud@dim@#2}{\the\csuse{#2}}%
@@ -1112,8 +1112,8 @@
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -1129,15 +1129,7 @@
 \AtEndOfClass%
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
   \ifcsdef{scr@v@\TUD@Version@KOMA}{%
     \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
       \ClassError{\TUD@Class@Name}{%
@@ -1186,6 +1178,7 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1211,7 +1204,7 @@
       \def\tud@reserved{%
         \ClassWarningNoLine{\TUD@Class@Name}%
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -1364,23 +1357,14 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed%
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
 }
 \AtEndOfClass%
 {%
-  \TUD@key{fontspec}[]%
-  {%
-    \ClassError{\TUD@Class@Name}%
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -1408,6 +1392,26 @@
 }
 \TUDProcessOptions\relax
 \LoadClass{\TUD@Class@KOMA}[2018/03/30]
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+    \noexpand\ClassError{\noexpand\TUD@Class@Name}%
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+        class `\noexpand\TUD@Class@Name'%
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
 \newcommand*\tud@x@multicol@num{1}
@@ -1579,7 +1583,7 @@
       \if@tud@cdmath@active%
         \ClassWarning{\TUD@Class@Name}%
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -1594,7 +1598,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -1626,7 +1630,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -1640,7 +1644,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -1936,7 +1940,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -2646,19 +2653,30 @@
 \newcommand*\mv@tudbold{}
 \newcommand*\mv@tuddin{}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
@@ -3248,7 +3266,7 @@
 }
 \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}}
 \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}}
-\AfterPackage*{hyperref}{%
+\AfterPackage{hyperref}{%
   \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{%
     \gdef\@emailaddress{%
       \begingroup%
@@ -3385,7 +3403,7 @@
     \ClassWarning{\TUD@Class@Name}{%
       `\string\date' was not given\MessageBreak%
       Since a thesis is a self-contained work, an end\MessageBreak%
-      date should be specified by the author.\MessageBreak%
+      date should be specified by the author. \MessageBreak%
       Nevertheless, today's date is used%
     }%
   }{%
@@ -4237,7 +4255,7 @@
         \noexpand\paperheight=\the\paperheight\relax%
       }%
       \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto{\tud@x@geometry@parameter}{\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}%
@@ -5522,7 +5540,7 @@
       \ifdim##1<\ta@bcor\relax%
         \ClassWarning{\TUD@Class@Name}{%
           The selected page layout means that the\MessageBreak%
-          logo of TUD extends beyond the printing area.\MessageBreak%
+          logo of TUD extends beyond the printing area. \MessageBreak%
           The inner margin is smaller than BCOR\MessageBreak%
           (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak%
           Maybe you should decrease the current value\MessageBreak%
@@ -5742,7 +5760,7 @@
         \def\@tempa{##1}%
         \@tempswafalse%
       \else%
-        \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}%
+        \l@addto@macro\@tempb{,##1}%
       \fi%
     }%
     \let\@tempc\relax%
@@ -5751,9 +5769,9 @@
     \preto\tud@footlogo@fileoptions{%
       keepaspectratio,totalheight=\tud@dim@footlogoheight,%
     }%
-    \appto\tud@footlogo@fileoptions{\@tempb}%
+    \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}%
     \protected@edef\@tempc{%
-      \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}%
+      \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}%
     }%
     \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{%
       The given `\string\footlogo{\@tempa}' is too large.%
@@ -6854,7 +6872,7 @@
       `\string\makecover' together isn't supported. The\MessageBreak%
       option `titlepage=firstiscover' will be ignored. If you\MessageBreak%
       want to create an individual cover, you have to use\MessageBreak%
-      `\string\extratitle' instead of `\string\makecover'.\MessageBreak%
+      `\string\extratitle' instead of `\string\makecover'. \MessageBreak%
       See also the documentation of KOMA-Script%
     }%
     \@titlepageiscoverpagefalse%
@@ -7526,7 +7544,7 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size.\MessageBreak%
+        should additionally specify an explicit font size. \MessageBreak%
         See the manual for further information%
       }%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index 605da2f997d..a013724428e 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-base.dtx
 \ProvidesPackage{tudscrbase}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (basics for the bundle)%
 ]
@@ -183,6 +183,105 @@
     \fi%
   \endgroup%
 }
+\newcommand*\tud@cs@letltx[2]{%
+  \expandafter\expandafter\expandafter\LetLtxMacro%
+  \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname%
+}
+\newrobustcmd*\tud@cs@store[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{}{%
+    \tud@cs@letltx{@@tud@#1}{#1}%
+  }%
+}
+\newrobustcmd*\tud@cs@restore[1]{%
+  \ifcsdef{#1}{}{%
+    \ifcsdef{@@tud@#1}{%
+      \cslet{#1}{\relax}%
+    }{}%
+  }%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{#1}{@@tud@#1}%
+    \csundef{@@tud@#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@reset[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{#1}{@@tud@#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@update[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \tud@cs@letltx{@@tud@#1}{#1}%
+  }{}%
+}
+\newrobustcmd*\tud@cs@use[1]{%
+  \tud@cs@check{#1}%
+  \ifcsdef{@@tud@#1}{%
+    \csuse{@@tud@#1}%
+  }{%
+    \csuse{#1}%
+  }%
+}
+\newrobustcmd*\tud@cs@check[1]{%
+  \ifcsdef{#1}{}{%
+    \PackageError{tudscrbase}{%
+      `\@backslashchar#1' is not defined}{%
+      The command `\@backslashchar#1' was never defined. \MessageBreak%
+      Please contact the TUD-Script maintainer\MessageBreak%
+      via \tudscrmail. A bugfix is urgently required.%
+    }%
+  }%
+}
+\newcommand*\tud@skip@store[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{}{%
+      \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}%
+    }%
+  }%
+}
+\newcommand*\tud@skip@restore[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{%
+      \csname #1\endcsname=\csname @@tud@skip@#1\endcsname%
+      \csundef{@@tud@skip@#1}%
+    }{}%
+  }%
+}
+\newcommand*\tud@skip@reset[1]{%
+  \tud@skip@check{#1}{%
+    \ifcsdef{@@tud@skip@#1}{%
+      \csname#1\endcsname=\csname @@tud@skip@#1\endcsname%
+    }{}%
+  }%
+}
+\newcommand*\tud@skip@set[2]{%
+  \tud@skip@check{#1}{%
+    \expandafter\setlength\csname #1\endcsname{#2}%
+  }%
+}
+\newcommand*\tud@skip@check[1]{%
+  \begingroup%
+    \@tempswafalse%
+    \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
+    \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
+    \if@tempswa%
+      \aftergroup\@firstofone%
+    \else%
+      \aftergroup\@gobble%
+    \fi%
+  \endgroup%
+}
+\newcommand*\tud@patch@wrn[1]{%
+  \PackageWarning{tudscrbase}{%
+    It wasn't possible to patch `\@backslashchar#1'\MessageBreak%
+    Please contact the TUD-Script maintainer\MessageBreak%
+    via \tudscrmail. Without a bugfix an\MessageBreak%
+    erroneous output may occur%
+  }%
+}
 \DefineFamily{TUD}
 \newcommand*\TUDProcessOptions{\FamilyProcessOptions{TUD}}
 \newcommand*\TUDExecuteOptions{\FamilyExecuteOptions{TUD}}
@@ -303,105 +402,6 @@
     }%
   }%
 }
-\newcommand*\tud@cs@letltx[2]{%
-  \expandafter\expandafter\expandafter\LetLtxMacro%
-  \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname%
-}
-\newrobustcmd*\tud@cs@store[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{}{%
-    \tud@cs@letltx{@@tud@#1}{#1}%
-  }%
-}
-\newrobustcmd*\tud@cs@restore[1]{%
-  \ifcsdef{#1}{}{%
-    \ifcsdef{@@tud@#1}{%
-      \cslet{#1}{\relax}%
-    }{}%
-  }%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{#1}{@@tud@#1}%
-    \csundef{@@tud@#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@reset[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{#1}{@@tud@#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@update[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \tud@cs@letltx{@@tud@#1}{#1}%
-  }{}%
-}
-\newrobustcmd*\tud@cs@use[1]{%
-  \tud@cs@check{#1}%
-  \ifcsdef{@@tud@#1}{%
-    \csuse{@@tud@#1}%
-  }{%
-    \csuse{#1}%
-  }%
-}
-\newrobustcmd*\tud@cs@check[1]{%
-  \ifcsdef{#1}{}{%
-    \PackageError{tudscrbase}{%
-      `\@backslashchar#1' is not defined}{%
-      The command `\@backslashchar#1' was never defined.\MessageBreak%
-      Please contact the TUD-Script maintainer\MessageBreak%
-      via \tudscrmail. A bugfix is urgently required.%
-    }%
-  }%
-}
-\newcommand*\tud@skip@store[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{}{%
-      \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}%
-    }%
-  }%
-}
-\newcommand*\tud@skip@restore[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{%
-      \csname #1\endcsname=\csname @@tud@skip@#1\endcsname%
-      \csundef{@@tud@skip@#1}%
-    }{}%
-  }%
-}
-\newcommand*\tud@skip@reset[1]{%
-  \tud@skip@check{#1}{%
-    \ifcsdef{@@tud@skip@#1}{%
-      \csname#1\endcsname=\csname @@tud@skip@#1\endcsname%
-    }{}%
-  }%
-}
-\newcommand*\tud@skip@set[2]{%
-  \tud@skip@check{#1}{%
-    \expandafter\setlength\csname #1\endcsname{#2}%
-  }%
-}
-\newcommand*\tud@skip@check[1]{%
-  \begingroup%
-    \@tempswafalse%
-    \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
-    \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}%
-    \if@tempswa%
-      \aftergroup\@firstofone%
-    \else%
-      \aftergroup\@gobble%
-    \fi%
-  \endgroup%
-}
-\newcommand*\tud@patch@wrn[1]{%
-  \PackageWarning{tudscrbase}{%
-    It wasn't possible to patch `\@backslashchar#1'\MessageBreak%
-    Please contact the TUD-Script maintainer\MessageBreak%
-    via \tudscrmail. Without a bugfix an\MessageBreak%
-    erroneous output may occur%
-  }%
-}
 \newcommand*\TUD@parameter@@family{}
 \newcommand*\TUD@parameter@family[2]{%
   \xdef\TUD@parameter@@family{#1}%
@@ -490,8 +490,8 @@
       \PackageError{tudscrbase}{%
         Unknown default value `\kv@value'%
       }{%
-        If `\kv@value' is a language, you haven't loaded it.\MessageBreak%
-        Otherwise, there's no handler for the given value.\MessageBreak%
+        If `\kv@value' is a language, you haven't loaded it. \MessageBreak%
+        Otherwise, there's no handler for the given value. \MessageBreak%
         You should specify a certian key (<key>=\kv@value).%
       }%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 59c992a596d..8a6c97d24b9 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -73,14 +73,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -1134,7 +1134,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -1164,7 +1164,7 @@
 \newcommand*\TUD@deprecated@lengthcs[2][]{%
   \ifdim\csuse{#2}<\maxdimen\relax%
     \ClassWarning{\TUD@Class@Name}{%
-      Using the length `\@backslashchar#2' is deprecated.\MessageBreak%
+      Using the length `\@backslashchar#2' is deprecated. \MessageBreak%
       You should use option `#2' instead%
     }%
     \csxdef{tud@dim@#2}{\the\csuse{#2}}%
@@ -1180,8 +1180,8 @@
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -1197,15 +1197,7 @@
 \AtEndOfClass%
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
   \ifcsdef{scr@v@\TUD@Version@KOMA}{%
     \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
       \ClassError{\TUD@Class@Name}{%
@@ -1254,6 +1246,7 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1279,7 +1272,7 @@
       \def\tud@reserved{%
         \ClassWarningNoLine{\TUD@Class@Name}%
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -1443,23 +1436,14 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed%
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
 }
 \AtEndOfClass%
 {%
-  \TUD@key{fontspec}[]%
-  {%
-    \ClassError{\TUD@Class@Name}%
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -1487,6 +1471,26 @@
 }
 \TUDProcessOptions\relax
 \LoadClass{\TUD@Class@KOMA}[2018/03/30]
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+    \noexpand\ClassError{\noexpand\TUD@Class@Name}%
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+        class `\noexpand\TUD@Class@Name'%
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
 \newcommand*\tud@x@multicol@num{1}
@@ -1658,7 +1662,7 @@
       \if@tud@cdmath@active%
         \ClassWarning{\TUD@Class@Name}%
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -1673,7 +1677,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -1705,7 +1709,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -1719,7 +1723,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -2015,7 +2019,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -2725,19 +2732,30 @@
 \newcommand*\mv@tudbold{}
 \newcommand*\mv@tuddin{}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
@@ -3327,7 +3345,7 @@
 }
 \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}}
 \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}}
-\AfterPackage*{hyperref}{%
+\AfterPackage{hyperref}{%
   \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{%
     \gdef\@emailaddress{%
       \begingroup%
@@ -3464,7 +3482,7 @@
     \ClassWarning{\TUD@Class@Name}{%
       `\string\date' was not given\MessageBreak%
       Since a thesis is a self-contained work, an end\MessageBreak%
-      date should be specified by the author.\MessageBreak%
+      date should be specified by the author. \MessageBreak%
       Nevertheless, today's date is used%
     }%
   }{%
@@ -4319,7 +4337,7 @@
         \noexpand\paperheight=\the\paperheight\relax%
       }%
       \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto{\tud@x@geometry@parameter}{\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}%
@@ -5605,7 +5623,7 @@
       \ifdim##1<\ta@bcor\relax%
         \ClassWarning{\TUD@Class@Name}{%
           The selected page layout means that the\MessageBreak%
-          logo of TUD extends beyond the printing area.\MessageBreak%
+          logo of TUD extends beyond the printing area. \MessageBreak%
           The inner margin is smaller than BCOR\MessageBreak%
           (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak%
           Maybe you should decrease the current value\MessageBreak%
@@ -5825,7 +5843,7 @@
         \def\@tempa{##1}%
         \@tempswafalse%
       \else%
-        \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}%
+        \l@addto@macro\@tempb{,##1}%
       \fi%
     }%
     \let\@tempc\relax%
@@ -5834,9 +5852,9 @@
     \preto\tud@footlogo@fileoptions{%
       keepaspectratio,totalheight=\tud@dim@footlogoheight,%
     }%
-    \appto\tud@footlogo@fileoptions{\@tempb}%
+    \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}%
     \protected@edef\@tempc{%
-      \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}%
+      \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}%
     }%
     \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{%
       The given `\string\footlogo{\@tempa}' is too large.%
@@ -6647,13 +6665,13 @@
 }
 \newcommand*\tud@chapter@before@hook{}
 \newcommand*\tud@chapter@after@hook{}
-\pretocmd\scr@startchapter{%
+\pretocmd{\scr@startchapter}{%
   \tud@chapter@before@hook%
 }{}{\tud@patch@wrn{scr@startchapter}}
-\apptocmd\scr@@startchapter{%
+\apptocmd{\scr@@startchapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startchapter}}
-\apptocmd\scr@@startschapter{%
+\apptocmd{\scr@@startschapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startschapter}}
 \At@startsection{%
@@ -7234,7 +7252,7 @@
       `\string\makecover' together isn't supported. The\MessageBreak%
       option `titlepage=firstiscover' will be ignored. If you\MessageBreak%
       want to create an individual cover, you have to use\MessageBreak%
-      `\string\extratitle' instead of `\string\makecover'.\MessageBreak%
+      `\string\extratitle' instead of `\string\makecover'. \MessageBreak%
       See also the documentation of KOMA-Script%
     }%
     \@titlepageiscoverpagefalse%
@@ -7915,7 +7933,7 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size.\MessageBreak%
+        should additionally specify an explicit font size. \MessageBreak%
         See the manual for further information%
       }%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index ed1212d72a5..155f7b7b2a1 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-color.dtx
 \ProvidesPackage{tudscrcolor}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c 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 9ef12511257..45e93d7cfa2 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-book}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
@@ -129,9 +129,7 @@
 \newcommand*\dinfamily{\dinbn}
 \newcommand*\moreauthor{\authormore}
 \newcommand*\submitdate{\date}
-\newcommand*\supervisorII[1]{%
-  \expandafter\gdef\expandafter\@supervisor\expandafter{\@supervisor\and #1}%
-}
+\newcommand*\supervisorII[1]{\g@addto@macro\@supervisor{\and #1}}
 \newcommand*\supervisedby[1]{\gdef\supervisorname{#1}}
 \newcommand*\supervisedIIby[1]{\gdef\supervisorothername{#1}}
 \newcommand*\submittedon[1]{\gdef\datetext{#1}}
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
index e5993d56b09..cac48973398 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-poster}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c 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 4b85b0cd66e..4ac0cb3ab3e 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -77,7 +77,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c 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 79f33eede0d..ac6e1e0d378 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -57,14 +57,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -265,6 +265,8 @@
 }
 %%% From File: tudscr-manual.dtx
 \RequirePackage{scrhack}[2014/02/27]
+\PassOptionsToPackage{quiet}{marginnote}
+\RequirePackage{marginnote}[2012/03/29]
 \RequirePackage{xspace}[2009/10/20]
 \xspaceaddexceptions{"=}
 \newcommand*\vTUDScript{v\TUDScriptVersionNumber}
@@ -320,7 +322,6 @@
   \providecommand*\hypersource@ref@codeline[2][]{}
   \providecommand*\hypersource@ref@page[2][]{}
 }
-\RequirePackage{trimspaces}[2009/09/17]
 \newcommand*\hrfn[2]{%
   \href{#1}{\trim@spaces{#2}}%
   \footnote{%
@@ -530,7 +531,7 @@
   }%
 }
 \@doxcreatedescribes{Macro}
-\AfterPackage{marginnote}{%
+\AfterPackage*{marginnote}{%
   \renewcommand*\marginpar[2][]{%
     \IfArgIsEmpty{#1}{%
       \marginnote{#2}[\marginnotevskip]%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 9172689ce2f..6a283e0532c 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -60,7 +60,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -76,7 +76,7 @@
 }{}
 %%% From File: tudscr-fonts.dtx
 \ProvidesPackage{tudscrfonts}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (corporate design fonts)%
 ]
@@ -417,7 +417,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -451,8 +451,8 @@
     \PackageWarningNoLine{tudscrfonts}%
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -468,15 +468,7 @@
 \AtEndOfPackage%
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-    \PackageError{tudscrfonts}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      package `tudscrfonts'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
 }
 \csdef{tud@v@first}{0}
 \csdef{tud@v@2.00}{0}
@@ -508,6 +500,7 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -533,7 +526,7 @@
       \def\tud@reserved{%
         \PackageWarningNoLine{tudscrfonts}%
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -619,23 +612,14 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed%
     \PackageWarningNoLine{tudscrfonts}%
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
 }
 \AtEndOfPackage%
 {%
-  \TUD@key{fontspec}[]%
-  {%
-    \PackageError{tudscrfonts}%
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-      package `tudscrfonts'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -659,6 +643,26 @@
 \TUDExecuteOptions{%
 }
 \TUDProcessOptions\relax
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+    \noexpand\PackageError{tudscrfonts}%
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+        package `tudscrfonts'%
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
 %%% From File: tudscr-fonts.dtx
 \newcommand*\tud@cdfont@wrn{\global\let\tud@cdfont@wrn\relax}
 \newcommand*\tud@cdmath@wrn{\global\let\tud@cdmath@wrn\relax}
@@ -805,7 +809,7 @@
       \if@tud@cdmath@active%
         \PackageWarning{tudscrfonts}%
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -820,7 +824,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -852,7 +856,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -866,7 +870,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -909,7 +913,7 @@
 \newif\if@tud@x@bm@requested
 \@ifpackageloaded{bm}{%
   \PackageWarning{tudscrfonts}{%
-    Package `bm' must be loaded after `tudscrfonts'.\MessageBreak%
+    Package `bm' must be loaded after `tudscrfonts'. \MessageBreak%
     Otherwise the functionality can not be guaranteed%
   }%
 }{%
@@ -1168,7 +1172,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -1878,19 +1885,30 @@
 \newcommand*\mv@tudbold{}
 \newcommand*\mv@tuddin{}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index f60ad31436a..9498ef06277 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -59,14 +59,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
   \newcommand*\TUD@Class@Name{#1}%
@@ -375,7 +375,7 @@
 \TUD@UnwindPackage{hyperref}{%
   \ClassWarningNoLine{tudscrmanual}%
   {%
-    It is strongly recommended to load package `hyperref'.\MessageBreak%
+    It is strongly recommended to load package `hyperref'. \MessageBreak%
     Nevertheless, essential commands are rudimentarily\MessageBreak%
     defined. At least the package `url' is loaded%
   }%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index e11b4fa6d62..138f2aca026 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -73,14 +73,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -972,7 +972,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -1002,7 +1002,7 @@
 \newcommand*\TUD@deprecated@lengthcs[2][]{%
   \ifdim\csuse{#2}<\maxdimen\relax%
     \ClassWarning{\TUD@Class@Name}{%
-      Using the length `\@backslashchar#2' is deprecated.\MessageBreak%
+      Using the length `\@backslashchar#2' is deprecated. \MessageBreak%
       You should use option `#2' instead%
     }%
     \csxdef{tud@dim@#2}{\the\csuse{#2}}%
@@ -1018,8 +1018,8 @@
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -1035,15 +1035,7 @@
 \AtEndOfClass%
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
   \ifcsdef{scr@v@\TUD@Version@KOMA}{%
     \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
       \ClassError{\TUD@Class@Name}{%
@@ -1092,6 +1084,7 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1117,7 +1110,7 @@
       \def\tud@reserved{%
         \ClassWarningNoLine{\TUD@Class@Name}%
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -1270,23 +1263,14 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed%
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
 }
 \AtEndOfClass%
 {%
-  \TUD@key{fontspec}[]%
-  {%
-    \ClassError{\TUD@Class@Name}%
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -1314,6 +1298,26 @@
 }
 \TUDProcessOptions\relax
 \LoadClass{\TUD@Class@KOMA}[2018/03/30]
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+    \noexpand\ClassError{\noexpand\TUD@Class@Name}%
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+        class `\noexpand\TUD@Class@Name'%
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
 \newcommand*\tud@x@multicol@num{1}
@@ -1485,7 +1489,7 @@
       \if@tud@cdmath@active%
         \ClassWarning{\TUD@Class@Name}%
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -1500,7 +1504,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -1532,7 +1536,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -1546,7 +1550,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -1842,7 +1846,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -2552,19 +2559,30 @@
 \newcommand*\mv@tudbold{}
 \newcommand*\mv@tuddin{}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
@@ -3186,7 +3204,7 @@
 }
 \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}}
 \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}}
-\AfterPackage*{hyperref}{%
+\AfterPackage{hyperref}{%
   \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{%
     \gdef\@emailaddress{%
       \begingroup%
@@ -3243,7 +3261,7 @@
     \ClassWarning{\TUD@Class@Name}{%
       `\string\date' was not given\MessageBreak%
       Since a thesis is a self-contained work, an end\MessageBreak%
-      date should be specified by the author.\MessageBreak%
+      date should be specified by the author. \MessageBreak%
       Nevertheless, today's date is used%
     }%
   }{%
@@ -3912,7 +3930,7 @@
         \noexpand\paperheight=\the\paperheight\relax%
       }%
       \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto{\tud@x@geometry@parameter}{\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}%
@@ -5188,7 +5206,7 @@
       \ifdim##1<\ta@bcor\relax%
         \ClassWarning{\TUD@Class@Name}{%
           The selected page layout means that the\MessageBreak%
-          logo of TUD extends beyond the printing area.\MessageBreak%
+          logo of TUD extends beyond the printing area. \MessageBreak%
           The inner margin is smaller than BCOR\MessageBreak%
           (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak%
           Maybe you should decrease the current value\MessageBreak%
@@ -5408,7 +5426,7 @@
         \def\@tempa{##1}%
         \@tempswafalse%
       \else%
-        \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}%
+        \l@addto@macro\@tempb{,##1}%
       \fi%
     }%
     \let\@tempc\relax%
@@ -5417,9 +5435,9 @@
     \preto\tud@footlogo@fileoptions{%
       keepaspectratio,totalheight=\tud@dim@footlogoheight,%
     }%
-    \appto\tud@footlogo@fileoptions{\@tempb}%
+    \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}%
     \protected@edef\@tempc{%
-      \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}%
+      \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}%
     }%
     \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{%
       The given `\string\footlogo{\@tempa}' is too large.%
@@ -6414,7 +6432,7 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size.\MessageBreak%
+        should additionally specify an explicit font size. \MessageBreak%
         See the manual for further information%
       }%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 0460f67bc50..b5675928084 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -73,14 +73,14 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/17 v2.06b TUD-Script
-    ^^J#3 (#2)%
+  2019/08/20 v2.06c TUD-Script
+    #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
   \ifx\TUD@Class@Parent\@undefined%
@@ -1138,7 +1138,7 @@
   \ifcsundef{#1}{%
     \begingroup%
       \def\tud@res@a{%
-        The command `\@backslashchar#1' is deprecated.\MessageBreak%
+        The command `\@backslashchar#1' is deprecated. \MessageBreak%
       }%
       \def\tud@res@b##1@##2\@nil{%
         \IfArgIsEmpty{##2}{%
@@ -1168,7 +1168,7 @@
 \newcommand*\TUD@deprecated@lengthcs[2][]{%
   \ifdim\csuse{#2}<\maxdimen\relax%
     \ClassWarning{\TUD@Class@Name}{%
-      Using the length `\@backslashchar#2' is deprecated.\MessageBreak%
+      Using the length `\@backslashchar#2' is deprecated. \MessageBreak%
       You should use option `#2' instead%
     }%
     \csxdef{tud@dim@#2}{\the\csuse{#2}}%
@@ -1184,8 +1184,8 @@
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
       You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
+      this value is not supported. Because of this,\MessageBreak%
+      `tudscrver=first' was set%
     }%
     \renewcommand*\tud@v@comp{0}%
   }{%
@@ -1201,15 +1201,7 @@
 \AtEndOfClass%
 {%
   \RelaxFamilyKey[.comp]{TUD}{tudscrver}%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{tudscrver}%
   \ifcsdef{scr@v@\TUD@Version@KOMA}{%
     \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
       \ClassError{\TUD@Class@Name}{%
@@ -1258,6 +1250,7 @@
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
 \csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1283,7 +1276,7 @@
       \def\tud@reserved{%
         \ClassWarningNoLine{\TUD@Class@Name}%
         {%
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
           There's no defined macro `\string\tud@v@\@tempa'%
         }%
         \endgroup\@firstoftwo%
@@ -1447,23 +1440,14 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed%
     \ClassWarningNoLine{\TUD@Class@Name}%
     {%
-      The key `fontspec' is deprecated.\MessageBreak%
+      The key `fontspec' is deprecated. \MessageBreak%
       You should load the package `fontspec' manually%
     }%
   \fi%
 }
 \AtEndOfClass%
 {%
-  \TUD@key{fontspec}[]%
-  {%
-    \ClassError{\TUD@Class@Name}%
-      {Option `fontspec' too late}{%
-      Option `fontspec' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'\space%
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
+  \TUD@key@toolate{fontspec}%
   \if@tud@x@fontspec@requested%
     \RequirePackage{fontspec}[2017/01/24]%
   \fi%
@@ -1491,6 +1475,26 @@
 }
 \TUDProcessOptions\relax
 \LoadClass{\TUD@Class@KOMA}[2018/03/30]
+\newcommand*\TUD@key@toolate[1]{%
+  \csedef{tud@key@#1@error}{%
+    \noexpand\ClassError{\noexpand\TUD@Class@Name}%
+    {Option `#1' too late}{%
+      Option `#1' can only be set\space%
+      \ifcsname \@currname.\@currext-h@@k\endcsname%
+        as optional \MessageBreak argument while loading\space%
+        class `\noexpand\TUD@Class@Name'%
+      \else%
+        in the preamble
+      \fi%
+      \MessageBreak but you have tried to set it up later.%
+    }%
+  }%
+  \TUD@key{#1}[]%
+  {%
+    \csuse{tud@key@#1@error}
+    \FamilyKeyStateProcessed%
+  }%
+}
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
 \newcommand*\tud@x@multicol@num{1}
@@ -1662,7 +1666,7 @@
       \if@tud@cdmath@active%
         \ClassWarning{\TUD@Class@Name}%
         {%
-          Some math font encodings are missing.\MessageBreak%
+          Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
           either use this option by yourself or install\MessageBreak%
           all necessary fonts with a installation script\MessageBreak%
@@ -1677,7 +1681,7 @@
   \begingroup%
     \def\tud@res@a{%
       `#2' font\MessageBreak%
-      not found for `#1' encoding.\MessageBreak%
+      not found for `#1' encoding. \MessageBreak%
     }%
     \if@tud@x@fontspec@enabled%
       \ifstr{\encodingdefault}{#1}{%
@@ -1709,7 +1713,7 @@
           \else%
             install package `opensans'%
           \fi%
-          .\MessageBreak%
+          . \MessageBreak%
         }%
       \else%
         \ifstr{\encodingdefault}{#1}{%
@@ -1723,7 +1727,7 @@
           }%
           \appto\tud@res@a{%
             choose a possible encoding with package\MessageBreak%
-            `fontenc' (\tud@res@b).\MessageBreak%
+            `fontenc' (\tud@res@b). \MessageBreak%
           }%
         }{}%
       \fi%
@@ -2019,7 +2023,10 @@
         \ifcsundef{textrightarrow}{}{%
           \tud@cs@store{textrightarrow}%
           \renewrobustcmd*{\textrightarrow}{%
-            {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+            \begingroup%
+              \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+              \tud@cs@use{textrightarrow}%
+            \endgroup%
           }%
         }%
       }%
@@ -2729,19 +2736,30 @@
 \newcommand*\mv@tudbold{}
 \newcommand*\mv@tuddin{}
 \AfterPackage*{mathastext}{%
-  \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
-  \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
   \newrobustcmd*\tud@mathversion[1]{%
-    \tud@cs@use{mathversion}{#1}%
-    \if@tud@cdmath@active%
-      \ifstr{#1}{normal}{%
-        \MTversion@@{tudnormal}%
-      }{%
-        \ifstr{#1}{bold}{%
-          \MTversion@@{tudbold}%
-        }{}%
+    \begingroup%
+      \let\tud@res@a\relax%
+      \if@tud@cdmath@active%
+        \ifstr{#1}{normal}{%
+          \def\tud@res@a{tudnormal}%
+        }{%
+          \ifstr{#1}{bold}{%
+            \def\tud@res@a{tudbold}%
+          }{}%
+        }%
+      \fi%
+      \edef\tud@res@a{%
+        \endgroup%
+        \noexpand\tud@cs@restore{mathversion}%
+        \ifx\tud@res@a\relax%
+          \noexpand\mathversion{#1}%
+        \else%
+          \noexpand\MTversion*{\tud@res@a}%
+        \fi%
+        \noexpand\tud@cs@store{mathversion}%
+        \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
       }%
-    \fi%
+    \tud@res@a%
   }%
   \AtEndPreamble{%
     \tud@cs@store{mathversion}%
@@ -3331,7 +3349,7 @@
 }
 \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}}
 \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}}
-\AfterPackage*{hyperref}{%
+\AfterPackage{hyperref}{%
   \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{%
     \gdef\@emailaddress{%
       \begingroup%
@@ -3468,7 +3486,7 @@
     \ClassWarning{\TUD@Class@Name}{%
       `\string\date' was not given\MessageBreak%
       Since a thesis is a self-contained work, an end\MessageBreak%
-      date should be specified by the author.\MessageBreak%
+      date should be specified by the author. \MessageBreak%
       Nevertheless, today's date is used%
     }%
   }{%
@@ -4320,7 +4338,7 @@
         \noexpand\paperheight=\the\paperheight\relax%
       }%
       \tud@x@geometry@getlayout{\tud@res@a}%
-      \epreto{\tud@x@geometry@parameter}{\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}%
@@ -5606,7 +5624,7 @@
       \ifdim##1<\ta@bcor\relax%
         \ClassWarning{\TUD@Class@Name}{%
           The selected page layout means that the\MessageBreak%
-          logo of TUD extends beyond the printing area.\MessageBreak%
+          logo of TUD extends beyond the printing area. \MessageBreak%
           The inner margin is smaller than BCOR\MessageBreak%
           (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak%
           Maybe you should decrease the current value\MessageBreak%
@@ -5826,7 +5844,7 @@
         \def\@tempa{##1}%
         \@tempswafalse%
       \else%
-        \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}%
+        \l@addto@macro\@tempb{,##1}%
       \fi%
     }%
     \let\@tempc\relax%
@@ -5835,9 +5853,9 @@
     \preto\tud@footlogo@fileoptions{%
       keepaspectratio,totalheight=\tud@dim@footlogoheight,%
     }%
-    \appto\tud@footlogo@fileoptions{\@tempb}%
+    \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}%
     \protected@edef\@tempc{%
-      \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}%
+      \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}%
     }%
     \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{%
       The given `\string\footlogo{\@tempa}' is too large.%
@@ -6648,13 +6666,13 @@
 }
 \newcommand*\tud@chapter@before@hook{}
 \newcommand*\tud@chapter@after@hook{}
-\pretocmd\scr@startchapter{%
+\pretocmd{\scr@startchapter}{%
   \tud@chapter@before@hook%
 }{}{\tud@patch@wrn{scr@startchapter}}
-\apptocmd\scr@@startchapter{%
+\apptocmd{\scr@@startchapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startchapter}}
-\apptocmd\scr@@startschapter{%
+\apptocmd{\scr@@startschapter}{%
   \tud@chapter@after@hook%
 }{}{\tud@patch@wrn{scr@@startschapter}}
 \At@startsection{%
@@ -7235,7 +7253,7 @@
       `\string\makecover' together isn't supported. The\MessageBreak%
       option `titlepage=firstiscover' will be ignored. If you\MessageBreak%
       want to create an individual cover, you have to use\MessageBreak%
-      `\string\extratitle' instead of `\string\makecover'.\MessageBreak%
+      `\string\extratitle' instead of `\string\makecover'. \MessageBreak%
       See also the documentation of KOMA-Script%
     }%
     \@titlepageiscoverpagefalse%
@@ -7918,7 +7936,7 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size.\MessageBreak%
+        should additionally specify an explicit font size. \MessageBreak%
         See the manual for further information%
       }%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index 18ed90ecf40..2749c38cdf7 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -54,7 +54,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -79,7 +79,7 @@
 }{}
 %%% From File: tudscr-supervisor.dtx
 \ProvidesPackage{tudscrsupervisor}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (commands for supervisors)%
 ]
@@ -235,9 +235,9 @@
 }
 \newcommand\taskform[3][]{%
   \begin{task}[#1]%
-    \ifblank{#2}{}{\minisec{\objectivesname}#2}%
+    \ifblank{#2}{}{\minisec{\objectivesname}\smallskip#2}%
     \ifblank{#3}{}{%
-      \minisec{\focusname}%
+      \minisec{\focusname}\smallskip%
       \begin{itemize}\tud@RaggedRight%
         #3%
       \end{itemize}%
@@ -300,9 +300,9 @@
 }
 \newcommand\evaluationform[5][]{%
   \begin{evaluation}[#1]%
-    \ifblank{#2}{}{\minisec{\taskname}#2}%
-    \ifblank{#3}{}{\minisec{\contentname}#3}%
-    \ifblank{#4}{}{\minisec{\assessmentname}#4}%
+    \ifblank{#2}{}{\minisec{\taskname}\smallskip#2}%
+    \ifblank{#3}{}{\minisec{\contentname}\smallskip#3}%
+    \ifblank{#4}{}{\minisec{\assessmentname}\smallskip#4}%
     \ifblank{#5}{}{\def\@grade{#5}}%
   \end{evaluation}%
 }
@@ -353,7 +353,7 @@
       #2%
     }%
     \ifblank{#3}{}{%
-      \minisec{\focusname}%
+      \minisec{\focusname}\smallskip%
       \begin{itemize}\tud@RaggedRight%
       #3%
       \end{itemize}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
index 506c25c3524..f0aa20e795d 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+  \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -82,7 +82,7 @@
 }{}
 %%% From File: tudscr-manual.dtx
 \ProvidesPackage{tudscrtutorial}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (internal tutorials)%
 ]
@@ -221,7 +221,7 @@
 \TUD@UnwindPackage{hyperref}{%
   \PackageWarningNoLine{tudscrtutorial}%
   {%
-    It is strongly recommended to load package `hyperref'.\MessageBreak%
+    It is strongly recommended to load package `hyperref'. \MessageBreak%
     Nevertheless, essential commands are rudimentarily\MessageBreak%
     defined. At least the package `url' is loaded%
   }%
@@ -1195,8 +1195,12 @@
 \if@tempswa%
 \begin{filecontents*}{\tud@tut@temp-standalone.tex}
 \documentclass[english,ngerman]{tudscrreprt}
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\ifpdftex{
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+}{
+  \usepackage{fontspec}
+}
 \usepackage{babel}
 \usepackage{tudscrsupervisor}
 \usepackage{isodate}
diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
index cb60a1deb82..ec628f9ca97 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
 %% 
-%%   2019/07/17 v2.06b TUD-Script
+%%   2019/08/20 v2.06c TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-twocolfix.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{twocolfix}[%
-  2019/07/17 v2.06b TUD-Script
+  2019/08/20 v2.06c TUD-Script
   package
   (twocolumn layout bugfix)%
 ]