tudscr (4apr21)

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

17 files changed, 85 insertions, 72 deletions

diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index 0d973dca846..d94db0692cc 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -73,7 +73,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{fix-tudscrfonts}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package for font fixes
   (compatibility for old tud(scr) classes)%
 ]
@@ -98,7 +98,7 @@
   \fi%
 }
 %%% From File: tudscr-misc.dtx
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{tudscrfonts}}
+\DeclareOption*{\expandafter\PassOptionsToPackage\expandafter{\CurrentOption}{tudscrfonts}}
 \TUDExecuteOptions{%
   headings=heavy%
 }
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index cd7ffb48948..5711425e978 100644
--- a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
@@ -8,7 +8,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-mathswap.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathswap}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l 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 1a510b64a44..916f500b6d8 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -1021,7 +1021,7 @@
 }
 \newcommand*\tud@x@scr@checkoptions{%
   \expandafter\tud@x@scr@pt\CurrentOption pt\@nil%
-  \PassOptionsToClass{\CurrentOption}{\TUD@Class@KOMA}%
+  \expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@KOMA}%
 }
 \newcommand*\tud@x@scr@pt{}
 \def\tud@x@scr@pt #1pt#2\@nil{%
@@ -1187,6 +1187,7 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1589,7 +1590,7 @@
   \if@tud@res@swa\else%
     \AtBeginDocument{%
       \if@tud@cdmath@active%
-        \ClassWarning{\TUD@Class@Name}%
+        \ClassWarningNoLine{\TUD@Class@Name}%
         {%
           Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
@@ -5103,6 +5104,7 @@
 \if@tud@x@standalone@crop
   \PreventPackageFromLoading{scrlayer-scrpage}%
 \else
+  \PassOptionsToPackage{automark}{scrlayer-scrpage}%
   \AtEndPreamble{\RequirePackage{scrlayer-scrpage}[2020/09/21]}%
 \fi
 \AfterPackage{scrlayer-scrpage}{%
@@ -5413,6 +5415,7 @@
 }{}{\tud@patch@wrn{pagestyle}}
 \tud@cs@store{pagestyle}
 \renewcommand*\pagestyle[1]{%
+  \csuse{ps@#1}%
   \AfterAtEndOfPackage*{scrlayer-scrpage}{\pagestyle{#1}}%
 }
 \BeforePackage{scrlayer-scrpage}{%
@@ -7642,8 +7645,8 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size. \MessageBreak%
-        See the manual for further information%
+        should explicitly specify an font size. See the\MessageBreak%
+        manual for further information%
       }%
     \fi%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index 8535e05bcfe..255deb423b7 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-base.dtx
 \ProvidesPackage{tudscrbase}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package
   (basics for the bundle)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 072a295d7bb..9d445c83f49 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -1089,7 +1089,7 @@
 }
 \newcommand*\tud@x@scr@checkoptions{%
   \expandafter\tud@x@scr@pt\CurrentOption pt\@nil%
-  \PassOptionsToClass{\CurrentOption}{\TUD@Class@KOMA}%
+  \expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@KOMA}%
 }
 \newcommand*\tud@x@scr@pt{}
 \def\tud@x@scr@pt #1pt#2\@nil{%
@@ -1255,6 +1255,7 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1668,7 +1669,7 @@
   \if@tud@res@swa\else%
     \AtBeginDocument{%
       \if@tud@cdmath@active%
-        \ClassWarning{\TUD@Class@Name}%
+        \ClassWarningNoLine{\TUD@Class@Name}%
         {%
           Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
@@ -5185,6 +5186,7 @@
 \if@tud@x@standalone@crop
   \PreventPackageFromLoading{scrlayer-scrpage}%
 \else
+  \PassOptionsToPackage{automark}{scrlayer-scrpage}%
   \AtEndPreamble{\RequirePackage{scrlayer-scrpage}[2020/09/21]}%
 \fi
 \AfterPackage{scrlayer-scrpage}{%
@@ -5496,6 +5498,7 @@
 }{}{\tud@patch@wrn{pagestyle}}
 \tud@cs@store{pagestyle}
 \renewcommand*\pagestyle[1]{%
+  \csuse{ps@#1}%
   \AfterAtEndOfPackage*{scrlayer-scrpage}{\pagestyle{#1}}%
 }
 \BeforePackage{scrlayer-scrpage}{%
@@ -8031,8 +8034,8 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size. \MessageBreak%
-        See the manual for further information%
+        should explicitly specify an font size. See the\MessageBreak%
+        manual for further information%
       }%
     \fi%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index 0e216f0e7bd..2f0280cbd19 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
 }{}
 %%% From File: tudscr-color.dtx
 \ProvidesPackage{tudscrcolor}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l 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 1a64f186e79..a6d2cf271d9 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
@@ -12,7 +12,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-book}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
@@ -116,7 +116,7 @@
   \fi%
 }
 %%% From File: tudscr-misc.dtx
-\DeclareOption*{\TUDoptions{\CurrentOption}}
+\DeclareOption*{\expandafter\TUDoptions\expandafter{\CurrentOption}}
 \TUDExecuteOptions{%
 }
 \TUDProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
index 0454a30f175..b9bb31b95b6 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
@@ -12,7 +12,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -55,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -80,7 +80,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-poster}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
@@ -128,7 +128,7 @@
   \fi%
 }
 %%% From File: tudscr-misc.dtx
-\DeclareOption*{\TUDoptions{\CurrentOption}}
+\DeclareOption*{\expandafter\TUDoptions\expandafter{\CurrentOption}}
 \TUDExecuteOptions{%
 }
 \TUDProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
index 9d04ff31467..6bde8440ae3 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
@@ -9,7 +9,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -52,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -77,7 +77,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l 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 f13058bbe16..21e64fe6168 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,13 +57,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index b1acb4ce19c..bafe87ed5ee 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -17,7 +17,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -60,7 +60,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -76,7 +76,7 @@
 }{}
 %%% From File: tudscr-fonts.dtx
 \ProvidesPackage{tudscrfonts}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package
   (corporate design fonts)%
 ]
@@ -509,6 +509,7 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -647,7 +648,7 @@
   \TUD@key@preset{cdfont}{true}%
   \TUD@key@preset{ttfont}{roboto}%
 }
-\DeclareOption*{\KOMAoptions{\CurrentOption}}
+\DeclareOption*{\expandafter\KOMAoptions\expandafter{\CurrentOption}}
 \TUDExecuteOptions{%
 }
 \TUDProcessOptions\relax
@@ -815,7 +816,7 @@
   \if@tud@res@swa\else%
     \AtBeginDocument{%
       \if@tud@cdmath@active%
-        \PackageWarning{tudscrfonts}%
+        \PackageWarningNoLine{tudscrfonts}%
         {%
           Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index a937961c869..e269051d921 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
@@ -16,7 +16,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -59,13 +59,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
@@ -173,7 +173,7 @@
   \fi%
 }
 %%% From File: tudscr-misc.dtx
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\TUD@Class@Parent}}
+\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@Parent}}
 \TUDExecuteOptions{%
 }
 \TUDProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index aec2e431ba6..3c6af575cee 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -886,7 +886,7 @@
 \newcommand*\tud@titlepage@deactivate{%
   \if@titlepage%
     \KOMAoptions{titlepage=false}%
-    \ClassWarning{\TUD@Class@Name}{%
+    \ClassWarningNoLine{\TUD@Class@Name}{%
       The class `\TUD@Class@Name' can't be used with\MessageBreak%
       activated titlepage option. It will be enforced to\MessageBreak%
       `titlepage=false'%
@@ -927,7 +927,7 @@
 }
 \newcommand*\tud@x@scr@checkoptions{%
   \expandafter\tud@x@scr@pt\CurrentOption pt\@nil%
-  \PassOptionsToClass{\CurrentOption}{\TUD@Class@KOMA}%
+  \expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@KOMA}%
 }
 \newcommand*\tud@x@scr@pt{}
 \def\tud@x@scr@pt #1pt#2\@nil{%
@@ -1093,6 +1093,7 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1495,7 +1496,7 @@
   \if@tud@res@swa\else%
     \AtBeginDocument{%
       \if@tud@cdmath@active%
-        \ClassWarning{\TUD@Class@Name}%
+        \ClassWarningNoLine{\TUD@Class@Name}%
         {%
           Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
@@ -4775,6 +4776,7 @@
 \if@tud@x@standalone@crop
   \PreventPackageFromLoading{scrlayer-scrpage}%
 \else
+  \PassOptionsToPackage{automark}{scrlayer-scrpage}%
   \AtEndPreamble{\RequirePackage{scrlayer-scrpage}[2020/09/21]}%
 \fi
 \AfterPackage{scrlayer-scrpage}{%
@@ -5085,6 +5087,7 @@
 }{}{\tud@patch@wrn{pagestyle}}
 \tud@cs@store{pagestyle}
 \renewcommand*\pagestyle[1]{%
+  \csuse{ps@#1}%
   \AfterAtEndOfPackage*{scrlayer-scrpage}{\pagestyle{#1}}%
 }
 \BeforePackage{scrlayer-scrpage}{%
@@ -6529,8 +6532,8 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size. \MessageBreak%
-        See the manual for further information%
+        should explicitly specify an font size. See the\MessageBreak%
+        manual for further information%
       }%
     \fi%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 8a8d9aa8662..c02215fc344 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
@@ -30,7 +30,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -73,13 +73,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
     #3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
@@ -1093,7 +1093,7 @@
 }
 \newcommand*\tud@x@scr@checkoptions{%
   \expandafter\tud@x@scr@pt\CurrentOption pt\@nil%
-  \PassOptionsToClass{\CurrentOption}{\TUD@Class@KOMA}%
+  \expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@KOMA}%
 }
 \newcommand*\tud@x@scr@pt{}
 \def\tud@x@scr@pt #1pt#2\@nil{%
@@ -1259,6 +1259,7 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 \newcommand*\tud@v@get[2]{%
   \begingroup%
@@ -1672,7 +1673,7 @@
   \if@tud@res@swa\else%
     \AtBeginDocument{%
       \if@tud@cdmath@active%
-        \ClassWarning{\TUD@Class@Name}%
+        \ClassWarningNoLine{\TUD@Class@Name}%
         {%
           Some math font encodings are missing. \MessageBreak%
           The option `cdmath=false' is executed. You should\MessageBreak%
@@ -5186,6 +5187,7 @@
 \if@tud@x@standalone@crop
   \PreventPackageFromLoading{scrlayer-scrpage}%
 \else
+  \PassOptionsToPackage{automark}{scrlayer-scrpage}%
   \AtEndPreamble{\RequirePackage{scrlayer-scrpage}[2020/09/21]}%
 \fi
 \AfterPackage{scrlayer-scrpage}{%
@@ -5497,6 +5499,7 @@
 }{}{\tud@patch@wrn{pagestyle}}
 \tud@cs@store{pagestyle}
 \renewcommand*\pagestyle[1]{%
+  \csuse{ps@#1}%
   \AfterAtEndOfPackage*{scrlayer-scrpage}{\pagestyle{#1}}%
 }
 \BeforePackage{scrlayer-scrpage}{%
@@ -8034,8 +8037,8 @@
       \ClassWarningNoLine{\TUD@Class@Name}{%
         You've set a layout size, which is different from\MessageBreak%
         default (paper=a4, paper=portrait). Therefore you\MessageBreak%
-        should additionally specify an explicit font size. \MessageBreak%
-        See the manual for further information%
+        should explicitly specify an font size. See the\MessageBreak%
+        manual for further information%
       }%
     \fi%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index c04f4d741bd..c49f304b6f4 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
@@ -11,7 +11,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -54,7 +54,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -79,7 +79,7 @@
 }{}
 %%% From File: tudscr-supervisor.dtx
 \ProvidesPackage{tudscrsupervisor}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l 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 e587518259c..94502a885ce 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
@@ -14,7 +14,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -57,7 +57,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}[2019/10/01]
 \providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -82,7 +82,7 @@
 }{}
 %%% From File: tudscr-manual.dtx
 \ProvidesPackage{tudscrtutorial}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l 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 d77859bd5ec..103ea305120 100644
--- a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
@@ -8,7 +8,7 @@
 %% 
 %% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%   2020/11/10 v2.06k TUD-Script
+%%   2021/03/30 v2.06l TUD-Script
 %% 
 %% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
 %% 
@@ -29,7 +29,7 @@
 %%% From File: tudscr-twocolfix.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{twocolfix}[%
-  2020/11/10 v2.06k TUD-Script
+  2021/03/30 v2.06l TUD-Script
   package
   (twocolumn layout bugfix)%
 ]