tudscr (18jul19)

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

31 files changed, 644 insertions, 493 deletions

diff --git a/Master/texmf-dist/doc/latex/tudscr/README.md b/Master/texmf-dist/doc/latex/tudscr/README.md
index 23c6548ecf5..7897ee223eb 100644
--- a/Master/texmf-dist/doc/latex/tudscr/README.md
+++ b/Master/texmf-dist/doc/latex/tudscr/README.md
@@ -4,7 +4,7 @@
 
  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 
- tudscr 2019/07/09 v2.06a
+ tudscr 2019/07/17 v2.06b
 
 ----------------------------------------------------------------------------
 
@@ -24,7 +24,8 @@ sein muss. Bei Fragen, Problemen und Anmerkungen sei entweder auf das
 LaTeX-Forum der Technischen Universität Dresden oder das GitHub-Repository 
 *tudscr* verwiesen:
 
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
+https://latex.wcms-file3.tu-dresden.de/phpBB3/
+
 https://github.com/tud-cd/tudscr/issues
 
 
@@ -54,6 +55,9 @@ Das Bundle beinhaltet:
 Versionen
 ---------
 
+**v2.06b** (2019/07/17)
++ Bugfix für nicht ordnungsgemäßes NFSS (New Font Selection Scheme)
+
 **v2.06a** (2019/07/09)
 + Bugfix für Paket **mathastext** bezüglich der Eingabekodierung
 
@@ -198,13 +202,14 @@ Versionen
 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.
+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 *tudscr* repository 
+of the Dresden University of Technology or the GitHub repository *tudscr*:
+
+https://latex.wcms-file3.tu-dresden.de/phpBB3/
 
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
 https://github.com/tud-cd/tudscr/issues
 
 
@@ -234,6 +239,9 @@ The bundle offers:
 Versions
 --------
 
+**v2.06b** (2019/07/17)
++ bug fix for improper NFSS (New Font Selection Scheme)
+
 **v2.06a** (2019/07/09)
 + bug fix for package **mathastext** regarding input encoding
 
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
index 573ab8a2e92..b4f79e1b9bd 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 b95fde28abf..adb014ac6b7 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 7f32b96191a..a85bac9fd9a 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 1097dc6bad3..a3116e4a459 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 0f401a3ef6e..3a37a3e23ee 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 b0b819b8f92..dd480f11eef 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 4d0433859b0..5be12081eb3 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{09.07.2019}
+\date{17.07.2019}
 \author{%
   Falk Hanisch%
   \expandafter\emailaddress\expandafter{\tudscrmail}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
index f932b224e2b..8a1b2cbbd32 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{790}
+% \CheckSum{824}
 % \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-base.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-base.dtx}[2019/07/17 v2.06b TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -379,45 +379,54 @@
 %    \end{macrocode}
 % \end{macro}^^A \tud@lowerstring
 %
-% \subsubsection{Erweiterung von \KOMAScript-Schriftelementen}
+% \subsubsection{Test auf vorhandene Dateien von Schriftdefinitionen}
 %
-% \begin{macro}{\tud@komafont@set}
-% \begin{macro}{\tud@komafont@unset}
-% \begin{macro}{\tud@komafont@reset}
-% \changes{v2.02}{2014/08/24}{neu}^^A
-% Es wird die Möglichkeit geschaffen, bestimmten Schriftelementen weitere
-% Eigenschaften mitzugeben. Damit dies optionsabhängig geschehen kann und
-% \cs{addtokomafont} nur einmalig verwendete werden muss, wird im Zweifelsfall
-% 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.
+% \begin{macro}{\tud@if@fdfileexists}
+% \changes{v2.06b}{2019/07/17}{neu}^^A
+% Der Befehl wird genutzt, um \file{\dots.fd}~Dateien zu suchen. Dabei muss 
+% beachtet werden, dass \cs{IfFileExists} auf unixoiden Betriebssystemen 
+% case-sensitiv ist.
 %    \begin{macrocode}
-\newcommand*\tud@komafont@set[2]{%
-  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
-  \csdef{tud@komafont@#1}{#2\nobreak}%
-}
+\newcommand*\tud@if@fdfileexists[2]{%
+  \begingroup%
 %    \end{macrocode}
-% Mit \cs{tud@komafont@unset} kann das angegebene Element wieder zurückgesetzt
-% werden. Dabei wird das hinzugefügte Makro auf \cs{relax} gesetzt.
+% Der Schalter \cs{if@tud@res@swa} wird \val{false} gesetzt, falls die Schrift 
+% gefunden wurde. Der zu prüfenden Schriftname wird dabei in unterschiedlichen 
+% Varianten getestet. Zunächst die Standardvariante in Kleinschreibung\dots
 %    \begin{macrocode}
-\newcommand*\tud@komafont@unset[1]{%
-  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
-  \csdef{tud@komafont@#1}{\relax}%
-}
+    \@tud@res@swatrue%
+    \tud@lowerstring\tud@res@a{#1#2.fd}%
+    \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
 %    \end{macrocode}
-% Werden \KOMAScript-Schriftelemente auf ihre Ausgangsdefinition zurückgesetzt, 
-% so kann diesen mit \cs{tud@komafont@reset} kann das passende Hilfsmakro
-% abermals zugewiesen werden.
+% \dots gefolgt von der Variante mit Kleinschreibung der Kodierung und dem 
+% Namen der Schrift wie angegeben\dots
 %    \begin{macrocode}
-\newcommand*\tud@komafont@reset[1]{%
-  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+    \if@tud@res@swa%
+      \tud@lowerstring\tud@res@a{#1}%
+      \edef\tud@res@a{\tud@res@a#2.fd}%
+      \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
+    \fi%
+%    \end{macrocode}
+% \dots abgeschlossen mit der Variante wie gegeben.
+%    \begin{macrocode}
+    \if@tud@res@swa%
+      \edef\tud@res@a{#1#2.fd}%
+      \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
+    \fi%
+%    \end{macrocode}
+% Wurde die Schriftdatei gefunden, ist \cs{if@tud@res@swa}|=|\cs{iffalse}.
+%    \begin{macrocode}
+    \if@tud@res@swa%
+      \aftergroup\@secondoftwo%
+    \else%
+      \aftergroup\@firstoftwo%
+    \fi%
+  \endgroup%
 }
 %    \end{macrocode}
-% \end{macro}^^A \tud@komafont@unset
-% \end{macro}^^A \tud@komafont@reset
-% \end{macro}^^A \tud@komafont@set
+% \end{macro}^^A \tud@if@fdfileexists
 %
-% \subsubsection{Optionsdefinition für \TUDScript}
+% \subsection{Optionsdefinition für \TUDScript}
 %
 % In Anlehnung an \KOMAScript{} werden hier Befehle zur Definition und
 % Ausführung unterschiedlicher Klassenoptionen mithilfe der Funktionen aus
@@ -1069,7 +1078,7 @@
 %    \end{macrocode}
 % \end{macro}^^A \TUD@parameter@error
 %
-% \subsubsection{Ausführung von paketspezifischem Quellcode}
+% \subsection{Ausführung von paketspezifischem Quellcode}
 %
 % Ab und an ist es notwendig, bestimmten Quelltext gezielt in Abhängigkeit vom
 % Ladezustand eines Paketes auszuführen.
@@ -1206,7 +1215,7 @@
 %</package&base>
 % \fi
 %
-% \subsubsection{Bedingt verzögerte Ausführung von \KOMAScript-Optionen}
+% \subsection{Bedingt verzögerte Ausführung von \KOMAScript-Optionen}
 %
 % \begin{macro}{\TUD@KOMAoptions}
 % \changes{v2.05}{2015/07/17}{neu}^^A
@@ -1250,10 +1259,56 @@
 % \end{macro}^^A \TUD@KOMAoptions
 %
 % \iffalse
+%<*class&option>
+% \fi
+%
+% \section{Zusätzliches für die \TUDScript-Klassen}
+%
+% \subsection{Erweiterung von \KOMAScript-Schriftelementen}
+%
+% \begin{macro}{\tud@komafont@set}
+% \begin{macro}{\tud@komafont@unset}
+% \begin{macro}{\tud@komafont@reset}
+% \changes{v2.02}{2014/08/24}{neu}^^A
+% Es wird die Möglichkeit geschaffen, bestimmten Schriftelementen weitere
+% Eigenschaften mitzugeben. Damit dies optionsabhängig geschehen kann und
+% \cs{addtokomafont} nur einmalig verwendete werden muss, wird im Zweifelsfall
+% 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}}}%
+  \csdef{tud@komafont@#1}{#2\nobreak}%
+}
+%    \end{macrocode}
+% Mit \cs{tud@komafont@unset} kann das angegebene Element wieder zurückgesetzt
+% werden. Dabei wird das hinzugefügte Makro auf \cs{relax} gesetzt.
+%    \begin{macrocode}
+\newcommand*\tud@komafont@unset[1]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{\relax}%
+}
+%    \end{macrocode}
+% Werden \KOMAScript-Schriftelemente auf ihre Ausgangsdefinition zurückgesetzt, 
+% so kann diesen mit \cs{tud@komafont@reset} kann das passende Hilfsmakro
+% abermals zugewiesen werden.
+%    \begin{macrocode}
+\newcommand*\tud@komafont@reset[1]{%
+  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+}
+%    \end{macrocode}
+% \end{macro}^^A \tud@komafont@unset
+% \end{macro}^^A \tud@komafont@reset
+% \end{macro}^^A \tud@komafont@set
+%
+% \iffalse
+%</class&option>
 %<*class&body>
 % \fi
 %
-% \section{Externe Pakete für die \TUDScript-Klassen}
+% \subsection{Externe Pakete für die \TUDScript-Klassen}
 %
 % \changes{v2.01}{2014/04/24}{Versionsanforderungen bei benötigten Paketen}^^A
 % \changes{v2.02}{2014/07/08}{Warnung bei Verwendung von \pkg{graphics}}^^A
@@ -1263,7 +1318,7 @@
 % Pakete möglichst gering zu halten und nur die wirklich notwendigen zu
 % verwenden.
 %
-% \subsection{Erweiterte Definition von Umgebungen mit dem Paket \pkg{environ}}
+% \subsubsection{Erweiterte Umgebungsdefinition mit dem Paket \pkg{environ}}
 %
 % Die \env{abstract}-Umgebung wird im Vergleich zu den \KOMAScript-Klassen
 % stark erweitert. Für diese sowie für die Umgebungen \env{declarations} und 
@@ -1303,7 +1358,7 @@
 % \end{macro}^^A \tud@x@multicol@check
 % \end{macro}^^A \tud@x@multicol@num
 %
-% \subsection{Pakete für Grafiken und Farben}
+% \subsubsection{Pakete für Grafiken und Farben}
 %
 % Es folgen die Pakete, welche bei Bedarf am Ende der Präambel geladen werden.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
index a6d80c921e4..59746192562 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{1468}
+% \CheckSum{1469}
 % \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/09 v2.06a TUD-Script\space%
+\ProvidesFile{tudscr-comp.dtx}[2019/07/17 v2.06b TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -391,6 +391,8 @@
 % \changes{v2.06}{2018/06/26}{neu}^^A
 % \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
 % \begin{macro}{\tud@v@last}
 % \changes{v2.02}{2014/08/22}{neu}^^A
 % \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -428,9 +430,11 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 %    \end{macrocode}
 % \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06b
 % \end{macro}^^A \tud@v@2.06a
 % \end{macro}^^A \tud@v@2.06
 % \end{macro}^^A \tud@v@2.05m
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
index f040cdfb6cb..443c30b367d 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{3088}
+% \CheckSum{3083}
 % \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/09 v2.06a TUD-Script\space%
+\ProvidesFile{tudscr-fonts.dtx}[2019/07/17 v2.06b TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -361,8 +361,10 @@
 % \changes{v2.04}{2015/03/10}{neu}^^A
 % \begin{macro}{\tud@cdfont@@check}
 % \changes{v2.06}{2018/07/12}{Auswahl der Schriftfamilie angepasst}^^A
+% \changes{v2.06b}{2019/07/17}{Verwendung von \cs{tud@if@fdfileexists}}^^A
 % \begin{macro}{\tud@cdfont@@@check}
 % \changes{v2.06}{2019/06/18}{neu}^^A
+% \changes{v2.06b}{2019/07/17}{Verwendung von \cs{tud@if@fdfileexists}}^^A
 % \begin{macro}{\tud@cdfont@missing}
 % \changes{v2.05l}{2017/03/29}{neu}^^A
 % Mit \cs{tud@cdfont@check} wird geprüft, ob die Schrift \OpenSans respektive 
@@ -443,35 +445,23 @@
 % Fließtext für die aktuelle Kodierung im gleichen Maße geprüft.
 %    \begin{macrocode}
     \def\tud@res@b##1##2{%
-      \begingroup%
 %    \end{macrocode}
 % Der Schalter \cs{if@tud@res@swa} wird \val{false} gesetzt, falls die Schrift 
 % gefunden wurde. Der zu prüfenden Schriftname wird dabei in unterschiedlichen 
 % Varianten getestet, da \cs{IfFileExists} auf unixoiden Betriebssystemen 
 % case-sensitiv ist. 
 %    \begin{macrocode}
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
+      \tud@if@fdfileexists{##1}{##2}{}{%
 %    \end{macrocode}
 % Existiert die Schrift nicht, wird die entsprechende Warnung ausgegeben.
 %    \begin{macrocode}
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -496,15 +486,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
 %    \end{macrocode}
@@ -2566,7 +2555,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -2816,13 +2805,13 @@
 %    \begin{macrocode}
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -2849,18 +2838,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -3150,15 +3139,44 @@
 % Für die Schriftfamilie \OpenSans existieren leider bisher keine Kodierung für 
 % den Mathematikmodus (\val{OML}, \val{OMS}, \val{OMX}), weshalb hierfür das 
 % Paket \pkg{mathastext} genutzt wird, um trotzdem einen mathematischen Satz zu 
-% ermöglichen.
+% ermöglichen. Dabei wird die Computer~Modern in der \val{LGR}~Kodierung 
+% zwingend benötigt.
 %    \begin{macrocode}
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
     \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+%<*class>
+          \ClassWarningNoLine{\TUD@Class@Name}%
+%</class>
+%<*package>
+          \PackageWarningNoLine{tudscrfonts}%
+%</package>
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
 %    \end{macrocode}
-% Um die Mathematikschriften suaber zu definieren, ist das Laden von bestimmten
+% Um die Mathematikschriften sauber zu definieren, ist das Laden von bestimmten
 % Paketen durch den Anwender ungünstig. Deshalb wird für diesen Fall eine 
 % Warnung ausgegeben.
 %    \begin{macrocode}
+  \if@tud@res@swa%
+    \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
 %<*class>
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
index 8d642e11ce0..1c6b133d34d 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{4472}
+% \CheckSum{4470}
 % \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-manual.dtx}[2019/06/28 v2.06 TUD-Script\space%
+\ProvidesFile{tudscr-manual.dtx}[2019/07/17 v2.06b TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -191,9 +191,6 @@
 %    \begin{macrocode}
 \newcommand*\tud@english[1]{#1}
 \AtBeginDocument{%
-%<*doc>
-  \providecommand*\iflanguageloaded[3]{#3}%
-%</doc>
   \iflanguageloaded{english}{%
     \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
   }{}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
index 732745bb7f4..fc9207026db 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{147}
+% \CheckSum{135}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -128,10 +128,7 @@
 %<*!(package|class)>
   \fi
 %</!(package|class)>
-%    \end{macrocode}
-% \ToDo{Version eintragen}[Release]
-%    \begin{macrocode}
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 %    \end{macrocode}
 % \end{macro}^^A \TUDScriptVersionNumber
@@ -310,19 +307,12 @@
 %<*package|class>
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-%<*!doc>
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-%</!doc>
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-%<*!doc>
-      }%
-%</!doc>
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %</package|class>
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr.ins b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
index dd459ac6677..c1e7932c2ba 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr.ins
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
@@ -81,6 +81,7 @@ The current maintainer and author of this work is Falk Hanisch.
   \file{tudscrbook.cls}{%
     \from{tudscr-version.dtx}{class,book}%
     \from{tudscr-base.dtx}{class,book,load}%
+    \from{tudscr-base.dtx}{class,book,option}%
     \from{tudscr-fonts.dtx}{class,book,option}%
     \from{tudscr-area.dtx}{class,book,option}%
     \from{tudscr-pagestyle.dtx}{class,book,option}%
@@ -105,6 +106,7 @@ The current maintainer and author of this work is Falk Hanisch.
   \file{tudscrreprt.cls}{%
     \from{tudscr-version.dtx}{class,report}%
     \from{tudscr-base.dtx}{class,report,load}%
+    \from{tudscr-base.dtx}{class,report,option}%
     \from{tudscr-fonts.dtx}{class,report,option}%
     \from{tudscr-area.dtx}{class,report,option}%
     \from{tudscr-pagestyle.dtx}{class,report,option}%
@@ -129,6 +131,7 @@ The current maintainer and author of this work is Falk Hanisch.
   \file{tudscrartcl.cls}{%
     \from{tudscr-version.dtx}{class,article}%
     \from{tudscr-base.dtx}{class,article,load}%
+    \from{tudscr-base.dtx}{class,article,option}%
     \from{tudscr-fonts.dtx}{class,article,option}%
     \from{tudscr-area.dtx}{class,article,option}%
     \from{tudscr-pagestyle.dtx}{class,article,option}%
@@ -153,6 +156,7 @@ The current maintainer and author of this work is Falk Hanisch.
   \file{tudscrposter.cls}{%
     \from{tudscr-version.dtx}{class,poster}%
     \from{tudscr-base.dtx}{class,poster,load}%
+    \from{tudscr-base.dtx}{class,poster,option}%
     \from{tudscr-fonts.dtx}{class,poster,option}%
     \from{tudscr-area.dtx}{class,poster,option}%
     \from{tudscr-pagestyle.dtx}{class,poster,option}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index dde66ea34ce..70902c7d10b 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -15,7 +15,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -58,26 +58,23 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{fix-tudscrfonts}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package for font fixes
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index ccbff40817a..e85f3242023 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b 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/09 v2.06a TUD-Script
+  2019/07/17 v2.06b 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 344ec1c7854..56ec33aa249 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
@@ -6,6 +6,7 @@
 %%
 %% tudscr-version.dtx  (with options: `class,article')
 %% tudscr-base.dtx  (with options: `class,article,load')
+%% tudscr-base.dtx  (with options: `class,article,option')
 %% tudscr-fonts.dtx  (with options: `class,article,option')
 %% tudscr-area.dtx  (with options: `class,article,option')
 %% tudscr-pagestyle.dtx  (with options: `class,article,option')
@@ -29,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -72,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -102,21 +103,30 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
 \RequirePackage{tudscrbase}[\TUD@Version]
 \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}}
 \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions}
+%%% From File: tudscr-base.dtx
+\newcommand*\tud@komafont@set[2]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{#2\nobreak}%
+}
+\newcommand*\tud@komafont@unset[1]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{\relax}%
+}
+\newcommand*\tud@komafont@reset[1]{%
+  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+}
 %%% From File: tudscr-fonts.dtx
 \PreventPackageFromLoading[%
   \ClassWarning{\TUD@Class@Name}{%
@@ -1175,6 +1185,7 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1529,26 +1540,14 @@
     }%
   \else%
     \def\tud@res@b##1##2{%
-      \begingroup%
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+      \tud@if@fdfileexists{##1}{##2}{}{%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -1565,15 +1564,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
   \if@tud@res@swa\else%
@@ -2448,7 +2446,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -2533,13 +2531,13 @@
     }{}%
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -2557,18 +2555,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -2668,7 +2666,30 @@
   }%
 }
 \newcommand*\tud@cdmath@init{%
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
+    \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+          \ClassWarningNoLine{\TUD@Class@Name}%
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
+  \if@tud@res@swa%
     \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index e31586220c2..605da2f997d 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,26 +52,23 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
 \ProvidesPackage{tudscrbase}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (basics for the bundle)%
 ]
@@ -165,16 +162,26 @@
     \expandafter\def\expandafter #1\expandafter{#1}%
   }%
 }
-\newcommand*\tud@komafont@set[2]{%
-  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
-  \csdef{tud@komafont@#1}{#2\nobreak}%
-}
-\newcommand*\tud@komafont@unset[1]{%
-  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
-  \csdef{tud@komafont@#1}{\relax}%
-}
-\newcommand*\tud@komafont@reset[1]{%
-  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+\newcommand*\tud@if@fdfileexists[2]{%
+  \begingroup%
+    \@tud@res@swatrue%
+    \tud@lowerstring\tud@res@a{#1#2.fd}%
+    \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
+    \if@tud@res@swa%
+      \tud@lowerstring\tud@res@a{#1}%
+      \edef\tud@res@a{\tud@res@a#2.fd}%
+      \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
+    \fi%
+    \if@tud@res@swa%
+      \edef\tud@res@a{#1#2.fd}%
+      \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}%
+    \fi%
+    \if@tud@res@swa%
+      \aftergroup\@secondoftwo%
+    \else%
+      \aftergroup\@firstoftwo%
+    \fi%
+  \endgroup%
 }
 \DefineFamily{TUD}
 \newcommand*\TUDProcessOptions{\FamilyProcessOptions{TUD}}
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 4ef4de020be..59c992a596d 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -6,6 +6,7 @@
 %%
 %% tudscr-version.dtx  (with options: `class,book')
 %% tudscr-base.dtx  (with options: `class,book,load')
+%% tudscr-base.dtx  (with options: `class,book,option')
 %% tudscr-fonts.dtx  (with options: `class,book,option')
 %% tudscr-area.dtx  (with options: `class,book,option')
 %% tudscr-pagestyle.dtx  (with options: `class,book,option')
@@ -29,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -72,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -102,21 +103,30 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
 \RequirePackage{tudscrbase}[\TUD@Version]
 \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}}
 \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions}
+%%% From File: tudscr-base.dtx
+\newcommand*\tud@komafont@set[2]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{#2\nobreak}%
+}
+\newcommand*\tud@komafont@unset[1]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{\relax}%
+}
+\newcommand*\tud@komafont@reset[1]{%
+  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+}
 %%% From File: tudscr-fonts.dtx
 \PreventPackageFromLoading[%
   \ClassWarning{\TUD@Class@Name}{%
@@ -1243,6 +1253,7 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1608,26 +1619,14 @@
     }%
   \else%
     \def\tud@res@b##1##2{%
-      \begingroup%
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+      \tud@if@fdfileexists{##1}{##2}{}{%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -1644,15 +1643,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
   \if@tud@res@swa\else%
@@ -2527,7 +2525,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -2612,13 +2610,13 @@
     }{}%
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -2636,18 +2634,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -2747,7 +2745,30 @@
   }%
 }
 \newcommand*\tud@cdmath@init{%
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
+    \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+          \ClassWarningNoLine{\TUD@Class@Name}%
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
+  \if@tud@res@swa%
     \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index e47abb819ff..ed1212d72a5 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,26 +52,23 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-color.dtx
 \ProvidesPackage{tudscrcolor}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b 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 5c11c0a0eb5..9ef12511257 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -70,20 +70,17 @@
 \fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-book}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
index 4927a9cf7f6..e5993d56b09 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -70,20 +70,17 @@
 \fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-poster}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b 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 0efdf9d6656..4b85b0cd66e 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -67,20 +67,17 @@
 \fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b 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 2c96fad574f..79f33eede0d 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -57,13 +57,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -87,11 +87,12 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
@@ -270,7 +271,6 @@
 \newcommand*\vKOMAScript{v\TUD@Version@KOMA}
 \newcommand*\tud@english[1]{#1}
 \AtBeginDocument{%
-  \providecommand*\iflanguageloaded[3]{#3}%
   \iflanguageloaded{english}{%
     \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
   }{}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 1cafff8cf00..9172689ce2f 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -60,26 +60,23 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-fonts.dtx
 \ProvidesPackage{tudscrfonts}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (corporate design fonts)%
 ]
@@ -510,6 +507,7 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -768,26 +766,14 @@
     }%
   \else%
     \def\tud@res@b##1##2{%
-      \begingroup%
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+      \tud@if@fdfileexists{##1}{##2}{}{%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -804,15 +790,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
   \if@tud@res@swa\else%
@@ -1693,7 +1678,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -1778,13 +1763,13 @@
     }{}%
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -1802,18 +1787,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -1913,7 +1898,30 @@
   }%
 }
 \newcommand*\tud@cdmath@init{%
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
+    \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+          \PackageWarningNoLine{tudscrfonts}%
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
+  \if@tud@res@swa%
     \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index 0c1af5f519c..f60ad31436a 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -59,13 +59,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
@@ -87,15 +87,12 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-manual.dtx
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index 1b2be34bca2..e11b4fa6d62 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
@@ -6,6 +6,7 @@
 %%
 %% tudscr-version.dtx  (with options: `class,poster')
 %% tudscr-base.dtx  (with options: `class,poster,load')
+%% tudscr-base.dtx  (with options: `class,poster,option')
 %% tudscr-fonts.dtx  (with options: `class,poster,option')
 %% tudscr-area.dtx  (with options: `class,poster,option')
 %% tudscr-pagestyle.dtx  (with options: `class,poster,option')
@@ -29,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -72,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -102,21 +103,30 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
 \RequirePackage{tudscrbase}[\TUD@Version]
 \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}}
 \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions}
+%%% From File: tudscr-base.dtx
+\newcommand*\tud@komafont@set[2]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{#2\nobreak}%
+}
+\newcommand*\tud@komafont@unset[1]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{\relax}%
+}
+\newcommand*\tud@komafont@reset[1]{%
+  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+}
 %%% From File: tudscr-fonts.dtx
 \PreventPackageFromLoading[%
   \ClassWarning{\TUD@Class@Name}{%
@@ -1081,6 +1091,7 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1435,26 +1446,14 @@
     }%
   \else%
     \def\tud@res@b##1##2{%
-      \begingroup%
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+      \tud@if@fdfileexists{##1}{##2}{}{%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -1471,15 +1470,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
   \if@tud@res@swa\else%
@@ -2354,7 +2352,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -2439,13 +2437,13 @@
     }{}%
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -2463,18 +2461,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -2574,7 +2572,30 @@
   }%
 }
 \newcommand*\tud@cdmath@init{%
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
+    \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+          \ClassWarningNoLine{\TUD@Class@Name}%
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
+  \if@tud@res@swa%
     \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 47657f91a21..0460f67bc50 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
@@ -6,6 +6,7 @@
 %%
 %% tudscr-version.dtx  (with options: `class,report')
 %% tudscr-base.dtx  (with options: `class,report,load')
+%% tudscr-base.dtx  (with options: `class,report,option')
 %% tudscr-fonts.dtx  (with options: `class,report,option')
 %% tudscr-area.dtx  (with options: `class,report,option')
 %% tudscr-pagestyle.dtx  (with options: `class,report,option')
@@ -29,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2019/07/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -72,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -102,21 +103,30 @@
 \providecommand*\TUDClassName{\TUDScriptClassName}
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-base.dtx
 \RequirePackage{tudscrbase}[\TUD@Version]
 \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}}
 \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions}
+%%% From File: tudscr-base.dtx
+\newcommand*\tud@komafont@set[2]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{#2\nobreak}%
+}
+\newcommand*\tud@komafont@unset[1]{%
+  \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}%
+  \csdef{tud@komafont@#1}{\relax}%
+}
+\newcommand*\tud@komafont@reset[1]{%
+  \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}%
+}
 %%% From File: tudscr-fonts.dtx
 \PreventPackageFromLoading[%
   \ClassWarning{\TUD@Class@Name}{%
@@ -1247,6 +1257,7 @@
 \csdef{tud@v@2.05m}{3}
 \csdef{tud@v@2.06}{4}
 \csdef{tud@v@2.06a}{4}
+\csdef{tud@v@2.06b}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1612,26 +1623,14 @@
     }%
   \else%
     \def\tud@res@b##1##2{%
-      \begingroup%
-        \@tud@res@swatrue%
-        \tud@lowerstring\tud@res@b{##1##2.fd}%
-        \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \if@tud@res@swa%
-          \tud@lowerstring\tud@res@b{##1}%
-          \edef\tud@res@b{\tud@res@b##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \if@tud@res@swa%
-          \edef\tud@res@b{##1##2.fd}%
-          \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}%
-        \fi%
-        \edef\tud@res@a{%
-          \endgroup%
-          \if@tud@res@swa%
-            \noexpand\tud@res@a{\tud@res@b}%
-          \fi%
-        }%
-      \tud@res@a%
+      \tud@if@fdfileexists{##1}{##2}{}{%
+        \begingroup%
+          \edef\tud@res@a{%
+            \endgroup%
+            \noexpand\tud@res@a{##1##2.fd}%
+          }%
+        \tud@res@a%
+      }%
     }%
     \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}%
   \fi%
@@ -1648,15 +1647,14 @@
     \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}%
   }%
   \def\tud@res@b##1##2{%
-    \begingroup%
-      \tud@lowerstring\tud@res@b{##1##2.fd}%
-      \edef\tud@res@a{%
-        \endgroup%
-        \noexpand\IfFileExists{\tud@res@b}{}{%
-          \noexpand\tud@res@a{##1}{\tud@res@b}%
+    \tud@if@fdfileexists{##1}{##2}{}{%
+      \begingroup%
+        \edef\tud@res@a{%
+          \endgroup%
+          \noexpand\tud@res@a{##1}{##1##2.fd}%
         }%
-      }%
-    \tud@res@a%
+      \tud@res@a%
+    }%
   }%
   \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}%
   \if@tud@res@swa\else%
@@ -2531,7 +2529,7 @@
   }%
   \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}%
   \tud@if@issymbolfont{tuditgrk}{%
-    \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}%
+    \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}%
   }{%
     \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}%
   }%
@@ -2616,13 +2614,13 @@
     }{}%
     \let\tud@res@a\@empty%
     \if@tud@lgrgreeks%
-      \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{%
+      \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{%
         \def\tud@res@a{\tud@cs@use{familydefault}}%
       }{%
-        \IfFileExists{lgr\tud@math@letters@fam.fd}{%
+        \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{%
           \let\tud@res@a\tud@math@letters@fam%
         }{%
-          \IfFileExists{lgr\tud@math@operators@fam.fd}{%
+          \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{%
             \let\tud@res@a\tud@math@operators@fam%
           }{}%
         }%
@@ -2640,18 +2638,18 @@
       {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}%
     \let\tud@res@c\@empty%
     \def\tud@res@b##1##2{%
-      \ifcsundef{it##1}{%
-        \eappto\tud@res@c{%
-          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
-              {\noexpand\mathalpha}{tuditgrk}{##2}%
-        }%
-      }{}%
       \ifcsundef{up##1}{%
         \eappto\tud@res@c{%
           \noexpand\DeclareMathSymbol{\csname up##1\endcsname}%
               {\noexpand\mathalpha}{tudupgrk}{##2}%
         }%
       }{}%
+      \ifcsundef{it##1}{%
+        \eappto\tud@res@c{%
+          \noexpand\DeclareMathSymbol{\csname it##1\endcsname}%
+              {\noexpand\mathalpha}{tuditgrk}{##2}%
+        }%
+      }{}%
     }%
     \tud@res@b{Gamma}{71}%
     \tud@res@b{Delta}{68}%
@@ -2751,7 +2749,30 @@
   }%
 }
 \newcommand*\tud@cdmath@init{%
+  \@tud@res@swafalse%
   \if@tud@cdfont@fam@exist%
+    \@tud@res@swatrue%
+    \if@tud@cdoldfont@active\else%
+      \tud@if@fdfileexists{LGR}{cmr}{}{%
+        \@tud@res@swafalse%
+        \def\tud@res@a{%
+          \ClassWarningNoLine{\TUD@Class@Name}%
+          {%
+            The packages `cbfonts/cbgreek' and\MessageBreak%
+            `cbfonts-fd' have to be installed for using\MessageBreak%
+            corporate design fonts in math mode. As they\MessageBreak%
+            are not, standard math versions are applied%
+          }%
+        }%
+        \if@tud@cdmath@active%
+          \tud@res@a%
+        \else%
+          \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}%
+        \fi%
+      }%
+    \fi%
+  \fi%
+  \if@tud@res@swa%
     \if@tud@cdoldfont@active\else%
       \if@tud@cdmath@active%
         \def\tud@res@a##1{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index 4e39d66a3cb..18ed90ecf40 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -54,7 +54,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -69,20 +69,17 @@
 \fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-supervisor.dtx
 \ProvidesPackage{tudscrsupervisor}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (commands for supervisors)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
index 2423a8c8ad4..506c25c3524 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2019/07/09 v2.06a TUD-Script}
+  \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -72,20 +72,17 @@
 \fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
-    \begingroup%
-      \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}%
-      \tud@ifdin{%
-        \edef\tud@res@a{\tud@res@b{SCRIPT}}%
-      }{%
-        \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}%
-      }%
-    \expandafter\endgroup\tud@res@a%
-    \csname xspace\endcsname%
+    \textsf{%
+      T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+    }%
+    \ifcsname xspace\endcsname%
+      \xspace%
+    \fi%
   }%
 }{}
 %%% From File: tudscr-manual.dtx
 \ProvidesPackage{tudscrtutorial}[%
-  2019/07/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (internal tutorials)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
index ccf4a8c7dd4..cb60a1deb82 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/09 v2.06a TUD-Script
+%%   2019/07/17 v2.06b 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/09 v2.06a TUD-Script
+  2019/07/17 v2.06b TUD-Script
   package
   (twocolumn layout bugfix)%
 ]