tudscr (14jan20)

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

36 files changed, 234 insertions, 273 deletions

diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex
index d5ba74a3bbc..8f5a3794263 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex
@@ -2,12 +2,12 @@
   english,ngerman,%
   BCOR=6mm,cdgeometry=no,DIV=13%
 ]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{isodate}
 \usepackage{blindtext}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex
index 9751d1c3d6e..368b0134ee5 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex
@@ -1,10 +1,10 @@
 \documentclass[ngerman]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage[math]{blindtext}
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex
index c93670d7e63..23f9b8c4eda 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex
@@ -1,10 +1,10 @@
 \documentclass[ngerman]{tudscrartcl}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{isodate}
 \usepackage{tudscrsupervisor}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex
index fd3e58d804f..7df7fccfa43 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex
@@ -1,6 +1,11 @@
 \documentclass[english,ngerman]{tudscrartcl}% andere Klassen möglich
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+\fi
 \usepackage{babel}
 \usepackage{microtype}
 
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex
index 532bf94bbd9..d88cd8a6da6 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex
@@ -1,6 +1,11 @@
 \documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+\fi
 \usepackage{babel}
 \usepackage{microtype}
 
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex
index 51ceaf28363..b62df43571f 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex
@@ -1,10 +1,10 @@
 \documentclass[ngerman]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{isodate}
 \usepackage{tudscrsupervisor}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex
index 61cb19989da..fb5c2f6276f 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex
@@ -4,12 +4,12 @@
   paper=A1,fontsize=22pt,%
   cdfoot=5ex,ddcfoot%
 ]{tudscrposter}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{blindtext}
 \usepackage{multicol}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex
index 114a6cbfd9d..4fe0b71e8ce 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex
@@ -1,10 +1,10 @@
 \documentclass[ngerman]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{isodate}
 \usepackage{tudscrsupervisor}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex
index 5d88a8c2bd3..e935bfcd8ed 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex
@@ -1,10 +1,10 @@
 \documentclass[ngerman,BCOR=4mm]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{isodate}
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex b/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex
index 83d092306eb..4d274ddd200 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex
@@ -1,11 +1,12 @@
 \documentclass[english,ngerman]{tudscrreprt}
 \usepackage{babel}
-\ifpdftex{
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{scrhack}
 \usepackage{tudscrsupervisor}
 
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex b/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex
index 87ea1b60562..5a8a13a5d3d 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex
@@ -102,8 +102,12 @@ könnte folgendermaßen aussehen:
 \begin{quoting}[rightmargin=0pt]
 \begin{Code}[escapechar=§]
 \documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\iftutex
+  \usepackage{fontspec}
+\else
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+\fi
 \usepackage{babel}
 §\dots§
 \end{Code}
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
index eae520f34a5..0dc90c5597a 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
@@ -1,10 +1,10 @@
 \documentclass[english,ngerman,ttfont=roboto]{tudscrmanual}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \lstset{%
   inputencoding=utf8,extendedchars=true,
   literate=%
@@ -29,7 +29,7 @@
   \endgroup%
 }
 \faculty{\cdurl}
-\date{23.10.2019}
+\date{14.01.2020}
 \author{%
   Falk Hanisch%
   \expandafter\emailaddress\expandafter{\tudscrmail}%
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex
index 92e081b5b67..2078d7da2f6 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex
@@ -1,10 +1,10 @@
 \documentclass[english,ngerman]{tudscrartcl}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 
 \usepackage{tudscrtutorial}
 \lstset{%
@@ -64,8 +64,13 @@ Pakete geladen.
 %
 \begin{Preamble}
 \documentclass[english,ngerman]{tudscrartcl}% andere Klassen möglich
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+\fi
 \usepackage{babel}
 \usepackage{microtype}
 
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 9f9625ab7ba..7f11fb3168f 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
@@ -1,10 +1,10 @@
 \documentclass[english,ngerman]{tudscrartcl}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 
 \usepackage{tudscrtutorial}
 \lstset{%
@@ -53,8 +53,13 @@ Pakete geladen.
 %
 \begin{Preamble}
 \documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich
-\usepackage[T1]{fontenc}
-\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{}
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
+  \usepackage[T1]{fontenc}
+  \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
+\fi
 \usepackage{babel}
 \usepackage{microtype}
 
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex
index 8e698889202..1cb217b7d1e 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex
@@ -3,12 +3,12 @@
   english,ngerman,%
   cdgeometry=no,DIV=12,automark%
 ]{tudscrartcl}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 
 \usepackage{tudscrtutorial}
 \lstset{%
@@ -285,12 +285,13 @@ Informationen zur Verwendung von \Package{hyphsubst} sowie zum Thema
 \emph{Worttrennung} finden.
 %
 \begin{Preamble}
-\ifpdftex{
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \end{Preamble}
 %
 Für die \KOMAScript-Klassen wird außerdem das Paket \Package{scrhack} 
@@ -2657,12 +2658,13 @@ Beginn einer Dokumentpräambel könnte folgendermaßen aussehen:
 %
 \begin{Hint}
 \documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§
-\ifpdftex{
+\usepackage{iftex}
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \end{Hint}
 %
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
index 818f3e00972..0c1c3f1f6ba 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
index 8bbe69e5723..7d65f4e5cbd 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{903}
+% \CheckSum{843}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-base.dtx}[2019/10/23 v2.06e TUD-Script\space%
+\ProvidesFile{tudscr-base.dtx}[2020/01/14 v2.06f TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -69,12 +69,12 @@
 %</dtx|package&base>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
@@ -140,91 +140,17 @@
 %
 % Das Paket \pkg{scrbase} wird zur Optionsdefinition benötigt, \pkg{scrlfile} 
 % für verschiedene Hooks vor sowie nach Klassen und Paketen.
-%    \begin{macrocode}
-\RequirePackage{scrbase}[2018/03/30]
-%    \end{macrocode}
-% \changes{v2.06e}{2019/10/23}{Bugfix für \pkg{scrlfile} \val{v3.27}}^^A
-% Das Paket \pkg{scrlfile} in der \KOMAScript-Version \val{v3.27} enthält einen 
-% Bug, der erst mit \val{v3.27a} gefixt wird.
-% \ToDo{Bugfix für \pkg{scrlfile} raus, v3.27a notwendig}[v3.27a]
-%    \begin{macrocode}
-\@ifpackageloaded{scrlfile}{%
-  \@ifpackagelater{scrlfile}{2019/10/13}{}{%
-    \renewcommand*{\scr@load@hook}[2]{%
-      \edef\scr@hookname{#1}%
-      \def\scr@cmd@hook{before}%
-      \ifx\scr@hookname\scr@cmd@hook
-        \expandafter\def\csname #2-l@ading\endcsname{#2}%
-      \fi
-      \let\scr@cmd@hook\@undefined
-      \@ifundefined{#2-@#1}{}{%
-        \@nameuse{#2-@#1}%
-        \expandafter\let\csname #2-@#1\endcsname\relax
-      }%
-      \edef\scr@hookname{#1}%
-      \def\scr@cmp@hook{after}%
-        \ifx\scr@hookname\scr@cmp@hook
-          \expandafter\let\csname #2-l@ading\endcsname\@undefined
-        \fi
-      \let\scr@hookname\@undefined
-    }%
-    \renewcommand*{\@@AfterClass}[2]{%
-      \@ifundefined{#2.\@clsextension-l@ading}{%
-        \@sAfterClass
-      }{%
-        \@AfterClass
-      }%
-      {#2}%
-    }%
-    \renewcommand*{\@@@AfterClass}[2]{%
-      \@ifundefined{#2.\@clsextension-l@ading}{%
-        \@ifclassloaded{#2}{%
-          \@sAfterClass
-        }{%
-          \AfterAtEndOfClass
-        }%
-      }{%
-        \AfterAtEndOfClass
-      }%
-      {#2}%
-    }%
-    \renewcommand*{\@@AfterPackage}[2]{%
-      \@ifundefined{#2.\@pkgextension-l@ading}{%
-        \@sAfterPackage
-      }{%
-        \@AfterPackage
-      }%
-      {#2}%
-    }%
-    \renewcommand*{\@@@AfterPackage}[2]{%
-      \@ifundefined{#2.\@pkgextension-l@ading}{%
-        \@ifpackageloaded{#2}{%
-          \@sAfterPackage
-        }{%
-          \@AfterAtEndOfPackage
-        }%
-      }{%
-        \@AfterAtEndOfPackage
-      }%
-      {#2}%
-    }%
-    \renewcommand*{\AfterAtEndOfPackage}[1]{%
-      \@ifpackageloaded{#1}{%
-        \@ifundefined{#1.\@pkgextension-l@ading}{%
-          \@gobbletwo
-        }{%
-          \@AfterAtEndOfPackage
-        }%
-      }{%
-        \@AfterAtEndOfPackage
-      }%
-      {#1}%
-    }%
-    \newcommand*{\@AfterAtEndOfPackage}[1]{%
-      \scr@set@load@hook{lateafter}{#1.\@pkgextension}%
-    }%
-  }%
-}{}
+% \ToDo{Provisorium entfernen}[v2.07]
+%    \begin{macrocode}
+\providecommand*{\ifstr}{\Ifstr}
+\providecommand*{\ifstrstart}{\Ifstrstart}
+\providecommand*{\ifisskip}{\Ifisskip}
+\providecommand*{\ifdimen}{\Ifdimen}
+\providecommand*{\ifisdimen}{\Ifisdimen}
+\providecommand*{\ifisdimension}{\Ifisdimension}
+\providecommand*{\ifnumber}{\Ifnumber}
+\RequirePackage{scrbase}[2019/12/23]
+\RequirePackage{iftex}[2019/11/07]
 %    \end{macrocode}
 % Die folgenden Pakete werden für die Manipulation bereits definierter
 % Makros sowie zur erweiterten Auswertung boolescher Ausdrücke benötigt.
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx
index c581f28f6b4..4bc961987d1 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -69,12 +69,12 @@
 %</dtx|package>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
index ece623438d5..41589561942 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{1452}
+% \CheckSum{1453}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-comp.dtx}[2019/10/23 v2.06e TUD-Script\space%
+\ProvidesFile{tudscr-comp.dtx}[2020/01/14 v2.06f TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -73,12 +73,12 @@
 %</dtx|package&identify>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
@@ -381,6 +381,8 @@
 % \changes{v2.06d}{2019/08/27}{neu}^^A
 % \begin{macro}{\tud@v@2.06e}
 % \changes{v2.06e}{2019/10/23}{neu}^^A
+% \begin{macro}{\tud@v@2.06f}
+% \changes{v2.06f}{2020/01/14}{neu}^^A
 % \begin{macro}{\tud@v@last}
 % \changes{v2.02}{2014/08/22}{neu}^^A
 % \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -422,9 +424,11 @@
 \csdef{tud@v@2.06c}{4}
 \csdef{tud@v@2.06d}{4}
 \csdef{tud@v@2.06e}{4}
+\csdef{tud@v@2.06f}{4}
 \csdef{tud@v@last}{4}
 %    \end{macrocode}
 % \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06f
 % \end{macro}^^A \tud@v@2.06e
 % \end{macro}^^A \tud@v@2.06d
 % \end{macro}^^A \tud@v@2.06c
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
index ef3754d43a9..eb2401bde07 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
index dbf9cb46b89..f56f953e97a 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
index 228304d9eef..c0fb49b8038 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{3123}
+% \CheckSum{3124}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -52,7 +52,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 % \fi
 %
-\ProvidesFile{tudscr-fonts.dtx}[2019/08/27 v2.06d TUD-Script\space%
+\ProvidesFile{tudscr-fonts.dtx}[2020/01/14 v2.06f TUD-Script\space%
 %
 % \iffalse
 %</dtx>
@@ -69,12 +69,12 @@
 %</dtx|package&identify>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
@@ -3889,7 +3889,7 @@
 % der Fall, weshalb hier etwas nachgeholfen werden muss, indem nach der Glyphe
 % schlichtweg ein Klammernpaar in der richtigen Kodierung eingefügt wird.
 %    \begin{macrocode}
-  \scr@ifluatex{%
+  \ifluatex%
     \begingroup%
       \def\tud@res@a{\if@tud@cdmath@active\fontencoding{LGR}\selectfont{}\fi}%
       \def\tud@res@b##1{%
@@ -3903,7 +3903,7 @@
       \tud@res@b{it#1}%
       \tud@res@b{up#1}%
     \endgroup%
-  }{}%
+  \fi%
 }
 %    \end{macrocode}
 % \end{macro}^^A \tud@cdmath@declare@greek@@lgr
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx
index 57017e11361..3ae42e3e833 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
index 4e6fe56ae79..3bf9ec030c3 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
index 954773033b1..d137660867c 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-localization.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
index 3249409e976..8346c60f7ce 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{4450}
+% \CheckSum{4457}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -69,12 +69,12 @@
 %</dtx|package&identify>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
@@ -4941,10 +4941,14 @@
 % \changes{v2.06}{2019/06/21}{neu}^^A
 % Für das verschachtelte Aufrufen von \app{pdflatex} bzw. \app{lualatex}.
 %    \begin{macrocode}
-\newcommand*\tud@latex@ext{}
-\ifpdftex%
-  {\def\tud@latex@ext{pdflatex\space}}%
-  {\def\tud@latex@ext{lualatex\space}}%
+\newcommand*\tud@latex@ext{pdflatex\space}
+\iftutex
+  \ifxetex
+    \renewcommand*\tud@latex@ext{xelatex\space}
+  \else
+    \renewcommand*\tud@latex@ext{lualatex\space}
+  \fi
+\fi
 %    \end{macrocode}
 % \end{macro}^^A \tud@latex@ext
 % \begin{macro}{\Tutorial}
@@ -5575,12 +5579,12 @@
 \if@tempswa%
 \begin{filecontents*}{\tud@tut@temp-standalone.tex}
 \documentclass[english,ngerman]{tudscrreprt}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrsupervisor}
 \usepackage{isodate}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx
index 158befa025f..0c9418e6695 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -72,12 +72,12 @@
 %</dtx|package>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
index 72beb47c8a2..4cc2abc463b 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
@@ -226,7 +226,7 @@
 \BeforeTOCHead[toc]{%
   \tud@x@bookmark@startatroot%
   \let\@tempc\relax%
-  \iftocfeature{toc}{totoc}{}{%
+  \Iftocfeature{toc}{totoc}{}{%
     \if@tud@bookmarks%
       \setuptoc{toc}{totoc}%
       \tud@cs@store{addtocontents}%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
index e6cb0a94e45..1faf4406734 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
index 7e73840d5c2..7645826e388 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -69,12 +69,12 @@
 %</dtx|package>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx
index a666c74ef5c..747cd157ff5 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
index b6ec69ff30c..1f46c490ca0 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -58,12 +58,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx
index ff86b18493a..26e9c620268 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -70,12 +70,12 @@
 %</dtx|package>
 %<*dtx>
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
index 8b58d0b69bf..f7bef28b006 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -110,7 +110,7 @@
       \def\@tempb##1 v##2 ##3\relax##4\relax{\gdef\TUDScriptVersionNumber{##2}}%
       \edef\@tempa{\TUD@Version}%
       \expandafter\@tempb\@tempa\relax? ? \relax\relax%
-      \gdef\TUD@Version@KOMA{3.25}%
+      \gdef\TUD@Version@KOMA{3.28}%
     }
   \else
     \newcommand*\TUD@Version@Check[1]{%
@@ -128,7 +128,7 @@
 %<*!(package|class)>
   \fi
 %</!(package|class)>
-  \TUD@Version@Check{2019/10/23 v2.06e TUD-Script}
+  \TUD@Version@Check{2020/01/14 v2.06f TUD-Script}
 \endgroup
 %    \end{macrocode}
 % \end{macro}^^A \TUDScriptVersionNumber
@@ -145,12 +145,12 @@
 %
 % \iffalse
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr.ins b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
index 3503f12938e..e29f63d0767 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr.ins
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr.ins
@@ -2,7 +2,7 @@
 %  TUD-Script -- Corporate Design of Technische Universitaet Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -53,7 +53,7 @@ TUD-Script -- Corporate Design of Technische Universitaet Dresden
 
 \TUD@Version
 
-Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
+Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 
 This file was generated from file(s) of the TUD-Script bundle.
 ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex b/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex
index f1bbcf9d9cb..aa11b0f1113 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex
+++ b/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex
@@ -5,12 +5,12 @@
 \endgroup
 \ProvidesFile{tudscrsource.tex}[\TUDScriptVersion (sourcedoc)]
 \documentclass[english,ngerman,xindy]{tudscrdoc}
-\ifpdftex{
+\iftutex
+  \usepackage{fontspec}
+\else
   \usepackage[T1]{fontenc}
   \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
-}{
-  \usepackage{fontspec}
-}
+\fi
 \usepackage{babel}
 \usepackage{tudscrfonts}
 \KOMAoptions{parskip=half-}